diff --git a/library/include/DataDefs.h b/library/include/DataDefs.h
index 5d284b02de..afb14a69bc 100644
--- a/library/include/DataDefs.h
+++ b/library/include/DataDefs.h
@@ -34,11 +34,6 @@ distribution.
 
 #include "BitArray.h"
 
-// Stop some MS stupidity
-#ifdef interface
-    #undef interface
-#endif
-
 typedef struct lua_State lua_State;
 
 /*
diff --git a/library/include/DataFuncs.h b/library/include/DataFuncs.h
index 7748331624..36d756471f 100644
--- a/library/include/DataFuncs.h
+++ b/library/include/DataFuncs.h
@@ -30,6 +30,7 @@ distribution.
 #include <map>
 #include <type_traits>
 
+#include "ColorText.h"
 #include "DataIdentity.h"
 #include "LuaWrapper.h"
 
diff --git a/library/include/modules/DFSDL.h b/library/include/modules/DFSDL.h
index f826e554e0..0fcd17b322 100644
--- a/library/include/modules/DFSDL.h
+++ b/library/include/modules/DFSDL.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "Error.h"
 #include "Export.h"
 #include "ColorText.h"
 
diff --git a/library/modules/Constructions.cpp b/library/modules/Constructions.cpp
index 04e74fa572..c6b0522b79 100644
--- a/library/modules/Constructions.cpp
+++ b/library/modules/Constructions.cpp
@@ -33,6 +33,7 @@ using namespace std;
 
 #include "Core.h"
 #include "MemAccess.h"
+#include "MiscUtils.h"
 #include "TileTypes.h"
 #include "Types.h"
 #include "VersionInfo.h"