#5231: Move core module sources to core/ folder, disentangle a lot of…

… #includes all across the files. Move StaticModule helper to static library.
codereader · May 3, 2020 · b17664d · b17664d
1 parent 536a76d
commit b17664d
Show file tree

Hide file tree

Showing 140 changed files with 219 additions and 243 deletions.
diff --git a/radiant/Radiant.cpp → core/Radiant.cpp b/radiant/Radiant.cpp → core/Radiant.cpp
@@ -9,7 +9,7 @@
 #include "log/LogStream.h"
 #include "log/LogWriter.h"
 #include "log/LogFile.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "messagebus/MessageBus.h"
 
 #ifndef POSIX

diff --git a/radiant/Radiant.h → core/Radiant.h b/radiant/Radiant.h → core/Radiant.h
diff --git a/...nt/commandsystem/CaseInsensitiveCompare.h → core/commandsystem/CaseInsensitiveCompare.h b/...nt/commandsystem/CaseInsensitiveCompare.h → core/commandsystem/CaseInsensitiveCompare.h
diff --git a/radiant/commandsystem/Command.h → core/commandsystem/Command.h b/radiant/commandsystem/Command.h → core/commandsystem/Command.h
diff --git a/radiant/commandsystem/CommandSystem.cpp → core/commandsystem/CommandSystem.cpp b/radiant/commandsystem/CommandSystem.cpp → core/commandsystem/CommandSystem.cpp
@@ -12,7 +12,7 @@
 #include <functional>
 #include "string/trim.h"
 #include "string/predicate.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace cmd
 {

diff --git a/radiant/commandsystem/CommandSystem.h → core/commandsystem/CommandSystem.h b/radiant/commandsystem/CommandSystem.h → core/commandsystem/CommandSystem.h
diff --git a/radiant/commandsystem/CommandTokeniser.h → core/commandsystem/CommandTokeniser.h b/radiant/commandsystem/CommandTokeniser.h → core/commandsystem/CommandTokeniser.h
diff --git a/radiant/commandsystem/Executable.h → core/commandsystem/Executable.h b/radiant/commandsystem/Executable.h → core/commandsystem/Executable.h
diff --git a/radiant/commandsystem/Statement.h → core/commandsystem/Statement.h b/radiant/commandsystem/Statement.h → core/commandsystem/Statement.h
diff --git a/radiant/log/COutRedirector.cpp → core/log/COutRedirector.cpp b/radiant/log/COutRedirector.cpp → core/log/COutRedirector.cpp
diff --git a/radiant/log/COutRedirector.h → core/log/COutRedirector.h b/radiant/log/COutRedirector.h → core/log/COutRedirector.h
diff --git a/radiant/log/LogFile.cpp → core/log/LogFile.cpp b/radiant/log/LogFile.cpp → core/log/LogFile.cpp
diff --git a/radiant/log/LogFile.h → core/log/LogFile.h b/radiant/log/LogFile.h → core/log/LogFile.h
diff --git a/radiant/log/LogStream.cpp → core/log/LogStream.cpp b/radiant/log/LogStream.cpp → core/log/LogStream.cpp
diff --git a/radiant/log/LogStream.h → core/log/LogStream.h b/radiant/log/LogStream.h → core/log/LogStream.h
diff --git a/radiant/log/LogStreamBuf.cpp → core/log/LogStreamBuf.cpp b/radiant/log/LogStreamBuf.cpp → core/log/LogStreamBuf.cpp
diff --git a/radiant/log/LogStreamBuf.h → core/log/LogStreamBuf.h b/radiant/log/LogStreamBuf.h → core/log/LogStreamBuf.h
diff --git a/radiant/log/LogWriter.cpp → core/log/LogWriter.cpp b/radiant/log/LogWriter.cpp → core/log/LogWriter.cpp
diff --git a/radiant/log/LogWriter.h → core/log/LogWriter.h b/radiant/log/LogWriter.h → core/log/LogWriter.h
diff --git a/radiant/log/StringLogDevice.cpp → core/log/StringLogDevice.cpp b/radiant/log/StringLogDevice.cpp → core/log/StringLogDevice.cpp
diff --git a/radiant/log/StringLogDevice.h → core/log/StringLogDevice.h b/radiant/log/StringLogDevice.h → core/log/StringLogDevice.h
diff --git a/radiant/messagebus/MessageBus.h → core/messagebus/MessageBus.h b/radiant/messagebus/MessageBus.h → core/messagebus/MessageBus.h
diff --git a/radiant/modulesystem/ModuleLoader.cpp → core/modulesystem/ModuleLoader.cpp b/radiant/modulesystem/ModuleLoader.cpp → core/modulesystem/ModuleLoader.cpp
diff --git a/radiant/modulesystem/ModuleLoader.h → core/modulesystem/ModuleLoader.h b/radiant/modulesystem/ModuleLoader.h → core/modulesystem/ModuleLoader.h
diff --git a/radiant/modulesystem/ModuleRegistry.cpp → core/modulesystem/ModuleRegistry.cpp b/radiant/modulesystem/ModuleRegistry.cpp → core/modulesystem/ModuleRegistry.cpp
@@ -5,7 +5,6 @@
 #include "itextstream.h"
 #include <stdexcept>
 #include <iostream>
-#include "ApplicationContextImpl.h"
 #include "ModuleLoader.h"
 
 #include <wx/app.h>

diff --git a/radiant/modulesystem/ModuleRegistry.h → core/modulesystem/ModuleRegistry.h b/radiant/modulesystem/ModuleRegistry.h → core/modulesystem/ModuleRegistry.h
diff --git a/radiant/settings/Game.cpp → core/settings/Game.cpp b/radiant/settings/Game.cpp → core/settings/Game.cpp
diff --git a/radiant/settings/Game.h → core/settings/Game.h b/radiant/settings/Game.h → core/settings/Game.h
diff --git a/radiant/settings/GameManager.cpp → core/settings/GameManager.cpp b/radiant/settings/GameManager.cpp → core/settings/GameManager.cpp
@@ -21,7 +21,7 @@
 #include "string/case_conv.h"
 
 #include "wxutil/dialog/MessageBox.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "modulesystem/ApplicationContextImpl.h"
 #include "GameConfigNeededMessage.h"
 

diff --git a/radiant/settings/GameManager.h → core/settings/GameManager.h b/radiant/settings/GameManager.h → core/settings/GameManager.h
diff --git a/radiant/settings/LanguageManager.cpp → core/settings/LanguageManager.cpp b/radiant/settings/LanguageManager.cpp → core/settings/LanguageManager.cpp
diff --git a/radiant/settings/LanguageManager.h → core/settings/LanguageManager.h b/radiant/settings/LanguageManager.h → core/settings/LanguageManager.h
diff --git a/radiant/settings/PreferenceItemBase.h → core/settings/PreferenceItemBase.h b/radiant/settings/PreferenceItemBase.h → core/settings/PreferenceItemBase.h
diff --git a/radiant/settings/PreferenceItems.h → core/settings/PreferenceItems.h b/radiant/settings/PreferenceItems.h → core/settings/PreferenceItems.h
diff --git a/radiant/settings/PreferencePage.cpp → core/settings/PreferencePage.cpp b/radiant/settings/PreferencePage.cpp → core/settings/PreferencePage.cpp
diff --git a/radiant/settings/PreferencePage.h → core/settings/PreferencePage.h b/radiant/settings/PreferencePage.h → core/settings/PreferencePage.h
diff --git a/radiant/settings/PreferenceSystem.cpp → core/settings/PreferenceSystem.cpp b/radiant/settings/PreferenceSystem.cpp → core/settings/PreferenceSystem.cpp
@@ -3,7 +3,7 @@
 #include "ipreferencesystem.h"
 #include "itextstream.h"
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace settings
 {

diff --git a/radiant/settings/PreferenceSystem.h → core/settings/PreferenceSystem.h b/radiant/settings/PreferenceSystem.h → core/settings/PreferenceSystem.h
diff --git a/radiant/undo/Operation.h → core/undo/Operation.h b/radiant/undo/Operation.h → core/undo/Operation.h
diff --git a/radiant/undo/Stack.h → core/undo/Stack.h b/radiant/undo/Stack.h → core/undo/Stack.h
diff --git a/radiant/undo/StackFiller.h → core/undo/StackFiller.h b/radiant/undo/StackFiller.h → core/undo/StackFiller.h
diff --git a/radiant/undo/UndoSystem.cpp → core/undo/UndoSystem.cpp b/radiant/undo/UndoSystem.cpp → core/undo/UndoSystem.cpp
@@ -10,7 +10,7 @@
 #include <iostream>
 
 #include "registry/registry.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "Operation.h"
 #include "StackFiller.h"
 

diff --git a/radiant/undo/UndoSystem.h → core/undo/UndoSystem.h b/radiant/undo/UndoSystem.h → core/undo/UndoSystem.h
diff --git a/radiant/vfs/Archive.h → core/vfs/Archive.h b/radiant/vfs/Archive.h → core/vfs/Archive.h
diff --git a/radiant/vfs/DeflatedArchiveFile.h → core/vfs/DeflatedArchiveFile.h b/radiant/vfs/DeflatedArchiveFile.h → core/vfs/DeflatedArchiveFile.h
diff --git a/radiant/vfs/DeflatedArchiveTextFile.h → core/vfs/DeflatedArchiveTextFile.h b/radiant/vfs/DeflatedArchiveTextFile.h → core/vfs/DeflatedArchiveTextFile.h
diff --git a/radiant/vfs/DeflatedInputStream.cpp → core/vfs/DeflatedInputStream.cpp b/radiant/vfs/DeflatedInputStream.cpp → core/vfs/DeflatedInputStream.cpp
diff --git a/radiant/vfs/DeflatedInputStream.h → core/vfs/DeflatedInputStream.h b/radiant/vfs/DeflatedInputStream.h → core/vfs/DeflatedInputStream.h
diff --git a/radiant/vfs/DirectoryArchive.cpp → core/vfs/DirectoryArchive.cpp b/radiant/vfs/DirectoryArchive.cpp → core/vfs/DirectoryArchive.cpp
diff --git a/radiant/vfs/DirectoryArchive.h → core/vfs/DirectoryArchive.h b/radiant/vfs/DirectoryArchive.h → core/vfs/DirectoryArchive.h
diff --git a/radiant/vfs/DirectoryArchiveTextFile.h → core/vfs/DirectoryArchiveTextFile.h b/radiant/vfs/DirectoryArchiveTextFile.h → core/vfs/DirectoryArchiveTextFile.h
diff --git a/radiant/vfs/Doom3FileSystem.cpp → core/vfs/Doom3FileSystem.cpp b/radiant/vfs/Doom3FileSystem.cpp → core/vfs/Doom3FileSystem.cpp
@@ -39,7 +39,7 @@
 #include "DirectoryArchiveTextFile.h"
 #include "SortedFilenames.h"
 #include "ZipArchive.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace vfs
 {

diff --git a/radiant/vfs/Doom3FileSystem.h → core/vfs/Doom3FileSystem.h b/radiant/vfs/Doom3FileSystem.h → core/vfs/Doom3FileSystem.h
diff --git a/radiant/vfs/Doom3FileSystemModule.cpp → core/vfs/Doom3FileSystemModule.cpp b/radiant/vfs/Doom3FileSystemModule.cpp → core/vfs/Doom3FileSystemModule.cpp
@@ -1,5 +1,5 @@
 #include "vfs/Doom3FileSystem.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace vfs
 {

diff --git a/radiant/vfs/GenericFileSystem.h → core/vfs/GenericFileSystem.h b/radiant/vfs/GenericFileSystem.h → core/vfs/GenericFileSystem.h
diff --git a/radiant/vfs/SortedFilenames.h → core/vfs/SortedFilenames.h b/radiant/vfs/SortedFilenames.h → core/vfs/SortedFilenames.h
diff --git a/radiant/vfs/StoredArchiveFile.h → core/vfs/StoredArchiveFile.h b/radiant/vfs/StoredArchiveFile.h → core/vfs/StoredArchiveFile.h
diff --git a/radiant/vfs/StoredArchiveTextFile.h → core/vfs/StoredArchiveTextFile.h b/radiant/vfs/StoredArchiveTextFile.h → core/vfs/StoredArchiveTextFile.h
diff --git a/radiant/vfs/UnixPath.h → core/vfs/UnixPath.h b/radiant/vfs/UnixPath.h → core/vfs/UnixPath.h
diff --git a/radiant/vfs/ZipArchive.cpp → core/vfs/ZipArchive.cpp b/radiant/vfs/ZipArchive.cpp → core/vfs/ZipArchive.cpp
diff --git a/radiant/vfs/ZipArchive.h → core/vfs/ZipArchive.h b/radiant/vfs/ZipArchive.h → core/vfs/ZipArchive.h
diff --git a/radiant/vfs/ZipStreamUtils.h → core/vfs/ZipStreamUtils.h b/radiant/vfs/ZipStreamUtils.h → core/vfs/ZipStreamUtils.h
diff --git a/radiant/xmlregistry/Autosaver.h → core/xmlregistry/Autosaver.h b/radiant/xmlregistry/Autosaver.h → core/xmlregistry/Autosaver.h
diff --git a/radiant/xmlregistry/RegistryTree.cpp → core/xmlregistry/RegistryTree.cpp b/radiant/xmlregistry/RegistryTree.cpp → core/xmlregistry/RegistryTree.cpp
diff --git a/radiant/xmlregistry/RegistryTree.h → core/xmlregistry/RegistryTree.h b/radiant/xmlregistry/RegistryTree.h → core/xmlregistry/RegistryTree.h
diff --git a/radiant/xmlregistry/XMLRegistry.cpp → core/xmlregistry/XMLRegistry.cpp b/radiant/xmlregistry/XMLRegistry.cpp → core/xmlregistry/XMLRegistry.cpp
@@ -10,7 +10,7 @@
 #include "version.h"
 #include "string/string.h"
 #include "wxutil/IConv.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace registry
 {

diff --git a/radiant/xmlregistry/XMLRegistry.h → core/xmlregistry/XMLRegistry.h b/radiant/xmlregistry/XMLRegistry.h → core/xmlregistry/XMLRegistry.h
diff --git a/include/version.h b/include/version.h
@@ -2,7 +2,7 @@
 #include <config.h>
 #define RADIANT_VERSION PACKAGE_VERSION
 #else
-#define RADIANT_VERSION "2.8.0pre5"
+#define RADIANT_VERSION "2.9.0core"
 #endif
 
 #define RADIANT_APPNAME "DarkRadiant"

diff --git a/radiant/modulesystem/StaticModule.cpp → libs/module/StaticModule.cpp b/radiant/modulesystem/StaticModule.cpp → libs/module/StaticModule.cpp
diff --git a/radiant/modulesystem/StaticModule.h → libs/module/StaticModule.h b/radiant/modulesystem/StaticModule.h → libs/module/StaticModule.h
@@ -2,7 +2,6 @@
 
 #include <functional>
 #include "imodule.h"
-#include "ModuleRegistry.h"
 
 /**
  * greebo: Use a StaticModule to define a static RegisterableModule,

diff --git a/radiant/RadiantApp.cpp b/radiant/RadiantApp.cpp
@@ -8,7 +8,7 @@
 #include "module/CoreModule.h"
 #include "GameConfigNeededMessage.h"
 #include "ui/prefdialog/GameSetupDialog.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #include <wx/wxprec.h>
 #include <wx/event.h>

diff --git a/radiant/RadiantModule.cpp b/radiant/RadiantModule.cpp
@@ -16,7 +16,7 @@
 #include "ui/mainframe/ScreenUpdateBlocker.h"
 #include "ui/mru/MRU.h"
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "selection/algorithm/General.h"
 #include "brush/csg/CSG.h"
 

diff --git a/radiant/brush/BrushModule.cpp b/radiant/brush/BrushModule.cpp
@@ -15,7 +15,7 @@
 
 #include "registry/registry.h"
 #include "ipreferencesystem.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #include "selection/algorithm/Primitives.h"
 

diff --git a/radiant/camera/GlobalCamera.cpp b/radiant/camera/GlobalCamera.cpp
@@ -11,7 +11,7 @@
 #include "CameraSettings.h"
 
 #include "registry/registry.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "wxutil/MouseButton.h"
 
 #include "tools/ShaderClipboardTools.h"

diff --git a/radiant/clipper/Clipper.cpp b/radiant/clipper/Clipper.cpp
@@ -11,7 +11,7 @@
 #include "itexdef.h"
 
 #include "registry/registry.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "ClipPoint.h"
 #include "brush/csg/CSG.h"
 #include "ui/texturebrowser/TextureBrowser.h"

diff --git a/radiant/eclassmgr/EClassManager.cpp b/radiant/eclassmgr/EClassManager.cpp
@@ -19,7 +19,7 @@
 #include <functional>
 
 #include "debugging/ScopedDebugTimer.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace eclass {
 

diff --git a/radiant/entity/EntityCreator.cpp b/radiant/entity/EntityCreator.cpp
@@ -25,7 +25,7 @@
 #include "generic/GenericEntityNode.h"
 #include "eclassmodel/EclassModelNode.h"
 #include "target/TargetManager.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace entity
 {

diff --git a/radiant/eventmanager/EventManager.cpp b/radiant/eventmanager/EventManager.cpp
@@ -24,7 +24,7 @@
 #include "MouseToolManager.h"
 
 #include "debugging/debugging.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include <iostream>
 
 namespace ui

diff --git a/radiant/filetypes/FileTypeRegistry.cpp b/radiant/filetypes/FileTypeRegistry.cpp
@@ -6,7 +6,7 @@
 #include "debugging/debugging.h"
 
 #include "string/case_conv.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 FileTypeRegistry::FileTypeRegistry()
 {

diff --git a/radiant/filters/BasicFilterSystem.cpp b/radiant/filters/BasicFilterSystem.cpp
@@ -9,7 +9,7 @@
 #include "igame.h"
 #include "ishaders.h"
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "InstanceUpdateWalker.h"
 #include "SetObjectSelectionByFilterWalker.h"
 

diff --git a/radiant/fonts/FontManager.cpp b/radiant/fonts/FontManager.cpp
@@ -6,7 +6,7 @@
 #include "iregistry.h"
 #include "igame.h"
 #include "os/path.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #include "xmlutil/MissingXMLNodeException.h"
 

diff --git a/radiant/image/Doom3ImageLoader.cpp b/radiant/image/Doom3ImageLoader.cpp
@@ -12,7 +12,7 @@
 
 #include "os/path.h"
 #include "DirectoryArchiveFile.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace image
 {

diff --git a/radiant/layers/LayerManager.cpp b/radiant/layers/LayerManager.cpp
@@ -10,7 +10,7 @@
 #include "icommandsystem.h"
 #include "scene/Node.h"
 #include "scenelib.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #include "AddToLayerWalker.h"
 #include "MoveToLayerWalker.h"

diff --git a/radiant/layers/LayerModule.cpp b/radiant/layers/LayerModule.cpp
@@ -6,7 +6,7 @@
 #include "imapinfofile.h"
 #include "imap.h"
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "LayerManager.h"
 #include "LayerInfoFileModule.h"
 

diff --git a/radiant/log/PIDFile.h b/radiant/log/PIDFile.h
@@ -2,7 +2,6 @@
 
 #include "imodule.h"
 #include "wxutil/dialog/MessageBox.h"
-#include "settings/PreferenceSystem.h"
 
 #include "os/file.h"
 #include "string/replace.h"

diff --git a/radiant/map/AasFileManager.cpp b/radiant/map/AasFileManager.cpp
@@ -7,7 +7,7 @@
 #include "ifilesystem.h"
 #include "eclass.h"
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "ui/aas/AasControlDialog.h"
 
 namespace map

diff --git a/radiant/map/AutoSaver.cpp b/radiant/map/AutoSaver.cpp
@@ -24,7 +24,7 @@
 #include "string/convert.h"
 #include "map/Map.h"
 #include "modulesystem/ApplicationContextImpl.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "wxutil/dialog/MessageBox.h"
 
 #include <fmt/format.h>

diff --git a/radiant/map/CounterManager.cpp b/radiant/map/CounterManager.cpp
@@ -4,7 +4,7 @@
 #include "iuimanager.h"
 #include "selectionlib.h"
 #include "string/string.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #include <fmt/format.h>
 

diff --git a/radiant/map/EditingStopwatch.cpp b/radiant/map/EditingStopwatch.cpp
@@ -13,7 +13,7 @@
 
 #include <fmt/format.h>
 #include "string/convert.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "EditingStopwatchInfoFileModule.h"
 
 namespace map

diff --git a/radiant/map/Map.cpp b/radiant/map/Map.cpp
@@ -52,8 +52,7 @@
 #include "selection/algorithm/Primitives.h"
 #include "selection/algorithm/Group.h"
 #include "selection/algorithm/Transformation.h"
-#include "modulesystem/ModuleRegistry.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "RenderableAasFile.h"
 #include "MapPropertyInfoFileModule.h"
 

diff --git a/radiant/map/MapFormatManager.cpp b/radiant/map/MapFormatManager.cpp
@@ -2,7 +2,7 @@
 
 #include "itextstream.h"
 #include "igame.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #include "debugging/debugging.h"
 #include "string/case_conv.h"

diff --git a/radiant/map/MapModules.cpp b/radiant/map/MapModules.cpp
@@ -6,7 +6,7 @@
 #include "aas/Doom3AasFileLoader.h"
 
 #include "imapformat.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "Map.h"
 
 // Static module instances

diff --git a/radiant/map/MapResourceManager.cpp b/radiant/map/MapResourceManager.cpp
@@ -4,7 +4,7 @@
 #include "ifiletypes.h"
 #include "itextstream.h"
 #include "os/path.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "MapResource.h"
 
 namespace map

diff --git a/radiant/map/PointFile.cpp b/radiant/map/PointFile.cpp
@@ -18,7 +18,7 @@
 #include "xyview/GlobalXYWnd.h"
 #include <fmt/format.h>
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #ifdef MessageBox
 #undef MessageBox

diff --git a/radiant/map/RegionManager.cpp b/radiant/map/RegionManager.cpp
@@ -30,7 +30,7 @@
 #include "selection/algorithm/General.h"
 #include "map/MapResource.h"
 #include "map/Map.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #include <memory>
 

diff --git a/radiant/map/infofile/InfoFileManager.cpp b/radiant/map/infofile/InfoFileManager.cpp
@@ -1,7 +1,7 @@
 #include "InfoFileManager.h"
 
 #include "itextstream.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace map
 {

diff --git a/radiant/md5model/plugin.cpp b/radiant/md5model/plugin.cpp
@@ -3,7 +3,7 @@
 #include "MD5ModelLoader.h"
 #include "MD5AnimationCache.h"
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace md5
 {

diff --git a/radiant/model/ModelCache.cpp b/radiant/model/ModelCache.cpp
@@ -12,7 +12,7 @@
 #include "os/path.h"
 #include "os/file.h"
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 #include "NullModelLoader.h"
 #include <functional>
 

diff --git a/radiant/model/ModelFormatManager.cpp b/radiant/model/ModelFormatManager.cpp
@@ -7,7 +7,7 @@
 #include "ipreferencesystem.h"
 #include "string/case_conv.h"
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace model
 {

diff --git a/radiant/modelfile/PicoModelModule.cpp b/radiant/modelfile/PicoModelModule.cpp
@@ -1,6 +1,6 @@
 #include "PicoModelModule.h"
 
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 namespace model
 {

diff --git a/radiant/namespace/Namespace.cpp b/radiant/namespace/Namespace.cpp
@@ -2,7 +2,7 @@
 
 #include "inameobserver.h"
 #include "itextstream.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 #include <list>
 

diff --git a/radiant/namespace/NamespaceFactory.cpp b/radiant/namespace/NamespaceFactory.cpp
@@ -2,7 +2,7 @@
 #include "itextstream.h"
 
 #include "Namespace.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 INamespacePtr NamespaceFactory::createNamespace() {
 	return NamespacePtr(new Namespace);

diff --git a/radiant/particles/particles.cpp b/radiant/particles/particles.cpp
@@ -1,7 +1,7 @@
 #include "ParticlesManager.h"
 
 #include "editor/ParticleEditorModule.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 // Static module instances
 module::StaticModule<particles::ParticlesManager> particlesManagerModule;

diff --git a/radiant/patch/PatchModule.cpp b/radiant/patch/PatchModule.cpp
@@ -1,5 +1,5 @@
 #include "PatchCreators.h"
-#include "modulesystem/StaticModule.h"
+#include "module/StaticModule.h"
 
 // Define the static patchcreator modules
 module::StaticModule<Doom3PatchCreator> doom3PatchDef3Creator;