Moved ../src/core/modules/export_main.h/cpp to ../src/core

Ayuto · Ayuto · commit 3b59af0427c9 · 2015-04-03T23:35:44.000+02:00
Removed the group "Generic" and added the files in this group to the
group "Core".
Renamed group "Module" to "Modules".
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -67,34 +67,20 @@ Set(SOURCEPYTHON_UTILITIES_FILES
 Set(SOURCEPYTHON_CORE_HEADERS
     core/sp_python.h
     core/sp_main.h
+    core/export_main.h
 )
 
 Set(SOURCEPYTHON_CORE_SOURCES
     core/sp_python.cpp
     core/sp_main.cpp
+    core/export_main.cpp
 )
 
 Set(SOURCEPYTHON_CORE_FILES
     ${SOURCEPYTHON_CORE_HEADERS}
     ${SOURCEPYTHON_CORE_SOURCES}
 )
 
-# ------------------------------------------------------------------
-# Generic plugin stuff.
-# ------------------------------------------------------------------
-Set(SOURCEPYTHON_GENERIC_HEADERS
-    core/modules/export_main.h
-)
-
-Set(SOURCEPYTHON_GENERIC_SOURCES
-    core/modules/export_main.cpp
-)
-
-Set(SOURCEPYTHON_GENERIC_FILES
-    ${SOURCEPYTHON_GENERIC_HEADERS}
-    ${SOURCEPYTHON_GENERIC_SOURCES}
-)
-
 # ------------------------------------------------------------------
 # BitBuffers module.
 # ------------------------------------------------------------------
@@ -426,53 +412,51 @@ Set(SOURCEPYTHON_MODULE_FILES
 Source_Group("Header Files\\Core"                           FILES ${SOURCEPYTHON_CORE_HEADERS})
 Source_Group("Header Files\\Patches"                        FILES ${SOURCEPYTHON_PATCHES_HEADERS})
 Source_Group("Header Files\\Utilities"                      FILES ${SOURCEPYTHON_UTILITIES_HEADERS})
-Source_Group("Header Files\\Generic"                        FILES ${SOURCEPYTHON_GENERIC_HEADERS})
-
-Source_Group("Header Files\\Module\\BitBuffers"             FILES ${SOURCEPYTHON_BITBUFFERS_MODULE_HEADERS})
-Source_Group("Header Files\\Module\\Colors"                 FILES ${SOURCEPYTHON_COLORS_MODULE_HEADERS})
-Source_Group("Header Files\\Module\\Commands"               FILES ${SOURCEPYTHON_COMMANDS_MODULE_HEADERS})
-Source_Group("Header Files\\Module\\Core"                   FILES ${SOURCEPYTHON_CORE_MODULE_HEADERS})
-Source_Group("Header Files\\Module\\Cvars"                  FILES ${SOURCEPYTHON_CVARS_MODULE_HEADERS})
-Source_Group("Header Files\\Module\\Effects"                FILES ${SOURCEPYTHON_EFFECTS_MODULE_HEADERS})
-Source_Group("Header Files\\Module\\Engines"                FILES ${SOURCEPYTHON_ENGINES_MODULE_HEADERS})
-Source_Group("Header Files\\Module\\Entities"               FILES ${SOURCEPYTHON_ENTITIES_MODULE_HEADERS})
-Source_Group("Header Files\\Module\\Events"                 FILES ${SOURCEPYTHON_EVENTS_MODULE_HEADERS})
-Source_Group("Header Files\\Module\\Globals"                FILES ${SOURCEPYTHON_GLOBALS_MODULE_HEADERS})
-Source_Group("Header Files\\Module\\KeyValues"              FILES ${SOURCEPYTHON_KEYVALUES_MODULE_HEADERS})
-Source_Group("Header Files\\Module\\Listeners"              FILES ${SOURCEPYTHON_LISTENERS_MODULE_HEADERS})
-Source_Group("Header Files\\Module\\Mathlib"                FILES ${SOURCEPYTHON_MATHLIB_MODULE_HEADERS})
-Source_Group("Header Files\\Module\\Memory"                 FILES ${SOURCEPYTHON_MEMORY_MODULE_HEADERS})
-Source_Group("Header Files\\Module\\Messages"               FILES ${SOURCEPYTHON_MESSAGES_MODULE_HEADERS})
-Source_Group("Header Files\\Module\\Players"                FILES ${SOURCEPYTHON_PLAYERS_MODULE_HEADERS})
-Source_Group("Header Files\\Module\\Filters"                FILES ${SOURCEPYTHON_FILTERS_MODULE_HEADERS})
-Source_Group("Header Files\\Module\\StringTables"           FILES ${SOURCEPYTHON_STRINGTABLES_MODULE_HEADERS})
-Source_Group("Header Files\\Module\\Weapons"                FILES ${SOURCEPYTHON_WEAPONS_MODULE_HEADERS})
+
+Source_Group("Header Files\\Modules\\BitBuffers"             FILES ${SOURCEPYTHON_BITBUFFERS_MODULE_HEADERS})
+Source_Group("Header Files\\Modules\\Colors"                 FILES ${SOURCEPYTHON_COLORS_MODULE_HEADERS})
+Source_Group("Header Files\\Modules\\Commands"               FILES ${SOURCEPYTHON_COMMANDS_MODULE_HEADERS})
+Source_Group("Header Files\\Modules\\Core"                   FILES ${SOURCEPYTHON_CORE_MODULE_HEADERS})
+Source_Group("Header Files\\Modules\\Cvars"                  FILES ${SOURCEPYTHON_CVARS_MODULE_HEADERS})
+Source_Group("Header Files\\Modules\\Effects"                FILES ${SOURCEPYTHON_EFFECTS_MODULE_HEADERS})
+Source_Group("Header Files\\Modules\\Engines"                FILES ${SOURCEPYTHON_ENGINES_MODULE_HEADERS})
+Source_Group("Header Files\\Modules\\Entities"               FILES ${SOURCEPYTHON_ENTITIES_MODULE_HEADERS})
+Source_Group("Header Files\\Modules\\Events"                 FILES ${SOURCEPYTHON_EVENTS_MODULE_HEADERS})
+Source_Group("Header Files\\Modules\\Globals"                FILES ${SOURCEPYTHON_GLOBALS_MODULE_HEADERS})
+Source_Group("Header Files\\Modules\\KeyValues"              FILES ${SOURCEPYTHON_KEYVALUES_MODULE_HEADERS})
+Source_Group("Header Files\\Modules\\Listeners"              FILES ${SOURCEPYTHON_LISTENERS_MODULE_HEADERS})
+Source_Group("Header Files\\Modules\\Mathlib"                FILES ${SOURCEPYTHON_MATHLIB_MODULE_HEADERS})
+Source_Group("Header Files\\Modules\\Memory"                 FILES ${SOURCEPYTHON_MEMORY_MODULE_HEADERS})
+Source_Group("Header Files\\Modules\\Messages"               FILES ${SOURCEPYTHON_MESSAGES_MODULE_HEADERS})
+Source_Group("Header Files\\Modules\\Players"                FILES ${SOURCEPYTHON_PLAYERS_MODULE_HEADERS})
+Source_Group("Header Files\\Modules\\Filters"                FILES ${SOURCEPYTHON_FILTERS_MODULE_HEADERS})
+Source_Group("Header Files\\Modules\\StringTables"           FILES ${SOURCEPYTHON_STRINGTABLES_MODULE_HEADERS})
+Source_Group("Header Files\\Modules\\Weapons"                FILES ${SOURCEPYTHON_WEAPONS_MODULE_HEADERS})
 
 Source_Group("Source Files\\Core"                           FILES ${SOURCEPYTHON_CORE_SOURCES})
 Source_Group("Source Files\\Patches"                        FILES ${SOURCEPYTHON_PATCHES_SOURCES})
 Source_Group("Source Files\\Utilities"                      FILES ${SOURCEPYTHON_UTILITIES_SOURCES})
-Source_Group("Source Files\\Generic"                        FILES ${SOURCEPYTHON_GENERIC_SOURCES})
-
-Source_Group("Source Files\\Module\\BitBuffers"             FILES ${SOURCEPYTHON_BITBUFFERS_MODULE_SOURCES})
-Source_Group("Source Files\\Module\\Colors"                 FILES ${SOURCEPYTHON_COLORS_MODULE_SOURCES})
-Source_Group("Source Files\\Module\\Commands"               FILES ${SOURCEPYTHON_COMMANDS_MODULE_SOURCES})
-Source_Group("Source Files\\Module\\Core"                   FILES ${SOURCEPYTHON_CORE_MODULE_SOURCES})
-Source_Group("Source Files\\Module\\Cvars"                  FILES ${SOURCEPYTHON_CVARS_MODULE_SOURCES})
-Source_Group("Source Files\\Module\\Effects"                FILES ${SOURCEPYTHON_EFFECTS_MODULE_SOURCES})
-Source_Group("Source Files\\Module\\Engines"                FILES ${SOURCEPYTHON_ENGINES_MODULE_SOURCES})
-Source_Group("Source Files\\Module\\Entities"               FILES ${SOURCEPYTHON_ENTITIES_MODULE_SOURCES})
-Source_Group("Source Files\\Module\\Events"                 FILES ${SOURCEPYTHON_EVENTS_MODULE_SOURCES})
-Source_Group("Source Files\\Module\\Globals"                FILES ${SOURCEPYTHON_GLOBALS_MODULE_SOURCES})
-Source_Group("Source Files\\Module\\KeyValues"              FILES ${SOURCEPYTHON_KEYVALUES_MODULE_SOURCES})
-Source_Group("Source Files\\Module\\Listeners"              FILES ${SOURCEPYTHON_LISTENERS_MODULE_SOURCES})
-Source_Group("Source Files\\Module\\Mathlib"                FILES ${SOURCEPYTHON_MATHLIB_MODULE_SOURCES})
-Source_Group("Source Files\\Module\\Memory"                 FILES ${SOURCEPYTHON_MEMORY_MODULE_SOURCES})
-Source_Group("Source Files\\Module\\Messages"               FILES ${SOURCEPYTHON_MESSAGES_MODULE_SOURCES})
-Source_Group("Source Files\\Module\\Messages\\${BRANCH}"    FILES ${SOURCEPYTHON_MESSAGES_MODULE_GAME_SOURCES})
-Source_Group("Source Files\\Module\\Players"                FILES ${SOURCEPYTHON_PLAYERS_MODULE_SOURCES})
-Source_Group("Source Files\\Module\\Filters"                FILES ${SOURCEPYTHON_FILTERS_MODULE_SOURCES})
-Source_Group("Source Files\\Module\\StringTables"           FILES ${SOURCEPYTHON_STRINGTABLES_MODULE_SOURCES})
-Source_Group("Source Files\\Module\\Weapons"                FILES ${SOURCEPYTHON_WEAPONS_MODULE_SOURCES})
+
+Source_Group("Source Files\\Modules\\BitBuffers"             FILES ${SOURCEPYTHON_BITBUFFERS_MODULE_SOURCES})
+Source_Group("Source Files\\Modules\\Colors"                 FILES ${SOURCEPYTHON_COLORS_MODULE_SOURCES})
+Source_Group("Source Files\\Modules\\Commands"               FILES ${SOURCEPYTHON_COMMANDS_MODULE_SOURCES})
+Source_Group("Source Files\\Modules\\Core"                   FILES ${SOURCEPYTHON_CORE_MODULE_SOURCES})
+Source_Group("Source Files\\Modules\\Cvars"                  FILES ${SOURCEPYTHON_CVARS_MODULE_SOURCES})
+Source_Group("Source Files\\Modules\\Effects"                FILES ${SOURCEPYTHON_EFFECTS_MODULE_SOURCES})
+Source_Group("Source Files\\Modules\\Engines"                FILES ${SOURCEPYTHON_ENGINES_MODULE_SOURCES})
+Source_Group("Source Files\\Modules\\Entities"               FILES ${SOURCEPYTHON_ENTITIES_MODULE_SOURCES})
+Source_Group("Source Files\\Modules\\Events"                 FILES ${SOURCEPYTHON_EVENTS_MODULE_SOURCES})
+Source_Group("Source Files\\Modules\\Globals"                FILES ${SOURCEPYTHON_GLOBALS_MODULE_SOURCES})
+Source_Group("Source Files\\Modules\\KeyValues"              FILES ${SOURCEPYTHON_KEYVALUES_MODULE_SOURCES})
+Source_Group("Source Files\\Modules\\Listeners"              FILES ${SOURCEPYTHON_LISTENERS_MODULE_SOURCES})
+Source_Group("Source Files\\Modules\\Mathlib"                FILES ${SOURCEPYTHON_MATHLIB_MODULE_SOURCES})
+Source_Group("Source Files\\Modules\\Memory"                 FILES ${SOURCEPYTHON_MEMORY_MODULE_SOURCES})
+Source_Group("Source Files\\Modules\\Messages"               FILES ${SOURCEPYTHON_MESSAGES_MODULE_SOURCES})
+Source_Group("Source Files\\Modules\\Messages\\${BRANCH}"    FILES ${SOURCEPYTHON_MESSAGES_MODULE_GAME_SOURCES})
+Source_Group("Source Files\\Modules\\Players"                FILES ${SOURCEPYTHON_PLAYERS_MODULE_SOURCES})
+Source_Group("Source Files\\Modules\\Filters"                FILES ${SOURCEPYTHON_FILTERS_MODULE_SOURCES})
+Source_Group("Source Files\\Modules\\StringTables"           FILES ${SOURCEPYTHON_STRINGTABLES_MODULE_SOURCES})
+Source_Group("Source Files\\Modules\\Weapons"                FILES ${SOURCEPYTHON_WEAPONS_MODULE_SOURCES})
 
 # ------------------------------------------------------------------
 # All SourcePython source files. Ideally we break out each group of
@@ -486,7 +470,6 @@ Source_Group("Source Files\\Module\\Weapons"                FILES ${SOURCEPYTHON
 # ------------------------------------------------------------------
 Add_Library(core SHARED
     ${SOURCEPYTHON_CORE_FILES}
-    ${SOURCEPYTHON_GENERIC_FILES}
     ${SOURCEPYTHON_MODULE_FILES}
     ${SOURCEPYTHON_UTILITIES_FILES}
 )
diff --git a/src/core/export_main.cpp b/src/core/export_main.cpp
diff --git a/src/core/export_main.h b/src/core/export_main.h
diff --git a/src/core/modules/bitbuffers/bitbuffers_wrap_python.cpp b/src/core/modules/bitbuffers/bitbuffers_wrap_python.cpp
@@ -27,7 +27,7 @@
 //-----------------------------------------------------------------------------
 // Includes.
 //-----------------------------------------------------------------------------
-#include "modules/export_main.h"
+#include "export_main.h"
 #include "utilities/wrap_macros.h"
 #include "bitbuffers_wrap.h"
 #include "modules/memory/memory_tools.h"
diff --git a/src/core/modules/colors/colors_wrap_python.cpp b/src/core/modules/colors/colors_wrap_python.cpp
@@ -27,7 +27,7 @@
 //-----------------------------------------------------------------------------
 // Includes.
 //-----------------------------------------------------------------------------
-#include "modules/export_main.h"
+#include "export_main.h"
 #include "utilities/wrap_macros.h"
 #include "colors_wrap.h"
 #include "modules/memory/memory_tools.h"
diff --git a/src/core/modules/commands/commands_client_wrap_python.cpp b/src/core/modules/commands/commands_client_wrap_python.cpp
@@ -28,7 +28,7 @@
 // Includes.
 //-----------------------------------------------------------------------------
 #include "commands_client_wrap.h"
-#include "modules/export_main.h"
+#include "export_main.h"
 #include "utilities/wrap_macros.h"
 #include "modules/memory/memory_tools.h"
 
diff --git a/src/core/modules/commands/commands_say_wrap_python.cpp b/src/core/modules/commands/commands_say_wrap_python.cpp
@@ -28,7 +28,7 @@
 // Includes.
 //-----------------------------------------------------------------------------
 #include "commands_say_wrap.h"
-#include "modules/export_main.h"
+#include "export_main.h"
 #include "utilities/wrap_macros.h"
 #include "modules/memory/memory_tools.h"
 
diff --git a/src/core/modules/commands/commands_server_wrap_python.cpp b/src/core/modules/commands/commands_server_wrap_python.cpp
@@ -28,7 +28,7 @@
 // Includes.
 //-----------------------------------------------------------------------------
 #include "commands_server_wrap.h"
-#include "modules/export_main.h"
+#include "export_main.h"
 #include "utilities/wrap_macros.h"
 #include "modules/memory/memory_tools.h"
 
diff --git a/src/core/modules/commands/commands_wrap_python.cpp b/src/core/modules/commands/commands_wrap_python.cpp
@@ -30,7 +30,7 @@
 #include "commands_wrap.h"
 #include "commands_server_wrap.h"
 #include "commands_say_wrap.h"
-#include "modules/export_main.h"
+#include "export_main.h"
 #include "utilities/wrap_macros.h"
 #include "modules/memory/memory_tools.h"
 
diff --git a/src/core/modules/core/core_wrap_python.cpp b/src/core/modules/core/core_wrap_python.cpp
@@ -27,7 +27,7 @@
 //-----------------------------------------------------------------------------
 // Includes.
 //-----------------------------------------------------------------------------
-#include "modules/export_main.h"
+#include "export_main.h"
 #include "sp_main.h"
 
 extern CSourcePython g_SourcePythonPlugin;
diff --git a/src/core/modules/cvars/cvars_wrap_python.cpp b/src/core/modules/cvars/cvars_wrap_python.cpp
@@ -29,7 +29,7 @@
 //-----------------------------------------------------------------------------
 #include "icvar.h"
 #include "convar.h"
-#include "modules/export_main.h"
+#include "export_main.h"
 #include "modules/memory/memory_tools.h"
 
 #include ENGINE_INCLUDE_PATH(cvars_wrap.h)
diff --git a/src/core/modules/effects/effects_wrap_python.cpp b/src/core/modules/effects/effects_wrap_python.cpp
@@ -39,7 +39,7 @@
 #include "game/shared/itempents.h"
 #include "game/shared/effect_dispatch_data.h"
 #include "utilities/wrap_macros.h"
-#include "modules/export_main.h"
+#include "export_main.h"
 #include "modules/memory/memory_tools.h"
 #include "effects_wrap.h"
 
diff --git a/src/core/modules/engines/engines_wrap_python.cpp b/src/core/modules/engines/engines_wrap_python.cpp
@@ -32,7 +32,7 @@
 #include <Windows.h>
 #endif
 
-#include "modules/export_main.h"
+#include "export_main.h"
 #include "utilities/conversions.h"
 
 #include "dt_send.h"
diff --git a/src/core/modules/entities/entities_constants_wrap_python.cpp b/src/core/modules/entities/entities_constants_wrap_python.cpp
@@ -28,7 +28,7 @@
 // Includes.
 //-----------------------------------------------------------------------------
 #include <climits>
-#include "modules/export_main.h"
+#include "export_main.h"
 #include "utilities/wrap_macros.h"
 #include "mathlib/vector.h"
 #include "tier1/utlvector.h"
diff --git a/src/core/modules/entities/entities_datamaps_wrap_python.cpp b/src/core/modules/entities/entities_datamaps_wrap_python.cpp
@@ -27,7 +27,7 @@
 //-----------------------------------------------------------------------------
 // Includes.
 //-----------------------------------------------------------------------------
-#include "modules/export_main.h"
+#include "export_main.h"
 #include "utilities/wrap_macros.h"
 #include "entities_datamaps_wrap.h"
 #include "modules/memory/memory_tools.h"
diff --git a/src/core/modules/entities/entities_factories_wrap_python.cpp b/src/core/modules/entities/entities_factories_wrap_python.cpp
@@ -29,7 +29,7 @@
 //-----------------------------------------------------------------------------
 #include "utilities/wrap_macros.h"
 #include "entities_factories_wrap.h"
-#include "modules/export_main.h"
+#include "export_main.h"
 
 #include ENGINE_INCLUDE_PATH(entities_factories_wrap_python.h)
 
diff --git a/src/core/modules/entities/entities_helpers_wrap_python.cpp b/src/core/modules/entities/entities_helpers_wrap_python.cpp
@@ -28,7 +28,7 @@
 // Includes
 //-----------------------------------------------------------------------------
 #include "entities_helpers_wrap.h"
-#include "modules/export_main.h"
+#include "export_main.h"
 #include "utilities/wrap_macros.h"
 
 #include ENGINE_INCLUDE_PATH(entities_helpers_wrap.h)
diff --git a/src/core/modules/entities/entities_props_wrap_python.cpp b/src/core/modules/entities/entities_props_wrap_python.cpp
@@ -27,7 +27,7 @@
 //-----------------------------------------------------------------------------
 // Includes.
 //-----------------------------------------------------------------------------
-#include "modules/export_main.h"
+#include "export_main.h"
 #include "utilities/wrap_macros.h"
 #include "dt_common.h"
 #include "dt_send.h"
diff --git a/src/core/modules/entities/entities_wrap_python.cpp b/src/core/modules/entities/entities_wrap_python.cpp
@@ -36,7 +36,7 @@
 #include "entities_wrap.h"
 #include "utilities/sp_util.h"
 #include "modules/memory/memory_tools.h"
-#include "modules/export_main.h"
+#include "export_main.h"
 using namespace boost::python;
 
 #include ENGINE_INCLUDE_PATH(entities_wrap_python.h)
diff --git a/src/core/modules/events/events_wrap_python.cpp b/src/core/modules/events/events_wrap_python.cpp
@@ -28,7 +28,7 @@
 // Includes
 //-----------------------------------------------------------------------------
 #include "igameevents.h"
-#include "modules/export_main.h"
+#include "export_main.h"
 #include "modules/memory/memory_tools.h"
 
 #ifndef EVENT_DEBUG_ID_INIT
diff --git a/src/core/modules/filters/filters_recipients_wrap_python.cpp b/src/core/modules/filters/filters_recipients_wrap_python.cpp
@@ -30,7 +30,7 @@
 //-----------------------------------------------------------------------------
 // Includes
 //-----------------------------------------------------------------------------
-#include "modules/export_main.h"
+#include "export_main.h"
 #include "filters_recipients_wrap.h"
 #include "modules/memory/memory_tools.h"
 
diff --git a/src/core/modules/globals/globals_wrap_python.cpp b/src/core/modules/globals/globals_wrap_python.cpp
@@ -27,7 +27,7 @@
 //-----------------------------------------------------------------------------
 // Includes
 //-----------------------------------------------------------------------------
-#include "modules/export_main.h"
+#include "export_main.h"
 #include "modules/memory/memory_tools.h"
 #include "edict.h"
 #include ENGINE_INCLUDE_PATH(globals_wrap_python.h)
diff --git a/src/core/modules/keyvalues/keyvalues_wrap_python.cpp b/src/core/modules/keyvalues/keyvalues_wrap_python.cpp
@@ -29,7 +29,7 @@
 //---------------------------------------------------------------------------------
 #include "KeyValues.h"
 #include "filesystem.h"
-#include "modules/export_main.h"
+#include "export_main.h"
 #include "modules/memory/memory_tools.h"
 
 //---------------------------------------------------------------------------------
diff --git a/src/core/modules/listeners/listeners_wrap_python.cpp b/src/core/modules/listeners/listeners_wrap_python.cpp
@@ -27,7 +27,7 @@
 //-----------------------------------------------------------------------------
 // Includes
 //-----------------------------------------------------------------------------
-#include "modules/export_main.h"
+#include "export_main.h"
 #include "utilities/wrap_macros.h"
 #include "listeners_manager.h"
 
diff --git a/src/core/modules/mathlib/mathlib_wrap_python.cpp b/src/core/modules/mathlib/mathlib_wrap_python.cpp
@@ -27,7 +27,7 @@
 //-----------------------------------------------------------------------------
 // Includes
 //-----------------------------------------------------------------------------
-#include "modules/export_main.h"
+#include "export_main.h"
 #include "mathlib/vector.h"
 #include "mathlib/mathlib.h"
 #include "utilities/sp_util.h"
diff --git a/src/core/modules/memory/memory_scanner.h b/src/core/modules/memory/memory_scanner.h
@@ -31,7 +31,7 @@
 // Includes
 //-----------------------------------------------------------------------------
 #include <list>
-#include "modules/export_main.h"
+#include "export_main.h"
 #include "memory_tools.h"
 
 struct Signature_t
diff --git a/src/core/modules/memory/memory_wrap_python.cpp b/src/core/modules/memory/memory_wrap_python.cpp
@@ -27,7 +27,7 @@
 //-----------------------------------------------------------------------------
 // Includes
 //-----------------------------------------------------------------------------
-#include "modules/export_main.h"
+#include "export_main.h"
 #include "memory_scanner.h"
 #include "memory_tools.h"
 #include "memory_hooks.h"
diff --git a/src/core/modules/messages/messages_wrap_python.cpp b/src/core/modules/messages/messages_wrap_python.cpp
@@ -27,7 +27,7 @@
 //-----------------------------------------------------------------------------
 // Includes.
 //-----------------------------------------------------------------------------
-#include "modules/export_main.h"
+#include "export_main.h"
 using namespace boost::python;
 
 #include "modules/memory/memory_tools.h"
diff --git a/src/core/modules/players/players_bots_wrap_python.cpp b/src/core/modules/players/players_bots_wrap_python.cpp
@@ -27,7 +27,7 @@
 //-----------------------------------------------------------------------------
 // Includes.
 //-----------------------------------------------------------------------------
-#include "modules/export_main.h"
+#include "export_main.h"
 using namespace boost::python;
 
 #include "modules/memory/memory_tools.h"
diff --git a/src/core/modules/players/players_constants_wrap_python.cpp b/src/core/modules/players/players_constants_wrap_python.cpp
@@ -28,7 +28,7 @@
 // Includes.
 //-----------------------------------------------------------------------------
 #include <climits>
-#include "modules/export_main.h"
+#include "export_main.h"
 #include "utilities/wrap_macros.h"
 #include "const.h"
 #include "game/shared/in_buttons.h"
diff --git a/src/core/modules/players/players_helpers_wrap_python.cpp b/src/core/modules/players/players_helpers_wrap_python.cpp
@@ -28,7 +28,7 @@
 // Includes
 //-----------------------------------------------------------------------------
 #include "modules/entities/entities_helpers_wrap.h"
-#include "modules/export_main.h"
+#include "export_main.h"
 #include "utilities/wrap_macros.h"
 
 
diff --git a/src/core/modules/players/players_wrap_python.cpp b/src/core/modules/players/players_wrap_python.cpp
diff --git a/src/core/modules/stringtables/stringtables_wrap_python.cpp b/src/core/modules/stringtables/stringtables_wrap_python.cpp
diff --git a/src/core/modules/weapons/weapons_constants_wrap_python.cpp b/src/core/modules/weapons/weapons_constants_wrap_python.cpp
diff --git a/src/core/modules/weapons/weapons_scripts_wrap_python.cpp b/src/core/modules/weapons/weapons_scripts_wrap_python.cpp
diff --git a/src/core/sp_python.cpp b/src/core/sp_python.cpp
