diff --git a/library/DataStatics.cpp b/library/DataStatics.cpp
index 31c8c0200..61b7b6378 100644
--- a/library/DataStatics.cpp
+++ b/library/DataStatics.cpp
@@ -1,3 +1,4 @@
+#include "Core.h"
 #include "Internal.h"
 #include "DataDefs.h"
 #include "MiscUtils.h"
diff --git a/library/DataStaticsFields.cpp b/library/DataStaticsFields.cpp
index d6f0414bb..8318b523d 100644
--- a/library/DataStaticsFields.cpp
+++ b/library/DataStaticsFields.cpp
@@ -1,5 +1,7 @@
 #include <stddef.h>
 
+#include <fstream>
+
 #ifndef STATIC_FIELDS_GROUP
 #include "DataDefs.h"
 #endif
diff --git a/library/TileTypes.cpp b/library/TileTypes.cpp
index bd2c52a11..fc2d044ee 100644
--- a/library/TileTypes.cpp
+++ b/library/TileTypes.cpp
@@ -26,6 +26,7 @@ distribution.
 #include "TileTypes.h"
 #include "Export.h"
 
+#include <cassert>
 #include <map>
 
 using namespace DFHack;
diff --git a/library/include/DataDefs.h b/library/include/DataDefs.h
index 149ac47a0..7c3b534b6 100644
--- a/library/include/DataDefs.h
+++ b/library/include/DataDefs.h
@@ -32,7 +32,6 @@ distribution.
 #include <utility>
 #include <vector>
 
-#include "Core.h"
 #include "BitArray.h"
 
 // Stop some MS stupidity
@@ -48,6 +47,7 @@ typedef struct lua_State lua_State;
 
 namespace DFHack
 {
+    class Core;
     class virtual_class {};
 
     enum identity_type {
diff --git a/library/include/DataFuncs.h b/library/include/DataFuncs.h
index 6541ae900..63b40ef52 100644
--- a/library/include/DataFuncs.h
+++ b/library/include/DataFuncs.h
@@ -32,6 +32,10 @@ distribution.
 #include "DataIdentity.h"
 #include "LuaWrapper.h"
 
+namespace DFHack {
+    class color_ostream;
+}
+
 namespace df {
     // A very simple and stupid implementation of some stuff from boost
     template<class U, class V> struct is_same_type { static const bool value = false; };
diff --git a/library/include/DataIdentity.h b/library/include/DataIdentity.h
index 62a9ff274..88a96f9f3 100644
--- a/library/include/DataIdentity.h
+++ b/library/include/DataIdentity.h
@@ -24,6 +24,7 @@ distribution.
 
 #pragma once
 
+#include <deque>
 #include <string>
 #include <sstream>
 #include <vector>
diff --git a/library/include/LuaTools.h b/library/include/LuaTools.h
index 814afe179..df89d184f 100644
--- a/library/include/LuaTools.h
+++ b/library/include/LuaTools.h
@@ -30,6 +30,7 @@ distribution.
 #include <map>
 #include <type_traits>
 
+#include "ColorText.h"
 #include "DataDefs.h"
 
 #include <lua.h>
diff --git a/library/include/modules/Buildings.h b/library/include/modules/Buildings.h
index 4032b96af..50cbc898f 100644
--- a/library/include/modules/Buildings.h
+++ b/library/include/modules/Buildings.h
@@ -53,6 +53,9 @@ namespace df
 
 namespace DFHack
 {
+
+class color_ostream;
+
 namespace Buildings
 {
 /**
diff --git a/library/include/modules/Job.h b/library/include/modules/Job.h
index 814f1e062..cde5c64dd 100644
--- a/library/include/modules/Job.h
+++ b/library/include/modules/Job.h
@@ -47,6 +47,8 @@ namespace df
 
 namespace DFHack
 {
+    class color_ostream;
+
     namespace Job {
         // Duplicate the job structure. It is not linked into any DF lists.
         DFHACK_EXPORT df::job *cloneJobStruct(df::job *job, bool keepEverything=false);
diff --git a/plugins/embark-assistant/matcher.cpp b/plugins/embark-assistant/matcher.cpp
index 7b3d385cb..e724e565f 100644
--- a/plugins/embark-assistant/matcher.cpp
+++ b/plugins/embark-assistant/matcher.cpp
@@ -2,6 +2,7 @@
 
 #include <modules/Gui.h>
 
+#include "Core.h"
 #include "DataDefs.h"
 #include "df/biome_type.h"
 #include "df/inorganic_raw.h"
diff --git a/plugins/stockpiles/StockpileSerializer.cpp b/plugins/stockpiles/StockpileSerializer.cpp
index ef8c557c3..cdeced990 100644
--- a/plugins/stockpiles/StockpileSerializer.cpp
+++ b/plugins/stockpiles/StockpileSerializer.cpp
@@ -30,6 +30,8 @@
 // protobuf
 #include <google/protobuf/io/zero_copy_stream_impl.h>
 
+#include <fstream>
+
 using std::endl;
 using namespace DFHack;
 using namespace df::enums;