diff --git a/Core/GameEngine/CMakeLists.txt b/Core/GameEngine/CMakeLists.txt
index 6949beb1492..6ae2817f4f7 100644
--- a/Core/GameEngine/CMakeLists.txt
+++ b/Core/GameEngine/CMakeLists.txt
@@ -812,6 +812,7 @@ set(GAMEENGINE_SRC
 #    Source/GameClient/GUI/GUICallbacks/Menus/WOLStatusMenu.cpp
 #    Source/GameClient/GUI/GUICallbacks/Menus/WOLWelcomeMenu.cpp
     Source/GameClient/GUI/GUICallbacks/MessageBox.cpp
+    Source/GameClient/GUI/GUICallbacks/MOTD.cpp
     Source/GameClient/GUI/GUICallbacks/ReplayControls.cpp
     Source/GameClient/GUI/GUICallbacks/SaveLoadFeedback.cpp
     Source/GameClient/GUI/HeaderTemplate.cpp
diff --git a/Core/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/MOTD.cpp
similarity index 96%
rename from Core/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp
rename to Core/GameEngine/Source/GameClient/GUI/GUICallbacks/MOTD.cpp
index 771c0af2fa6..0ba28ff18a5 100644
--- a/Core/GameEngineDevice/Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp
+++ b/Core/GameEngine/Source/GameClient/GUI/GUICallbacks/MOTD.cpp
@@ -22,7 +22,7 @@
 //																																						//
 ////////////////////////////////////////////////////////////////////////////////
 
-// FILE: W3DMOTD.cpp //////////////////////////////////////////////////////////
+// FILE: MOTD.cpp /////////////////////////////////////////////////////////////
 //-----------------------------------------------------------------------------
 //
 //                       Westwood Studios Pacific.
@@ -34,7 +34,7 @@
 //
 // Project:    RTS3
 //
-// File name:  W3DMOTD.cpp
+// File name:  MOTD.cpp
 //
 // Created:    Colin Day, August 2001
 //
@@ -44,6 +44,8 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // SYSTEM INCLUDES ////////////////////////////////////////////////////////////
+#include "PreRTS.h"	// This must go first in EVERY cpp file in the GameEngine
+
 #include <stdlib.h>
 
 // USER INCLUDES //////////////////////////////////////////////////////////////
diff --git a/Core/GameEngineDevice/CMakeLists.txt b/Core/GameEngineDevice/CMakeLists.txt
index 9028de19e8e..04ce59be027 100644
--- a/Core/GameEngineDevice/CMakeLists.txt
+++ b/Core/GameEngineDevice/CMakeLists.txt
@@ -132,7 +132,6 @@ set(GAMEENGINEDEVICE_SRC
     Source/W3DDevice/GameClient/GUI/Gadget/W3DVerticalSlider.cpp
     Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp
     Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp
-    Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp
     Source/W3DDevice/GameClient/GUI/W3DGameFont.cpp
     Source/W3DDevice/GameClient/GUI/W3DGameWindow.cpp
     Source/W3DDevice/GameClient/GUI/W3DGameWindowManager.cpp
diff --git a/Generals/Code/GameEngineDevice/CMakeLists.txt b/Generals/Code/GameEngineDevice/CMakeLists.txt
index c6088ec6237..d2ec08488ae 100644
--- a/Generals/Code/GameEngineDevice/CMakeLists.txt
+++ b/Generals/Code/GameEngineDevice/CMakeLists.txt
@@ -109,7 +109,6 @@ set(GAMEENGINEDEVICE_SRC
 #    Source/W3DDevice/GameClient/GUI/Gadget/W3DVerticalSlider.cpp
 #    Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp
 #    Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp
-#    Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp
 #    Source/W3DDevice/GameClient/GUI/W3DGameFont.cpp
 #    Source/W3DDevice/GameClient/GUI/W3DGameWindow.cpp
 #    Source/W3DDevice/GameClient/GUI/W3DGameWindowManager.cpp
diff --git a/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt b/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
index 53048181ba6..43b8fbf0264 100644
--- a/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
+++ b/GeneralsMD/Code/GameEngineDevice/CMakeLists.txt
@@ -128,7 +128,6 @@ set(GAMEENGINEDEVICE_SRC
 #    Source/W3DDevice/GameClient/GUI/Gadget/W3DVerticalSlider.cpp
 #    Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DControlBar.cpp
 #    Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMainMenu.cpp
-#    Source/W3DDevice/GameClient/GUI/GUICallbacks/W3DMOTD.cpp
 #    Source/W3DDevice/GameClient/GUI/W3DGameFont.cpp
 #    Source/W3DDevice/GameClient/GUI/W3DGameWindow.cpp
 #    Source/W3DDevice/GameClient/GUI/W3DGameWindowManager.cpp