From 4327abb80328fc0a6a0559d4e16a8b2c9ee4e283 Mon Sep 17 00:00:00 2001
From: Twan van Laarhoven <twanvl@gmail.com>
Date: Sun, 26 Apr 2020 00:51:16 +0200
Subject: [PATCH] Remove DECLARE_TYPEOF It is no longer needed since C++11

---
 src/cli/cli_main.cpp                        |  3 ---
 src/data/action/keyword.cpp                 |  2 --
 src/data/action/keyword.hpp                 |  1 -
 src/data/action/set.cpp                     |  5 -----
 src/data/action/set.hpp                     |  2 --
 src/data/action/symbol.cpp                  |  6 ------
 src/data/action/symbol_part.cpp             |  4 ----
 src/data/card.cpp                           |  3 ---
 src/data/field.cpp                          |  2 --
 src/data/field/choice.cpp                   |  3 ---
 src/data/field/color.cpp                    |  2 --
 src/data/format/apprentice.cpp              |  9 ---------
 src/data/format/image.cpp                   |  2 --
 src/data/format/image_to_symbol.cpp         |  3 ---
 src/data/format/mtg_editor.cpp              |  2 --
 src/data/format/mws.cpp                     |  2 --
 src/data/game.cpp                           |  3 ---
 src/data/keyword.cpp                        |  6 ------
 src/data/locale.cpp                         |  2 --
 src/data/pack.cpp                           |  5 -----
 src/data/set.cpp                            |  3 ---
 src/data/settings.cpp                       |  2 --
 src/data/statistics.cpp                     |  4 ----
 src/data/stylesheet.cpp                     |  3 ---
 src/data/symbol.cpp                         |  3 ---
 src/data/symbol_font.cpp                    |  4 ----
 src/gui/auto_replace_window.cpp             |  2 --
 src/gui/card_select_window.cpp              |  3 ---
 src/gui/control/card_editor.cpp             |  3 ---
 src/gui/control/card_list.cpp               |  5 -----
 src/gui/control/card_list_column_select.cpp |  3 ---
 src/gui/control/filtered_card_list.cpp      |  2 --
 src/gui/control/gallery_list.cpp            |  2 --
 src/gui/control/graph.cpp                   | 12 ------------
 src/gui/control/image_card_list.cpp         |  2 --
 src/gui/control/keyword_list.cpp            |  3 ---
 src/gui/control/native_look_editor.cpp      |  3 ---
 src/gui/control/package_list.cpp            |  2 --
 src/gui/control/select_card_list.cpp        |  2 --
 src/gui/control/text_ctrl.cpp               |  2 --
 src/gui/control/tree_list.cpp               |  2 --
 src/gui/images_export_window.cpp            |  2 --
 src/gui/package_update_list.cpp             |  5 -----
 src/gui/packages_window.cpp                 |  4 ----
 src/gui/preferences_window.cpp              |  2 --
 src/gui/print_window.cpp                    |  1 -
 src/gui/profiler_window.cpp                 |  2 --
 src/gui/set/cards_panel.cpp                 |  2 --
 src/gui/set/console_panel.cpp               |  2 --
 src/gui/set/keywords_panel.cpp              |  4 ----
 src/gui/set/random_pack_panel.cpp           |  5 -----
 src/gui/set/stats_panel.cpp                 |  7 -------
 src/gui/set/style_panel.cpp                 |  2 --
 src/gui/set/window.cpp                      |  4 ----
 src/gui/symbol/part_list.cpp                |  2 --
 src/gui/symbol/point_editor.cpp             |  2 --
 src/gui/symbol/select_editor.cpp            |  2 --
 src/gui/symbol/selection.cpp                |  2 --
 src/gui/thumbnail_thread.cpp                |  3 ---
 src/gui/update_checker.cpp                  |  1 -
 src/gui/value/choice.cpp                    |  2 --
 src/gui/value/color.cpp                     |  2 --
 src/gui/value/package_choice.cpp            |  2 --
 src/gui/value/text.cpp                      |  7 -------
 src/render/card/viewer.cpp                  |  3 ---
 src/render/symbol/viewer.cpp                |  2 --
 src/render/text/element.cpp                 |  1 -
 src/render/text/viewer.cpp                  |  3 ---
 src/render/value/color.cpp                  |  2 --
 src/render/value/multiple_choice.cpp        |  2 --
 src/render/value/package_choice.cpp         |  3 ---
 src/render/value/symbol.cpp                 |  2 --
 src/render/value/viewer.cpp                 |  2 --
 src/script/dependency.cpp                   |  3 ---
 src/script/functions/basic.cpp              |  2 --
 src/script/functions/editor.cpp             |  6 ------
 src/script/functions/export.cpp             |  4 ----
 src/script/functions/image.cpp              |  2 --
 src/script/functions/regex.cpp              |  1 -
 src/script/parser.cpp                       |  2 --
 src/script/profiler.cpp                     |  2 --
 src/script/script.cpp                       |  3 ---
 src/script/scriptable.cpp                   |  2 --
 src/script/value.cpp                        |  2 --
 src/util/action_stack.cpp                   |  3 ---
 src/util/error.cpp                          |  2 --
 src/util/file_utils.cpp                     |  2 --
 src/util/for_each.hpp                       | 14 --------------
 src/util/io/package.cpp                     |  3 ---
 src/util/io/package.hpp                     |  1 -
 src/util/io/package_manager.cpp             |  4 ----
 src/util/string.hpp                         |  2 --
 92 files changed, 281 deletions(-)

diff --git a/src/cli/cli_main.cpp b/src/cli/cli_main.cpp
index 7eacbbcb..4edca89f 100644
--- a/src/cli/cli_main.cpp
+++ b/src/cli/cli_main.cpp
@@ -16,8 +16,6 @@
 #include <wx/process.h>
 #include <wx/wfstream.h>
 
-DECLARE_TYPEOF_COLLECTION(ScriptParseError);
-
 String read_utf8_line(wxInputStream& input, bool until_eof = false);
 
 // ----------------------------------------------------------------------------- : Command line interface
@@ -242,7 +240,6 @@ void CLISetInterface::handleCommand(const String& command) {
 }
 
 #if USE_SCRIPT_PROFILING
-  DECLARE_TYPEOF_COLLECTION(FunctionProfileP);
   void CLISetInterface::showProfilingStats(const FunctionProfile& item, int level) {
     // show parent
     if (level == 0) {
diff --git a/src/data/action/keyword.cpp b/src/data/action/keyword.cpp
index db805405..e1870c05 100644
--- a/src/data/action/keyword.cpp
+++ b/src/data/action/keyword.cpp
@@ -15,8 +15,6 @@
 #include <util/tagged_string.hpp>
 #include <util/error.hpp>
 
-DECLARE_TYPEOF_COLLECTION(KeywordModeP);
-
 // ----------------------------------------------------------------------------- : Add Keyword
 
 AddKeywordAction::AddKeywordAction(Set& set)
diff --git a/src/data/action/keyword.hpp b/src/data/action/keyword.hpp
index b422c6e0..965d6c4c 100644
--- a/src/data/action/keyword.hpp
+++ b/src/data/action/keyword.hpp
@@ -22,7 +22,6 @@
 
 class Set;
 DECLARE_POINTER_TYPE(Keyword);
-DECLARE_TYPEOF_COLLECTION(GenericAddAction<KeywordP>::Step);
 
 // ----------------------------------------------------------------------------- : Add Keyword
 
diff --git a/src/data/action/set.cpp b/src/data/action/set.cpp
index 39317673..1854463f 100644
--- a/src/data/action/set.cpp
+++ b/src/data/action/set.cpp
@@ -14,11 +14,6 @@
 #include <data/stylesheet.hpp>
 #include <util/error.hpp>
 
-DECLARE_TYPEOF_COLLECTION(IndexMap<FieldP COMMA ValueP>);
-DECLARE_TYPEOF_COLLECTION(CardP);
-DECLARE_TYPEOF_COLLECTION(PackTypeP);
-DECLARE_TYPEOF_COLLECTION(int);
-
 // ----------------------------------------------------------------------------- : Add card
 
 AddCardAction::AddCardAction(Set& set)
diff --git a/src/data/action/set.hpp b/src/data/action/set.hpp
index 38403fa4..779f6296 100644
--- a/src/data/action/set.hpp
+++ b/src/data/action/set.hpp
@@ -24,8 +24,6 @@ DECLARE_POINTER_TYPE(StyleSheet);
 DECLARE_POINTER_TYPE(Field);
 DECLARE_POINTER_TYPE(Value);
 DECLARE_POINTER_TYPE(PackType);
-DECLARE_TYPEOF_COLLECTION(GenericAddAction<CardP>::Step);
-DECLARE_TYPEOF_COLLECTION(GenericAddAction<PackTypeP>::Step);
 
 // ----------------------------------------------------------------------------- : Add card
 
diff --git a/src/data/action/symbol.cpp b/src/data/action/symbol.cpp
index 05fe4870..61fde5dd 100644
--- a/src/data/action/symbol.cpp
+++ b/src/data/action/symbol.cpp
@@ -11,12 +11,6 @@
 #include <data/action/symbol_part.hpp>
 #include <util/error.hpp>
 
-DECLARE_TYPEOF_COLLECTION(pair<SymbolShapeP COMMA SymbolShapeCombine>);
-DECLARE_TYPEOF_COLLECTION(pair<SymbolPartP  COMMA size_t            >);
-DECLARE_TYPEOF_COLLECTION(RemoveSymbolPartsAction::Removal);
-DECLARE_TYPEOF_COLLECTION(SymbolPartP);
-DECLARE_TYPEOF_COLLECTION(ControlPointP);
-
 // ----------------------------------------------------------------------------- : Utility
 
 String action_name_for(const set<SymbolPartP>& parts, const String& action) {
diff --git a/src/data/action/symbol_part.cpp b/src/data/action/symbol_part.cpp
index 2ad832df..75ad3a8e 100644
--- a/src/data/action/symbol_part.cpp
+++ b/src/data/action/symbol_part.cpp
@@ -10,9 +10,6 @@
 #include <data/action/symbol_part.hpp>
 #include <gfx/bezier.hpp>
 
-DECLARE_TYPEOF_COLLECTION(Vector2D);
-DECLARE_TYPEOF_COLLECTION(ControlPointP);
-
 // ----------------------------------------------------------------------------- : Utility
 
 inline double sgn(double v) { return  v > 0 ? 1 : -1; }
@@ -384,7 +381,6 @@ void SinglePointRemoveAction::perform(bool to_undo) {
 }
 
 DECLARE_POINTER_TYPE(SinglePointRemoveAction);
-DECLARE_TYPEOF_COLLECTION(SinglePointRemoveActionP);
 
 
 // Remove a set of points from a symbol shape.
diff --git a/src/data/card.cpp b/src/data/card.cpp
index 9441419d..6cce5a6f 100644
--- a/src/data/card.cpp
+++ b/src/data/card.cpp
@@ -15,9 +15,6 @@
 #include <util/reflect.hpp>
 #include <util/delayed_index_maps.hpp>
 
-DECLARE_TYPEOF_COLLECTION(FieldP);
-DECLARE_TYPEOF_NO_REV(IndexMap<FieldP COMMA ValueP>);
-
 // ----------------------------------------------------------------------------- : Card
 
 Card::Card()
diff --git a/src/data/field.cpp b/src/data/field.cpp
index 2c5c885f..ae24908e 100644
--- a/src/data/field.cpp
+++ b/src/data/field.cpp
@@ -19,8 +19,6 @@
 #include <data/field/package_choice.hpp>
 #include <util/error.hpp>
 
-DECLARE_TYPEOF_COLLECTION(StyleListener*);
-
 // ----------------------------------------------------------------------------- : Field
 
 Field::Field()
diff --git a/src/data/field/choice.cpp b/src/data/field/choice.cpp
index b9a52955..ad54799c 100644
--- a/src/data/field/choice.cpp
+++ b/src/data/field/choice.cpp
@@ -12,9 +12,6 @@
 #include <util/defaultable.hpp>
 #include <wx/imaglist.h>
 
-DECLARE_TYPEOF_COLLECTION(ChoiceField::ChoiceP);
-DECLARE_TYPEOF(map<String COMMA ScriptableImage>);
-
 // ----------------------------------------------------------------------------- : ChoiceField
 
 ChoiceField::ChoiceField()
diff --git a/src/data/field/color.cpp b/src/data/field/color.cpp
index d3c40723..267a104f 100644
--- a/src/data/field/color.cpp
+++ b/src/data/field/color.cpp
@@ -10,8 +10,6 @@
 #include <data/field/color.hpp>
 #include <script/script.hpp>
 
-DECLARE_TYPEOF_COLLECTION(ColorField::ChoiceP);
-
 // ----------------------------------------------------------------------------- : ColorField
 
 ColorField::ColorField()
diff --git a/src/data/format/apprentice.cpp b/src/data/format/apprentice.cpp
index 9e5c2ee1..ee12b17e 100644
--- a/src/data/format/apprentice.cpp
+++ b/src/data/format/apprentice.cpp
@@ -21,10 +21,6 @@
 #include <wx/datstrm.h>
 #include <wx/filename.h>
 
-DECLARE_TYPEOF_COLLECTION(String);
-DECLARE_TYPEOF_COLLECTION(CardP);
-DECLARE_TYPEOF(map<String COMMA String>);
-
 String card_rarity_code(const String& rarity);
 
 // ----------------------------------------------------------------------------- : Generic export dialog
@@ -190,8 +186,6 @@ class ApprFormat {
   String name, sets;
 };
 
-DECLARE_TYPEOF_COLLECTION(ApprFormat);
-
 /// An Apprentice format database (Format.dat)
 class ApprFormatDatabase : public ApprDatabase {
   public:
@@ -276,8 +270,6 @@ class ApprDistro {
   void writeD(wxTextOutputStream& tout, const String& name, int c, int u, int r);
 };
 
-DECLARE_TYPEOF(map<String COMMA ApprDistro>);
-
 /// An Apprentice distribution database (Distro.dat)
 class ApprDistroDatabase : public ApprDatabase {
   public:
@@ -362,7 +354,6 @@ String untag_appr(const String& s) {
 }
 
 DECLARE_POINTER_TYPE(ApprCardRecord);
-DECLARE_TYPEOF_COLLECTION(ApprCardRecordP);
 
 /// An Apprentice card database (cardinfo.dat)
 class ApprCardDatabase : public ApprDatabase {
diff --git a/src/data/format/image.cpp b/src/data/format/image.cpp
index d961e7d1..4b6202f7 100644
--- a/src/data/format/image.cpp
+++ b/src/data/format/image.cpp
@@ -16,8 +16,6 @@
 #include <render/card/viewer.hpp>
 #include <wx/filename.h>
 
-DECLARE_TYPEOF_COLLECTION(CardP);
-
 // ----------------------------------------------------------------------------- : Single card export
 
 void export_image(const SetP& set, const CardP& card, const String& filename) {
diff --git a/src/data/format/image_to_symbol.cpp b/src/data/format/image_to_symbol.cpp
index 05e2c18b..624fd7c6 100644
--- a/src/data/format/image_to_symbol.cpp
+++ b/src/data/format/image_to_symbol.cpp
@@ -19,9 +19,6 @@
 #include <util/error.hpp>
 #include <util/platform.hpp>
 
-DECLARE_TYPEOF_COLLECTION(ControlPointP);
-DECLARE_TYPEOF_COLLECTION(SymbolPartP);
-
 // ----------------------------------------------------------------------------- : Image preprocessing
 
 enum ImageMarker
diff --git a/src/data/format/mtg_editor.cpp b/src/data/format/mtg_editor.cpp
index 8da9ea6e..bf48c764 100644
--- a/src/data/format/mtg_editor.cpp
+++ b/src/data/format/mtg_editor.cpp
@@ -18,8 +18,6 @@
 #include <util/tagged_string.hpp>
 #include <wx/wfstream.h>
 
-DECLARE_TYPEOF_COLLECTION(CardP);
-
 // ----------------------------------------------------------------------------- : MtgEditorFileFormat
 
 /// The file format of Mtg Editor files
diff --git a/src/data/format/mws.cpp b/src/data/format/mws.cpp
index dc82ec1d..571560bc 100644
--- a/src/data/format/mws.cpp
+++ b/src/data/format/mws.cpp
@@ -17,8 +17,6 @@
 #include <util/tagged_string.hpp>
 #include <wx/wfstream.h>
 
-DECLARE_TYPEOF_COLLECTION(CardP);
-
 // ----------------------------------------------------------------------------- : Utilities
 
 /// Convert a tagged string to MWS format: \t\t before each line beyond the first
diff --git a/src/data/game.cpp b/src/data/game.cpp
index 91219100..0c19ed2f 100644
--- a/src/data/game.cpp
+++ b/src/data/game.cpp
@@ -18,9 +18,6 @@
 #include <util/io/package_manager.hpp>
 #include <script/script.hpp>
 
-DECLARE_TYPEOF_COLLECTION(FieldP);
-DECLARE_TYPEOF_COLLECTION(StatsDimensionP);
-
 // ----------------------------------------------------------------------------- : Game
 
 IMPLEMENT_DYNAMIC_ARG(Game*, game_for_reading, nullptr);
diff --git a/src/data/keyword.cpp b/src/data/keyword.cpp
index 01f539eb..43215096 100644
--- a/src/data/keyword.cpp
+++ b/src/data/keyword.cpp
@@ -11,12 +11,6 @@
 #include <util/tagged_string.hpp>
 
 class KeywordTrie;
-DECLARE_TYPEOF(map<Char COMMA KeywordTrie*>);
-DECLARE_TYPEOF_COLLECTION(KeywordTrie*);
-DECLARE_TYPEOF_COLLECTION(KeywordP);
-DECLARE_TYPEOF_COLLECTION(KeywordModeP);
-DECLARE_TYPEOF_COLLECTION(KeywordParamP);
-DECLARE_TYPEOF_COLLECTION(const Keyword*);
 DECLARE_POINTER_TYPE(KeywordParamValue);
 class Value;
 DECLARE_DYNAMIC_ARG(Value*, value_being_updated);
diff --git a/src/data/locale.cpp b/src/data/locale.cpp
index fc874220..899707db 100644
--- a/src/data/locale.cpp
+++ b/src/data/locale.cpp
@@ -21,8 +21,6 @@
   #include <wx/mstream.h>
 #endif
 
-DECLARE_TYPEOF(map<String COMMA SubLocaleP>);
-
 // ----------------------------------------------------------------------------- : Locale class
 
 // when reading, ignore "#_ADD" start of line pragmas
diff --git a/src/data/pack.cpp b/src/data/pack.cpp
index 0e94314f..9b700889 100644
--- a/src/data/pack.cpp
+++ b/src/data/pack.cpp
@@ -14,11 +14,6 @@
 #include <queue>
 using boost::indeterminate;
 
-DECLARE_TYPEOF_COLLECTION(PackTypeP);
-DECLARE_TYPEOF_COLLECTION(PackItemP);
-DECLARE_TYPEOF_COLLECTION(CardP);
-DECLARE_TYPEOF_CONST(map<String COMMA PackInstanceP>);
-
 // ----------------------------------------------------------------------------- : PackType
 
 
diff --git a/src/data/set.cpp b/src/data/set.cpp
index 4d711954..354e0abe 100644
--- a/src/data/set.cpp
+++ b/src/data/set.cpp
@@ -23,9 +23,6 @@
 #include <script/profiler.hpp>
 #include <wx/sstream.h>
 
-DECLARE_TYPEOF_COLLECTION(CardP);
-DECLARE_TYPEOF_NO_REV(IndexMap<FieldP COMMA ValueP>);
-
 // ----------------------------------------------------------------------------- : Set
 
 Set::Set()
diff --git a/src/data/settings.cpp b/src/data/settings.cpp
index 02f327e0..b7f3d99a 100644
--- a/src/data/settings.cpp
+++ b/src/data/settings.cpp
@@ -23,8 +23,6 @@
 #include <wx/wfstream.h>
 #include <wx/stdpaths.h>
 
-DECLARE_TYPEOF_COLLECTION(AutoReplaceP);
-
 // ----------------------------------------------------------------------------- : Extra types
 
 IMPLEMENT_REFLECTION_ENUM(CheckUpdates) {
diff --git a/src/data/statistics.cpp b/src/data/statistics.cpp
index 3ef0b4f7..8528c29e 100644
--- a/src/data/statistics.cpp
+++ b/src/data/statistics.cpp
@@ -11,10 +11,6 @@
 #include <data/field.hpp>
 #include <data/field/choice.hpp>
 
-DECLARE_TYPEOF_COLLECTION(String);
-DECLARE_TYPEOF_COLLECTION(StatsDimensionP);
-DECLARE_TYPEOF_COLLECTION(ChoiceField::ChoiceP);
-
 extern ScriptValueP script_primary_choice;
 
 // ----------------------------------------------------------------------------- : Statistics dimension
diff --git a/src/data/stylesheet.cpp b/src/data/stylesheet.cpp
index 80e1288c..8082cc2a 100644
--- a/src/data/stylesheet.cpp
+++ b/src/data/stylesheet.cpp
@@ -13,9 +13,6 @@
 #include <util/io/package_manager.hpp>
 #include <gui/new_window.hpp> // for selecting stylesheets on load error
 
-DECLARE_TYPEOF_COLLECTION(StyleSheet*);
-DECLARE_TYPEOF_COLLECTION(FieldP);
-
 // ----------------------------------------------------------------------------- : StyleSheet
 
 IMPLEMENT_DYNAMIC_ARG(StyleSheet*, stylesheet_for_reading, nullptr);
diff --git a/src/data/symbol.cpp b/src/data/symbol.cpp
index a95e7fc0..d6fc65fd 100644
--- a/src/data/symbol.cpp
+++ b/src/data/symbol.cpp
@@ -12,9 +12,6 @@
 #include <script/to_value.hpp>
 #include <gfx/bezier.hpp>
 
-DECLARE_TYPEOF_COLLECTION(ControlPointP);
-DECLARE_TYPEOF_COLLECTION(SymbolPartP);
-
 // ----------------------------------------------------------------------------- : ControlPoint
 
 IMPLEMENT_REFLECTION_ENUM(LockMode) {
diff --git a/src/data/symbol_font.cpp b/src/data/symbol_font.cpp
index 2ccfe2bd..b5d0ed60 100644
--- a/src/data/symbol_font.cpp
+++ b/src/data/symbol_font.cpp
@@ -17,10 +17,6 @@
 #include <render/text/element.hpp> // fot CharInfo
 #include <script/image.hpp>
 
-DECLARE_TYPEOF_COLLECTION(SymbolFont::DrawableSymbol);
-DECLARE_TYPEOF_COLLECTION(SymbolInFontP);
-DECLARE_TYPEOF_COLLECTION(InsertSymbolMenuP);
-
 // ----------------------------------------------------------------------------- : SymbolFont
 
 // SymbolFont that is used for SymbolInFonts constructed with the default constructor
diff --git a/src/gui/auto_replace_window.cpp b/src/gui/auto_replace_window.cpp
index 440cfce6..e9ea0a8f 100644
--- a/src/gui/auto_replace_window.cpp
+++ b/src/gui/auto_replace_window.cpp
@@ -17,8 +17,6 @@
 #include <util/window_id.hpp>
 #include <util/error.hpp>
 
-DECLARE_TYPEOF_COLLECTION(AutoReplaceP);
-
 // ----------------------------------------------------------------------------- : AutoReplaceList
 
 DECLARE_EVENT_TYPE(EVENT_ITEM_SELECT, <not used>)
diff --git a/src/gui/card_select_window.cpp b/src/gui/card_select_window.cpp
index b7587a3c..0ce4c6bd 100644
--- a/src/gui/card_select_window.cpp
+++ b/src/gui/card_select_window.cpp
@@ -12,9 +12,6 @@
 #include <util/window_id.hpp>
 #include <wx/statline.h>
 
-DECLARE_TYPEOF_COLLECTION(CardP);
-DECLARE_TYPEOF_COLLECTION(ExportCardSelectionChoiceP);
-
 // ----------------------------------------------------------------------------- : ExportCardSelectionChoice
 
 ExportCardSelectionChoice::ExportCardSelectionChoice()
diff --git a/src/gui/control/card_editor.cpp b/src/gui/control/card_editor.cpp
index caf10b5c..446b31fb 100644
--- a/src/gui/control/card_editor.cpp
+++ b/src/gui/control/card_editor.cpp
@@ -17,9 +17,6 @@
 #include <util/window_id.hpp>
 #include <wx/caret.h>
 
-DECLARE_TYPEOF_COLLECTION(ValueViewerP);
-DECLARE_TYPEOF_COLLECTION(ValueViewer*);
-
 // ----------------------------------------------------------------------------- : DataEditor
 
 DataEditor::DataEditor(Window* parent, int id, long style)
diff --git a/src/gui/control/card_list.cpp b/src/gui/control/card_list.cpp
index 6e66296b..12ad5d36 100644
--- a/src/gui/control/card_list.cpp
+++ b/src/gui/control/card_list.cpp
@@ -23,12 +23,7 @@
 #include <util/window_id.hpp>
 #include <wx/clipbrd.h>
 
-DECLARE_TYPEOF_COLLECTION(CardP);
-DECLARE_TYPEOF_COLLECTION(FieldP);
 DECLARE_POINTER_TYPE(ChoiceValue);
-DECLARE_TYPEOF(map<int COMMA FieldP>);
-DECLARE_TYPEOF_NO_REV(IndexMap<FieldP COMMA StyleP>);
-DECLARE_TYPEOF_COLLECTION(CardListBase*);
 
 // ----------------------------------------------------------------------------- : Events
 
diff --git a/src/gui/control/card_list_column_select.cpp b/src/gui/control/card_list_column_select.cpp
index 1438a9e8..8c525f84 100644
--- a/src/gui/control/card_list_column_select.cpp
+++ b/src/gui/control/card_list_column_select.cpp
@@ -12,9 +12,6 @@
 #include <data/field.hpp>
 #include <util/window_id.hpp>
 
-DECLARE_TYPEOF_COLLECTION(FieldP);
-DECLARE_TYPEOF_COLLECTION(CardListColumnSelectDialog::ColumnSettingsF);
-
 // ----------------------------------------------------------------------------- : CardListColumnSelectDialog
 
 CardListColumnSelectDialog::CardListColumnSelectDialog(Window* parent, const GameP& game)
diff --git a/src/gui/control/filtered_card_list.cpp b/src/gui/control/filtered_card_list.cpp
index 3e2ba7ba..6b619714 100644
--- a/src/gui/control/filtered_card_list.cpp
+++ b/src/gui/control/filtered_card_list.cpp
@@ -9,8 +9,6 @@
 #include <util/prec.hpp>
 #include <gui/control/filtered_card_list.hpp>
 
-DECLARE_TYPEOF_COLLECTION(CardP);
-
 // ----------------------------------------------------------------------------- : FilteredCardList
 
 FilteredCardList::FilteredCardList(Window* parent, int id, long additional_style)
diff --git a/src/gui/control/gallery_list.cpp b/src/gui/control/gallery_list.cpp
index 4ed369a4..fa35cd91 100644
--- a/src/gui/control/gallery_list.cpp
+++ b/src/gui/control/gallery_list.cpp
@@ -12,8 +12,6 @@
 #include <gfx/gfx.hpp>
 #include <wx/dcbuffer.h>
 
-DECLARE_TYPEOF_COLLECTION(GalleryList::SubColumn_for_typeof);
-
 // ----------------------------------------------------------------------------- : Events
 
 DEFINE_EVENT_TYPE(EVENT_GALLERY_SELECT);
diff --git a/src/gui/control/graph.cpp b/src/gui/control/graph.cpp
index f18b7bb9..180148c7 100644
--- a/src/gui/control/graph.cpp
+++ b/src/gui/control/graph.cpp
@@ -13,17 +13,6 @@
 #include <wx/dcbuffer.h>
 #include <wx/tooltip.h>
 
-DECLARE_TYPEOF_COLLECTION(GraphAxisP);
-DECLARE_TYPEOF_COLLECTION(GraphElementP);
-DECLARE_TYPEOF_COLLECTION(GraphGroup);
-DECLARE_TYPEOF_COLLECTION(GraphDataElement*);
-DECLARE_TYPEOF_COLLECTION(GraphP);
-DECLARE_TYPEOF_COLLECTION(int);
-DECLARE_TYPEOF_COLLECTION(vector<int>);
-DECLARE_TYPEOF_COLLECTION(String);
-DECLARE_TYPEOF_COLLECTION(UInt);
-DECLARE_TYPEOF_COLLECTION(pair<String COMMA String>);
-
 template <typename T> inline T sgn(T v) { return v < 0 ? -1 : 1; }
 
 // ----------------------------------------------------------------------------- : Events
@@ -74,7 +63,6 @@ void GraphDataPre::splitList(size_t axis) {
 struct SmartLess{
   inline bool operator () (const String& a, const String& b) const { return smart_less(a,b); }
 };
-DECLARE_TYPEOF(map<String COMMA UInt COMMA SmartLess>);
 
 String to_bin(double value, double bin_size) {
   if (bin_size <= 0 || value == 0) {
diff --git a/src/gui/control/image_card_list.cpp b/src/gui/control/image_card_list.cpp
index 2cc047da..61be5e73 100644
--- a/src/gui/control/image_card_list.cpp
+++ b/src/gui/control/image_card_list.cpp
@@ -16,8 +16,6 @@
 #include <wx/imaglist.h>
 #include <gui/util.hpp>
 
-DECLARE_TYPEOF_COLLECTION(FieldP);
-
 // ----------------------------------------------------------------------------- : ImageCardList
 
 ImageCardList::ImageCardList(Window* parent, int id, long additional_style)
diff --git a/src/gui/control/keyword_list.cpp b/src/gui/control/keyword_list.cpp
index b8befe56..ea5f06a0 100644
--- a/src/gui/control/keyword_list.cpp
+++ b/src/gui/control/keyword_list.cpp
@@ -21,9 +21,6 @@
 #include <gfx/color.hpp>
 #include <wx/clipbrd.h>
 
-DECLARE_TYPEOF_COLLECTION(KeywordP);
-DECLARE_TYPEOF_COLLECTION(CardP);
-
 // ----------------------------------------------------------------------------- : Events
 
 DEFINE_EVENT_TYPE(EVENT_KEYWORD_SELECT);
diff --git a/src/gui/control/native_look_editor.cpp b/src/gui/control/native_look_editor.cpp
index d2b57564..7e7790cc 100644
--- a/src/gui/control/native_look_editor.cpp
+++ b/src/gui/control/native_look_editor.cpp
@@ -14,9 +14,6 @@
 #include <data/export_template.hpp>
 #include <data/settings.hpp>
 
-DECLARE_TYPEOF_COLLECTION(ValueViewerP);
-DECLARE_TYPEOF_NO_REV(IndexMap<FieldP COMMA StyleP>);
-
 // ----------------------------------------------------------------------------- : NativeLookEditor
 
 NativeLookEditor::NativeLookEditor(Window* parent, int id, long style)
diff --git a/src/gui/control/package_list.cpp b/src/gui/control/package_list.cpp
index 0fae34a4..f5ae7000 100644
--- a/src/gui/control/package_list.cpp
+++ b/src/gui/control/package_list.cpp
@@ -13,8 +13,6 @@
 #include <script/profiler.hpp>
 #include <gui/util.hpp>
 
-DECLARE_TYPEOF_COLLECTION(PackagedP);
-
 // ----------------------------------------------------------------------------- : PackageList
 
 PackageList::PackageList(Window* parent, int id, int direction, bool always_focused)
diff --git a/src/gui/control/select_card_list.cpp b/src/gui/control/select_card_list.cpp
index 995121b6..29693587 100644
--- a/src/gui/control/select_card_list.cpp
+++ b/src/gui/control/select_card_list.cpp
@@ -12,8 +12,6 @@
 #include <data/card.hpp>
 #include <wx/imaglist.h>
 
-DECLARE_TYPEOF_COLLECTION(CardP);
-
 // ----------------------------------------------------------------------------- : SelectCardList
 
 SelectCardList::SelectCardList(Window* parent, int id, long additional_style)
diff --git a/src/gui/control/text_ctrl.cpp b/src/gui/control/text_ctrl.cpp
index af600366..95521831 100644
--- a/src/gui/control/text_ctrl.cpp
+++ b/src/gui/control/text_ctrl.cpp
@@ -13,8 +13,6 @@
 #include <data/field/text.hpp>
 #include <data/action/value.hpp>
 
-DECLARE_TYPEOF_COLLECTION(ValueViewerP);
-
 // ----------------------------------------------------------------------------- : TextCtrl
 
 TextCtrl::TextCtrl(Window* parent, int id, bool multi_line, long style)
diff --git a/src/gui/control/tree_list.cpp b/src/gui/control/tree_list.cpp
index e9e155a8..62b0515e 100644
--- a/src/gui/control/tree_list.cpp
+++ b/src/gui/control/tree_list.cpp
@@ -12,8 +12,6 @@
 #include <wx/renderer.h>
 #include <wx/dcbuffer.h>
 
-DECLARE_TYPEOF_COLLECTION(TreeList::ItemP);
-
 // ----------------------------------------------------------------------------- : TreeList : item managment
 
 void TreeList::rebuild(bool full) {
diff --git a/src/gui/images_export_window.cpp b/src/gui/images_export_window.cpp
index 823b2ee6..f7cb2040 100644
--- a/src/gui/images_export_window.cpp
+++ b/src/gui/images_export_window.cpp
@@ -17,8 +17,6 @@
 #include <util/tagged_string.hpp>
 #include <wx/filename.h>
 
-DECLARE_TYPEOF_COLLECTION(CardP);
-
 // ----------------------------------------------------------------------------- : ImagesExportWindow
 
 ImagesExportWindow::ImagesExportWindow(Window* parent, const SetP& set, const ExportCardSelectionChoices& choices)
diff --git a/src/gui/package_update_list.cpp b/src/gui/package_update_list.cpp
index f4213d9c..aff84cae 100644
--- a/src/gui/package_update_list.cpp
+++ b/src/gui/package_update_list.cpp
@@ -13,11 +13,6 @@
 #include <gfx/gfx.hpp>
 #include <wx/url.h>
 
-DECLARE_TYPEOF_COLLECTION(InstallablePackageP);
-DECLARE_TYPEOF_COLLECTION(PackageUpdateList::TreeItemP);
-DECLARE_TYPEOF_COLLECTION(TreeList::ItemP);
-
-
 // ----------------------------------------------------------------------------- : PackageUpdateList::TreeItem
 
 void PackageUpdateList::TreeItem::add(const InstallablePackageP& package, const String& path, int level) {
diff --git a/src/gui/packages_window.cpp b/src/gui/packages_window.cpp
index 7cec19eb..772853e2 100644
--- a/src/gui/packages_window.cpp
+++ b/src/gui/packages_window.cpp
@@ -25,10 +25,6 @@
 
 DECLARE_POINTER_TYPE(Installer);
 
-DECLARE_TYPEOF_COLLECTION(PackageDependencyP);
-DECLARE_TYPEOF_COLLECTION(InstallablePackageP);
-DECLARE_TYPEOF_COLLECTION(DownloadableInstallerP);
-
 // ----------------------------------------------------------------------------- : TODO: MOVE
 
 /*
diff --git a/src/gui/preferences_window.cpp b/src/gui/preferences_window.cpp
index 2da69418..f51012fe 100644
--- a/src/gui/preferences_window.cpp
+++ b/src/gui/preferences_window.cpp
@@ -16,8 +16,6 @@
 #include <wx/filename.h>
 #include <wx/notebook.h>
 
-DECLARE_TYPEOF_COLLECTION(PackagedP);
-
 // use a combo box for the zoom choices instead of a spin control
 #define USE_ZOOM_COMBOBOX 1
 
diff --git a/src/gui/print_window.cpp b/src/gui/print_window.cpp
index fd77973c..d7791edd 100644
--- a/src/gui/print_window.cpp
+++ b/src/gui/print_window.cpp
@@ -16,7 +16,6 @@
 #include <render/card/viewer.hpp>
 #include <wx/print.h>
 
-DECLARE_TYPEOF_COLLECTION(CardP);
 DECLARE_POINTER_TYPE(PageLayout);
 
 // ----------------------------------------------------------------------------- : Layout
diff --git a/src/gui/profiler_window.cpp b/src/gui/profiler_window.cpp
index 8f0fb476..fc7c37ac 100644
--- a/src/gui/profiler_window.cpp
+++ b/src/gui/profiler_window.cpp
@@ -12,8 +12,6 @@
 
 #if USE_SCRIPT_PROFILING
 
-DECLARE_TYPEOF_COLLECTION(FunctionProfileP);
-
 // -----------------------------------------------------------------------------
 // Profiler Panel : class
 // -----------------------------------------------------------------------------
diff --git a/src/gui/set/cards_panel.cpp b/src/gui/set/cards_panel.cpp
index 8c7820b7..52c4da0e 100644
--- a/src/gui/set/cards_panel.cpp
+++ b/src/gui/set/cards_panel.cpp
@@ -27,8 +27,6 @@
 #include <util/window_id.hpp>
 #include <wx/splitter.h>
 
-DECLARE_TYPEOF_COLLECTION(AddCardsScriptP);
-
 #ifdef EVT_TOOL_DROPDOWN
   // This is only available after patching wx or in version 2.10
   // see http://trac.wxwidgets.org/ticket/8556
diff --git a/src/gui/set/console_panel.cpp b/src/gui/set/console_panel.cpp
index 3c195c8d..1e85be6a 100644
--- a/src/gui/set/console_panel.cpp
+++ b/src/gui/set/console_panel.cpp
@@ -18,8 +18,6 @@
 #include <wx/clipbrd.h>
 
 DECLARE_POINTER_TYPE(ConsoleMessage);
-DECLARE_TYPEOF_COLLECTION(ScriptParseError);
-DECLARE_TYPEOF_COLLECTION(ConsoleMessageP);
 
 // ----------------------------------------------------------------------------- : MessageControl
 
diff --git a/src/gui/set/keywords_panel.cpp b/src/gui/set/keywords_panel.cpp
index 89b1bca2..9c58d6c2 100644
--- a/src/gui/set/keywords_panel.cpp
+++ b/src/gui/set/keywords_panel.cpp
@@ -23,10 +23,6 @@
 #include <wx/statline.h>
 #include <wx/artprov.h>
 
-DECLARE_TYPEOF_COLLECTION(ParamReferenceTypeP);
-DECLARE_TYPEOF_COLLECTION(KeywordParamP);
-DECLARE_TYPEOF_COLLECTION(KeywordModeP);
-
 // ----------------------------------------------------------------------------- : KeywordsPanel
 
 KeywordsPanel::KeywordsPanel(Window* parent, int id)
diff --git a/src/gui/set/random_pack_panel.cpp b/src/gui/set/random_pack_panel.cpp
index f750e671..436aa56d 100644
--- a/src/gui/set/random_pack_panel.cpp
+++ b/src/gui/set/random_pack_panel.cpp
@@ -20,11 +20,6 @@
 #include <wx/spinctrl.h>
 #include <wx/dcbuffer.h>
 
-DECLARE_TYPEOF_COLLECTION(PackTypeP);
-DECLARE_TYPEOF_COLLECTION(PackItemP);
-DECLARE_TYPEOF_COLLECTION(CardP);
-DECLARE_TYPEOF_COLLECTION(PackAmountPicker);
-
 // ----------------------------------------------------------------------------- : RandomCardList
 
 /// A card list that contains the 
diff --git a/src/gui/set/stats_panel.cpp b/src/gui/set/stats_panel.cpp
index 78e38386..53778df9 100644
--- a/src/gui/set/stats_panel.cpp
+++ b/src/gui/set/stats_panel.cpp
@@ -22,13 +22,6 @@
 #include <gfx/gfx.hpp>
 #include <wx/splitter.h>
 
-DECLARE_TYPEOF_COLLECTION(StatsDimensionP);
-DECLARE_TYPEOF_COLLECTION(String);
-DECLARE_TYPEOF_COLLECTION(size_t);
-DECLARE_TYPEOF_COLLECTION(CardP);
-typedef pair<StatsDimensionP,String> pair_StatsDimensionP_String;
-DECLARE_TYPEOF_COLLECTION(pair_StatsDimensionP_String);
-
 // ----------------------------------------------------------------------------- : StatCategoryList
 #if !USE_DIMENSION_LISTS
 
diff --git a/src/gui/set/style_panel.cpp b/src/gui/set/style_panel.cpp
index 0f77461a..71b57a44 100644
--- a/src/gui/set/style_panel.cpp
+++ b/src/gui/set/style_panel.cpp
@@ -21,8 +21,6 @@
 #include <data/action/set.hpp>
 #include <data/action/value.hpp>
 
-DECLARE_TYPEOF_COLLECTION(FieldP);
-
 // ----------------------------------------------------------------------------- : StylePanel : initialization
 
 StylePanel::StylePanel(Window* parent, int id)
diff --git a/src/gui/set/window.cpp b/src/gui/set/window.cpp
index bed9d624..9952c092 100644
--- a/src/gui/set/window.cpp
+++ b/src/gui/set/window.cpp
@@ -40,10 +40,6 @@
 #include <data/action/value.hpp>
 #include <data/action/set.hpp>
 
-DECLARE_TYPEOF_COLLECTION(SetWindowPanel*);
-DECLARE_TYPEOF_COLLECTION(SetWindow*);
-DECLARE_TYPEOF_COLLECTION(String);
-
 // ----------------------------------------------------------------------------- : Constructor
 
 SetWindow::SetWindow(Window* parent, const SetP& set)
diff --git a/src/gui/symbol/part_list.cpp b/src/gui/symbol/part_list.cpp
index 77ee3239..36ec085a 100644
--- a/src/gui/symbol/part_list.cpp
+++ b/src/gui/symbol/part_list.cpp
@@ -18,8 +18,6 @@
 #include <wx/dcbuffer.h>
 #include <wx/caret.h>
 
-DECLARE_TYPEOF_COLLECTION(SymbolPartP);
-
 // ----------------------------------------------------------------------------- : Events
 
 DEFINE_EVENT_TYPE(EVENT_PART_SELECT);
diff --git a/src/gui/symbol/point_editor.cpp b/src/gui/symbol/point_editor.cpp
index 85a902dd..5c5925a6 100644
--- a/src/gui/symbol/point_editor.cpp
+++ b/src/gui/symbol/point_editor.cpp
@@ -16,8 +16,6 @@
 #include <util/window_id.hpp>
 #include <util/error.hpp>
 
-DECLARE_TYPEOF_COLLECTION(ControlPointP);
-
 // ----------------------------------------------------------------------------- : SymbolPointEditor
 
 SymbolPointEditor::SymbolPointEditor(SymbolControl* control, const SymbolShapeP& part)
diff --git a/src/gui/symbol/select_editor.cpp b/src/gui/symbol/select_editor.cpp
index 615dbd86..48f218cc 100644
--- a/src/gui/symbol/select_editor.cpp
+++ b/src/gui/symbol/select_editor.cpp
@@ -16,8 +16,6 @@
 #include <util/error.hpp>
 #include <gfx/gfx.hpp>
 
-DECLARE_TYPEOF_COLLECTION(SymbolPartP);
-
 // ----------------------------------------------------------------------------- : SymbolSelectEditor
 
 SymbolSelectEditor::SymbolSelectEditor(SymbolControl* control, bool rotate)
diff --git a/src/gui/symbol/selection.cpp b/src/gui/symbol/selection.cpp
index 1e83cf43..3524d977 100644
--- a/src/gui/symbol/selection.cpp
+++ b/src/gui/symbol/selection.cpp
@@ -11,8 +11,6 @@
 #include <data/symbol.hpp>
 #include <gfx/bezier.hpp>
 
-DECLARE_TYPEOF_COLLECTION(SymbolPartP);
-
 // ----------------------------------------------------------------------------- : Selection
 
 void SymbolPartsSelection::setSymbol(const SymbolP& symbol) {
diff --git a/src/gui/thumbnail_thread.cpp b/src/gui/thumbnail_thread.cpp
index 3e9c3a19..46507894 100644
--- a/src/gui/thumbnail_thread.cpp
+++ b/src/gui/thumbnail_thread.cpp
@@ -12,9 +12,6 @@
 #include <util/error.hpp>
 #include <wx/thread.h>
 
-typedef pair<ThumbnailRequestP,Image> pair_ThumbnailRequestP_Image;
-DECLARE_TYPEOF_COLLECTION(pair_ThumbnailRequestP_Image);
-
 // ----------------------------------------------------------------------------- : Image Cache
 
 String user_settings_dir();
diff --git a/src/gui/update_checker.cpp b/src/gui/update_checker.cpp
index 91d817cb..e046171f 100644
--- a/src/gui/update_checker.cpp
+++ b/src/gui/update_checker.cpp
@@ -20,7 +20,6 @@
 #include <wx/url.h>
 
 DECLARE_POINTER_TYPE(VersionData);
-DECLARE_TYPEOF_COLLECTION(PackageDependencyP);
 
 // ----------------------------------------------------------------------------- : Update data
 
diff --git a/src/gui/value/choice.cpp b/src/gui/value/choice.cpp
index 9ff9444e..75ec8d27 100644
--- a/src/gui/value/choice.cpp
+++ b/src/gui/value/choice.cpp
@@ -14,8 +14,6 @@
 #include <script/image.hpp>
 #include <wx/imaglist.h>
 
-DECLARE_TYPEOF_COLLECTION(ChoiceField::ChoiceP);
-
 // ----------------------------------------------------------------------------- : ChoiceThumbnailRequest
 
 class ChoiceThumbnailRequest : public ThumbnailRequest {
diff --git a/src/gui/value/color.cpp b/src/gui/value/color.cpp
index d33817c9..73f53c54 100644
--- a/src/gui/value/color.cpp
+++ b/src/gui/value/color.cpp
@@ -13,8 +13,6 @@
 #include <data/action/value.hpp>
 #include <wx/colordlg.h>
 
-DECLARE_TYPEOF_COLLECTION(ColorField::ChoiceP);
-
 // ----------------------------------------------------------------------------- : DropDownColorList
 
 // A drop down list of color choices
diff --git a/src/gui/value/package_choice.cpp b/src/gui/value/package_choice.cpp
index 8493c767..f7cb848d 100644
--- a/src/gui/value/package_choice.cpp
+++ b/src/gui/value/package_choice.cpp
@@ -12,8 +12,6 @@
 #include <gui/util.hpp>
 #include <data/action/value.hpp>
 
-DECLARE_TYPEOF_COLLECTION(PackageChoiceValueViewer::Item);
-
 // ----------------------------------------------------------------------------- : DropDownPackageChoiceList
 
 /// A drop down list of color choices
diff --git a/src/gui/value/text.cpp b/src/gui/value/text.cpp
index 136553d8..72155162 100644
--- a/src/gui/value/text.cpp
+++ b/src/gui/value/text.cpp
@@ -25,13 +25,6 @@
 #undef small // some evil windows header defines this
 
 DECLARE_SHARED_POINTER_TYPE(DropDownList);
-DECLARE_TYPEOF_COLLECTION(WordListP);
-DECLARE_TYPEOF_COLLECTION(WordListWordP);
-DECLARE_TYPEOF_COLLECTION(WordListPosP);
-DECLARE_TYPEOF_COLLECTION(AutoReplaceP);
-struct DropDownWordListItem;
-DECLARE_TYPEOF_COLLECTION(DropDownWordListItem);
-DECLARE_TYPEOF_COLLECTION(String);
 
 // ----------------------------------------------------------------------------- : TextValueEditorScrollBar
 
diff --git a/src/render/card/viewer.cpp b/src/render/card/viewer.cpp
index 2b662fce..f62305eb 100644
--- a/src/render/card/viewer.cpp
+++ b/src/render/card/viewer.cpp
@@ -18,9 +18,6 @@
 #include <data/action/set.hpp>
 #include <gui/util.hpp> // clearDC
 
-DECLARE_TYPEOF_COLLECTION(ValueViewerP);
-DECLARE_TYPEOF_NO_REV(IndexMap<FieldP COMMA StyleP>);
-
 // ----------------------------------------------------------------------------- : DataViewer
 
 DataViewer::DataViewer() {}
diff --git a/src/render/symbol/viewer.cpp b/src/render/symbol/viewer.cpp
index 1139c7bf..6d866c41 100644
--- a/src/render/symbol/viewer.cpp
+++ b/src/render/symbol/viewer.cpp
@@ -11,8 +11,6 @@
 #include <util/error.hpp> // clearDC_black
 #include <gui/util.hpp> // clearDC_black
 
-DECLARE_TYPEOF_COLLECTION(SymbolPartP);
-
 // ----------------------------------------------------------------------------- : Simple rendering
 
 Image render_symbol(const SymbolP& symbol, double border_radius, int width, int height, bool editing_hints, bool allow_smaller) {
diff --git a/src/render/text/element.cpp b/src/render/text/element.cpp
index 5f2eb11f..8cdb1c48 100644
--- a/src/render/text/element.cpp
+++ b/src/render/text/element.cpp
@@ -12,7 +12,6 @@
 #include <data/field/text.hpp>
 #include <gfx/color.hpp>
 
-DECLARE_TYPEOF_COLLECTION(TextElementP);
 DECLARE_POINTER_TYPE(FontTextElement);
 
 // ----------------------------------------------------------------------------- : TextElements
diff --git a/src/render/text/viewer.cpp b/src/render/text/viewer.cpp
index f03b9e0c..920dc767 100644
--- a/src/render/text/viewer.cpp
+++ b/src/render/text/viewer.cpp
@@ -10,9 +10,6 @@
 #include <render/text/viewer.hpp>
 #include <algorithm>
 
-DECLARE_TYPEOF_COLLECTION(TextViewer::Line);
-DECLARE_TYPEOF_COLLECTION(double);
-
 // ----------------------------------------------------------------------------- : Line
 
 struct TextViewer::Line {
diff --git a/src/render/value/color.cpp b/src/render/value/color.cpp
index 836bba76..e9c2c8d3 100644
--- a/src/render/value/color.cpp
+++ b/src/render/value/color.cpp
@@ -10,8 +10,6 @@
 #include <render/value/color.hpp>
 #include <render/card/viewer.hpp>
 
-DECLARE_TYPEOF_COLLECTION(ColorField::ChoiceP);
-
 // ----------------------------------------------------------------------------- : ColorValueViewer
 
 IMPLEMENT_VALUE_VIEWER(Color);
diff --git a/src/render/value/multiple_choice.cpp b/src/render/value/multiple_choice.cpp
index a5aacd78..8967ffe1 100644
--- a/src/render/value/multiple_choice.cpp
+++ b/src/render/value/multiple_choice.cpp
@@ -12,8 +12,6 @@
 #include <render/card/viewer.hpp>
 #include <gui/util.hpp>
 
-DECLARE_TYPEOF_COLLECTION(String);
-
 // ----------------------------------------------------------------------------- : MultipleChoiceValueViewer
 
 IMPLEMENT_VALUE_VIEWER(MultipleChoice);
diff --git a/src/render/value/package_choice.cpp b/src/render/value/package_choice.cpp
index 74fabe2a..d2b3f441 100644
--- a/src/render/value/package_choice.cpp
+++ b/src/render/value/package_choice.cpp
@@ -11,9 +11,6 @@
 #include <util/io/package_manager.hpp>
 #include <gui/util.hpp>
 
-DECLARE_TYPEOF_COLLECTION(PackagedP);
-DECLARE_TYPEOF_COLLECTION(PackageChoiceValueViewer::Item);
-
 // ----------------------------------------------------------------------------- : PackageChoiceValueViewer
 
 IMPLEMENT_VALUE_VIEWER(PackageChoice);
diff --git a/src/render/value/symbol.cpp b/src/render/value/symbol.cpp
index 79debc0d..892c0b59 100644
--- a/src/render/value/symbol.cpp
+++ b/src/render/value/symbol.cpp
@@ -14,8 +14,6 @@
 #include <gui/util.hpp> // draw_checker
 #include <util/error.hpp>
 
-DECLARE_TYPEOF_COLLECTION(SymbolVariationP);
-
 // ----------------------------------------------------------------------------- : SymbolValueViewer
 
 IMPLEMENT_VALUE_VIEWER(Symbol);
diff --git a/src/render/value/viewer.cpp b/src/render/value/viewer.cpp
index 76ffac57..dcd1054a 100644
--- a/src/render/value/viewer.cpp
+++ b/src/render/value/viewer.cpp
@@ -10,8 +10,6 @@
 #include <render/value/viewer.hpp>
 #include <render/card/viewer.hpp>
 
-DECLARE_TYPEOF_COLLECTION(wxPoint);
-
 // ----------------------------------------------------------------------------- : ValueViewer
 
 ValueViewer::ValueViewer(DataViewer& parent, const StyleP& style)
diff --git a/src/script/dependency.cpp b/src/script/dependency.cpp
index 96bcae0d..9a5c3fa5 100644
--- a/src/script/dependency.cpp
+++ b/src/script/dependency.cpp
@@ -12,9 +12,6 @@
 #include <util/error.hpp>
 #include <queue>
 
-DECLARE_TYPEOF_COLLECTION(ScriptValueP);
-DECLARE_TYPEOF_COLLECTION(Context::Binding);
-
 // NOTE: dependency.cpp has nothing to do with dependency.hpp, the latter defines the dependency
 // type, which is used here as an abstract type. The header for this source file is context.hpp
 
diff --git a/src/script/functions/basic.cpp b/src/script/functions/basic.cpp
index 729db61f..249b676d 100644
--- a/src/script/functions/basic.cpp
+++ b/src/script/functions/basic.cpp
@@ -18,8 +18,6 @@
 #include <data/game.hpp>
 #include <random>
 
-DECLARE_TYPEOF_COLLECTION(pair<String COMMA ScriptValueP>);
-
 // ----------------------------------------------------------------------------- : Debugging
 
 SCRIPT_FUNCTION(trace) {
diff --git a/src/script/functions/editor.cpp b/src/script/functions/editor.cpp
index 3933e7bc..11b8c145 100644
--- a/src/script/functions/editor.cpp
+++ b/src/script/functions/editor.cpp
@@ -19,12 +19,6 @@
 #include <data/field/multiple_choice.hpp>
 #include <data/action/value.hpp>
 
-DECLARE_TYPEOF_COLLECTION(FieldP);
-DECLARE_TYPEOF_COLLECTION(TextValue*);
-DECLARE_TYPEOF_COLLECTION(String);
-DECLARE_TYPEOF_COLLECTION(pair<String COMMA bool>);
-DECLARE_TYPEOF_COLLECTION(ChoiceField::ChoiceP);
-
 // ----------------------------------------------------------------------------- : Combined editor
 
 // Combining multiple (text) values into a single one
diff --git a/src/script/functions/export.cpp b/src/script/functions/export.cpp
index 594c8cd1..e5fdba09 100644
--- a/src/script/functions/export.cpp
+++ b/src/script/functions/export.cpp
@@ -21,8 +21,6 @@
 #include <wx/wfstream.h>
 #include <wx/filename.h>
 
-DECLARE_TYPEOF_COLLECTION(SymbolFont::DrawableSymbol);
-
 // ----------------------------------------------------------------------------- : Utility
 
 // Make sure we can export files to a data directory
@@ -87,8 +85,6 @@ struct NegTag {
   NegTag(Tag* tag, bool neg) : tag(tag), neg(neg) {}
 };
 
-DECLARE_TYPEOF_COLLECTION(NegTag);
-
 /// A stack of opened HTML tags
 class TagStack {
   public:
diff --git a/src/script/functions/image.cpp b/src/script/functions/image.cpp
index c0d9d0dd..aaa33a32 100644
--- a/src/script/functions/image.cpp
+++ b/src/script/functions/image.cpp
@@ -19,8 +19,6 @@
 #include <gfx/generated_image.hpp>
 #include <render/symbol/filter.hpp>
 
-DECLARE_TYPEOF_COLLECTION(SymbolVariationP);
-
 void parse_enum(const String&, ImageCombine& out);
 
 // ----------------------------------------------------------------------------- : Utility
diff --git a/src/script/functions/regex.cpp b/src/script/functions/regex.cpp
index c54a48a4..370a325b 100644
--- a/src/script/functions/regex.cpp
+++ b/src/script/functions/regex.cpp
@@ -13,7 +13,6 @@
 #include <util/error.hpp>
 
 DECLARE_POINTER_TYPE(ScriptRegex);
-DECLARE_TYPEOF_COLLECTION(pair<Variable COMMA ScriptValueP>);
 
 // ----------------------------------------------------------------------------- : Regex type
 
diff --git a/src/script/parser.cpp b/src/script/parser.cpp
index a70242c5..fb3e831a 100644
--- a/src/script/parser.cpp
+++ b/src/script/parser.cpp
@@ -14,8 +14,6 @@
 #include <util/io/package_manager.hpp> // for "include file" semi hack
 #include <stack>
 
-DECLARE_TYPEOF_COLLECTION(Variable);
-
 #ifdef __WXMSW__
 #define TokenType TokenType_ // some stupid windows header uses our name
 #endif
diff --git a/src/script/profiler.cpp b/src/script/profiler.cpp
index cc59e6e5..057223b9 100644
--- a/src/script/profiler.cpp
+++ b/src/script/profiler.cpp
@@ -16,8 +16,6 @@
   #error "It looks like you are building the final release; disable USE_SCRIPT_PROFILING!"
 #endif
 
-DECLARE_TYPEOF(map<size_t COMMA FunctionProfileP>);
-
 // ----------------------------------------------------------------------------- : Timer
 
 Timer::Timer() {
diff --git a/src/script/script.cpp b/src/script/script.cpp
index 04cac23a..4aae69fe 100644
--- a/src/script/script.cpp
+++ b/src/script/script.cpp
@@ -16,7 +16,6 @@
 
 typedef map<String, Variable> Variables;
 Variables variables;
-DECLARE_TYPEOF(Variables);
 #ifdef _DEBUG
   vector<String> variable_names;
 #endif
@@ -148,8 +147,6 @@ unsigned int Script::getLabel() const {
   return (unsigned int)instructions.size();
 }
 
-DECLARE_TYPEOF_COLLECTION(Instruction);
-
 #ifdef _DEBUG // debugging
 
 String Script::dumpScript() const {
diff --git a/src/script/scriptable.cpp b/src/script/scriptable.cpp
index 7c03c743..f5e151fe 100644
--- a/src/script/scriptable.cpp
+++ b/src/script/scriptable.cpp
@@ -17,8 +17,6 @@
 Alignment from_string(const String&);
 void parse_enum(const String&,Direction&);
 
-DECLARE_TYPEOF_COLLECTION(ScriptParseError);
-
 // ----------------------------------------------------------------------------- : Store
 
 void store(const ScriptValueP& val, String& var)              { var = val->toString(); }
diff --git a/src/script/value.cpp b/src/script/value.cpp
index b7c2b526..da15a68c 100644
--- a/src/script/value.cpp
+++ b/src/script/value.cpp
@@ -14,8 +14,6 @@
 #include <util/error.hpp>
 #include <boost/pool/singleton_pool.hpp>
 
-DECLARE_TYPEOF_COLLECTION(pair<Variable COMMA ScriptValueP>);
-
 // ----------------------------------------------------------------------------- : ScriptValue
 // Base cases
 
diff --git a/src/util/action_stack.cpp b/src/util/action_stack.cpp
index 61977f3d..90c221f7 100644
--- a/src/util/action_stack.cpp
+++ b/src/util/action_stack.cpp
@@ -13,9 +13,6 @@
 
 // ----------------------------------------------------------------------------- : Action stack
 
-DECLARE_TYPEOF_COLLECTION(Action*);
-DECLARE_TYPEOF_COLLECTION(ActionListener*);
-
 ActionStack::ActionStack()
   : save_point(nullptr)
   , last_was_add(false)
diff --git a/src/util/error.cpp b/src/util/error.cpp
index 0f5a6b7a..82b26105 100644
--- a/src/util/error.cpp
+++ b/src/util/error.cpp
@@ -15,8 +15,6 @@
 #endif
 #include <queue>
 
-DECLARE_TYPEOF_COLLECTION(ScriptParseError);
-
 // ----------------------------------------------------------------------------- : Debug utilities
 
 #if defined(_MSC_VER) && defined(_DEBUG) && defined(_CRT_WIDE)
diff --git a/src/util/file_utils.cpp b/src/util/file_utils.cpp
index a814697e..958431e8 100644
--- a/src/util/file_utils.cpp
+++ b/src/util/file_utils.cpp
@@ -13,8 +13,6 @@
 #include <errno.h>
 #include <sys/stat.h>
 
-DECLARE_TYPEOF_COLLECTION(String);
-
 // ----------------------------------------------------------------------------- : File names
 
 String normalize_filename(const String& name) {
diff --git a/src/util/for_each.hpp b/src/util/for_each.hpp
index ea1d7053..a2fc5e7c 100644
--- a/src/util/for_each.hpp
+++ b/src/util/for_each.hpp
@@ -18,12 +18,6 @@
 
 // ----------------------------------------------------------------------------- : Typeof magic
 
-// GCC has a buildin typeof function, so it doesn't need (as much) hacks
-#define DECLARE_TYPEOF(T)
-#define DECLARE_TYPEOF_NO_REV(T)
-#define DECLARE_TYPEOF_CONST(T)
-#define DECLARE_TYPEOF_COLLECTION(T)
-
 #define TYPEOF(Value)      decltype(Value)
 #define TYPEOF_IT(Value)   decltype((Value).begin())
 #define TYPEOF_CIT(Value)  decltype((Value).begin())
@@ -32,14 +26,6 @@
 #define TYPEOF_REF(Value)  decltype(*(Value).begin())&
 #define TYPEOF_CREF(Value) decltype(*(Value).begin())&
 
-/// Use for template classes
-/** i.e.
- *    DECLARE_TYPEOF(pair<a COMMA b>);
- *  instead of
- *    DECLARE_TYPEOF(pair<a,b>);
- */
-#define COMMA ,
-
 // ----------------------------------------------------------------------------- : Looping macros with iterators
 
 /// Iterate over a collection, using an iterator it of type Type
diff --git a/src/util/io/package.cpp b/src/util/io/package.cpp
index 0dd56fe8..a817a002 100644
--- a/src/util/io/package.cpp
+++ b/src/util/io/package.cpp
@@ -16,9 +16,6 @@
 #include <wx/zipstrm.h>
 #include <wx/dir.h>
 
-DECLARE_TYPEOF(Package::FileInfos);
-DECLARE_TYPEOF_COLLECTION(PackageDependencyP);
-
 // ----------------------------------------------------------------------------- : Package : outside
 
 IMPLEMENT_DYNAMIC_ARG(Package*, writing_package,   nullptr);
diff --git a/src/util/io/package.hpp b/src/util/io/package.hpp
index c5c6668f..db8a3b93 100644
--- a/src/util/io/package.hpp
+++ b/src/util/io/package.hpp
@@ -175,7 +175,6 @@ class Package : public IntrusivePtrVirtualBase {
 
   public:
   /// Information on files in the package
-  /** Note: must be public for DECLARE_TYPEOF to work */
   typedef map<String, FileInfo> FileInfos;
   inline const FileInfos& getFileInfos() const { return files; }
   /// When was a file last modified?
diff --git a/src/util/io/package_manager.cpp b/src/util/io/package_manager.cpp
index d9ce42b8..6ea1d736 100644
--- a/src/util/io/package_manager.cpp
+++ b/src/util/io/package_manager.cpp
@@ -19,10 +19,6 @@
 #include <wx/stdpaths.h>
 #include <wx/wfstream.h>
 
-DECLARE_TYPEOF_COLLECTION(InstallablePackageP);
-DECLARE_TYPEOF_COLLECTION(PackageVersionP);
-DECLARE_TYPEOF_COLLECTION(PackageVersion::FileInfo);
-
 // ----------------------------------------------------------------------------- : PackageManager : in memory
 
 PackageManager package_manager;
diff --git a/src/util/string.hpp b/src/util/string.hpp
index 906da627..167c02a7 100644
--- a/src/util/string.hpp
+++ b/src/util/string.hpp
@@ -26,8 +26,6 @@ class wxTextOutputStream;
 /// The string type used throughout MSE
 typedef wxString String;
 
-DECLARE_TYPEOF_NO_REV(String); // iterating over characters in a string
-
 inline wxStdString const& toStdString(String const& s) {
   #if wxUSE_UNICODE_WCHAR
     return s.ToStdWstring();