diff --git a/library/include/BitArray.h b/library/include/BitArray.h
index bad77d7935..15ec84a62f 100644
--- a/library/include/BitArray.h
+++ b/library/include/BitArray.h
@@ -23,14 +23,11 @@ distribution.
 */
 
 #pragma once
-#include "Export.h"
 #include "Error.h"
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
 #include <sstream>
-#include <exception>
-#include <type_traits>
 #include <iterator>
 namespace DFHack
 {
diff --git a/library/include/Core.h b/library/include/Core.h
index 49aaa50430..bced326fd1 100644
--- a/library/include/Core.h
+++ b/library/include/Core.h
@@ -37,7 +37,6 @@ distribution.
 #include <map>
 #include <memory>
 #include <mutex>
-#include <stack>
 #include <thread>
 #include <unordered_map>
 #include <unordered_set>
diff --git a/library/include/DataDefs.h b/library/include/DataDefs.h
index 7fac3c0c5e..477496673f 100644
--- a/library/include/DataDefs.h
+++ b/library/include/DataDefs.h
@@ -26,10 +26,8 @@ distribution.
 
 #include <list>
 #include <map>
-#include <set>
 #include <sstream>
 #include <string>
-#include <type_traits>
 #include <utility>
 #include <vector>
 
diff --git a/library/include/DataFuncs.h b/library/include/DataFuncs.h
index 0b297a68e4..ab9bb78a26 100644
--- a/library/include/DataFuncs.h
+++ b/library/include/DataFuncs.h
@@ -24,10 +24,6 @@ distribution.
 
 #pragma once
 
-#include <string>
-#include <sstream>
-#include <vector>
-#include <map>
 #include <type_traits>
 
 #include "ColorText.h"
diff --git a/library/include/DataIdentity.h b/library/include/DataIdentity.h
index 2c302264d9..8a9e3c406b 100644
--- a/library/include/DataIdentity.h
+++ b/library/include/DataIdentity.h
@@ -26,11 +26,9 @@ distribution.
 
 #include <deque>
 #include <future>
-#include <map>
 #include <optional>
-#include <sstream>
 #include <string>
-#include <unordered_map>
+#include <set>
 #include <variant>
 #include <vector>
 #include <variant>
diff --git a/library/include/Error.h b/library/include/Error.h
index a4624d5f72..550e1b0198 100644
--- a/library/include/Error.h
+++ b/library/include/Error.h
@@ -25,7 +25,6 @@ distribution.
 #pragma once
 
 #include <exception>
-#include <sstream>
 #include <string>
 
 #include "Export.h"
diff --git a/library/include/LuaTools.h b/library/include/LuaTools.h
index 9831841ca2..93853468e4 100644
--- a/library/include/LuaTools.h
+++ b/library/include/LuaTools.h
@@ -26,8 +26,8 @@ distribution.
 
 #include <functional>
 #include <string>
-#include <sstream>
 #include <vector>
+#include <set>
 #include <map>
 #include <type_traits>
 #include <unordered_map>
@@ -39,7 +39,6 @@ distribution.
 #include "DataDefs.h"
 
 #include "df/interface_key.h"
-#include "df/interfacest.h"
 
 #include <lua.h>
 #include <lauxlib.h>
diff --git a/library/include/LuaWrapper.h b/library/include/LuaWrapper.h
index 1b8be705ed..7576be7a11 100644
--- a/library/include/LuaWrapper.h
+++ b/library/include/LuaWrapper.h
@@ -24,11 +24,6 @@ distribution.
 
 #pragma once
 
-#include <string>
-#include <sstream>
-#include <vector>
-#include <map>
-
 #include <lua.h>
 #include <lauxlib.h>
 
diff --git a/library/include/MemAccess.h b/library/include/MemAccess.h
index 95f7e256d1..5ef352a99e 100644
--- a/library/include/MemAccess.h
+++ b/library/include/MemAccess.h
@@ -29,7 +29,6 @@ distribution.
 #define PROCESS_H_INCLUDED
 
 #include "Export.h"
-#include <iostream>
 #include <cstring>
 #include <map>
 #include <memory>
diff --git a/library/include/MiscUtils.h b/library/include/MiscUtils.h
index 2ff04282e4..fd78523210 100644
--- a/library/include/MiscUtils.h
+++ b/library/include/MiscUtils.h
@@ -33,7 +33,6 @@ distribution.
 #include <iomanip>
 #include <iostream>
 #include <map>
-#include <memory>
 #include <sstream>
 #include <stdint.h>
 #include <vector>
diff --git a/library/include/PluginManager.h b/library/include/PluginManager.h
index 50b9b0447d..1eccc7a79a 100644
--- a/library/include/PluginManager.h
+++ b/library/include/PluginManager.h
@@ -25,7 +25,6 @@ distribution.
 #pragma once
 
 #include "Export.h"
-#include "Hooks.h"
 #include "ColorText.h"
 #include "MiscUtils.h"
 #include <map>
diff --git a/library/include/Types.h b/library/include/Types.h
index 84408ecf2a..f367946e56 100644
--- a/library/include/Types.h
+++ b/library/include/Types.h
@@ -30,12 +30,10 @@ distribution.
 #include <string>
 
 #include "Export.h"
-
 #include "DataDefs.h"
 
 #include "df/general_ref_type.h"
 #include "df/specific_ref_type.h"
-#include "df/language_name_type.h"
 
 namespace df {
     struct building;
diff --git a/library/include/VTableInterpose.h b/library/include/VTableInterpose.h
index 7575ee18c2..9dff74d7e5 100644
--- a/library/include/VTableInterpose.h
+++ b/library/include/VTableInterpose.h
@@ -25,7 +25,8 @@ distribution.
 #pragma once
 
 #include "DataDefs.h"
-#include "DataIdentity.h"
+
+#include <set>
 
 namespace DFHack
 {
diff --git a/library/include/modules/DFSDL.h b/library/include/modules/DFSDL.h
index 8d12de1918..ff8e81ab2c 100644
--- a/library/include/modules/DFSDL.h
+++ b/library/include/modules/DFSDL.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include "Error.h"
 #include "Export.h"
 #include "ColorText.h"
 
diff --git a/library/include/modules/EventManager.h b/library/include/modules/EventManager.h
index e0a74bed92..a2c546a755 100644
--- a/library/include/modules/EventManager.h
+++ b/library/include/modules/EventManager.h
@@ -1,10 +1,8 @@
 #pragma once
 
-#include "Core.h"
 #include "Export.h"
 #include "ColorText.h"
 #include "PluginManager.h"
-#include "Console.h"
 #include "DataDefs.h"
 
 #include "df/unit_inventory_item.h"
diff --git a/library/include/modules/Gui.h b/library/include/modules/Gui.h
index 63939fc247..761e948bb0 100644
--- a/library/include/modules/Gui.h
+++ b/library/include/modules/Gui.h
@@ -25,8 +25,6 @@ distribution.
 #pragma once
 
 #include "Export.h"
-#include "Module.h"
-#include "BitArray.h"
 #include "ColorText.h"
 #include "Types.h"
 #include "DataDefs.h"
@@ -34,7 +32,6 @@ distribution.
 #include "modules/GuiHooks.h"
 
 #include "df/announcement_type.h"
-#include "df/report_zoom_type.h"
 #include "df/unit_report_type.h"
 
 namespace df {
diff --git a/library/include/modules/Items.h b/library/include/modules/Items.h
index 1189fd8bc2..b4235df11d 100644
--- a/library/include/modules/Items.h
+++ b/library/include/modules/Items.h
@@ -28,8 +28,6 @@ distribution.
 */
 #include "DataDefs.h"
 #include "Export.h"
-#include "MemAccess.h"
-#include "Module.h"
 #include "Types.h"
 
 #include "modules/Materials.h"
diff --git a/library/include/modules/Job.h b/library/include/modules/Job.h
index 5f7ddcb11a..25c357bec7 100644
--- a/library/include/modules/Job.h
+++ b/library/include/modules/Job.h
@@ -27,7 +27,6 @@ distribution.
 #define CL_MOD_JOB
 
 #include "Export.h"
-#include "Module.h"
 #include "Types.h"
 #include "DataDefs.h"
 
@@ -35,8 +34,6 @@ distribution.
 #include "df/item_type.h"
 #include "df/job_item_ref.h"
 
-#include <ostream>
-
 namespace df
 {
     struct job;
diff --git a/library/include/modules/Maps.h b/library/include/modules/Maps.h
index 839989237e..052dbe3aab 100644
--- a/library/include/modules/Maps.h
+++ b/library/include/modules/Maps.h
@@ -31,8 +31,6 @@ distribution.
 #define CL_MOD_MAPS
 
 #include "Export.h"
-#include "Module.h"
-#include "BitArray.h"
 
 #include "modules/Materials.h"
 
diff --git a/library/include/modules/Materials.h b/library/include/modules/Materials.h
index 90907b8a41..2c3be4e731 100644
--- a/library/include/modules/Materials.h
+++ b/library/include/modules/Materials.h
@@ -31,8 +31,6 @@ distribution.
  */
 #include "Export.h"
 #include "Module.h"
-#include "Types.h"
-#include "BitArray.h"
 #include "DataDefs.h"
 
 #include "df/craft_material_class.h"
diff --git a/library/include/modules/Random.h b/library/include/modules/Random.h
index 8ed703be79..b8e5de26bf 100644
--- a/library/include/modules/Random.h
+++ b/library/include/modules/Random.h
@@ -31,9 +31,6 @@ distribution.
  */
 
 #include "Export.h"
-#include "Module.h"
-#include "Types.h"
-
 #include "DataDefs.h"
 
 namespace DFHack
diff --git a/library/include/modules/Screen.h b/library/include/modules/Screen.h
index 3989460bb6..1a6ab569ad 100644
--- a/library/include/modules/Screen.h
+++ b/library/include/modules/Screen.h
@@ -25,9 +25,6 @@ distribution.
 #pragma once
 
 #include "Export.h"
-#include "Module.h"
-#include "BitArray.h"
-#include "ColorText.h"
 #include "Types.h"
 #include "DataDefs.h"
 
diff --git a/library/include/modules/Translation.h b/library/include/modules/Translation.h
index 2709dbf6fa..2860c3db87 100644
--- a/library/include/modules/Translation.h
+++ b/library/include/modules/Translation.h
@@ -31,9 +31,9 @@ distribution.
  */
 
 #include "Export.h"
-#include "Module.h"
-#include "Types.h"
 #include "DataDefs.h"
+#include "Types.h"
+#include "df/language_name_type.h"
 
 namespace df {
     struct language_name;
diff --git a/library/include/modules/World.h b/library/include/modules/World.h
index b03170b5fa..a82ceef9a4 100644
--- a/library/include/modules/World.h
+++ b/library/include/modules/World.h
@@ -32,12 +32,10 @@ distribution.
  */
 
 #include "Export.h"
-#include "Module.h"
 #include "modules/Persistence.h"
-#include <ostream>
-
 #include "DataDefs.h"
 
+
 namespace df
 {
     struct tile_bitmask;
diff --git a/library/modules/DFSDL.cpp b/library/modules/DFSDL.cpp
index 536d1a5881..9da2bd8057 100644
--- a/library/modules/DFSDL.cpp
+++ b/library/modules/DFSDL.cpp
@@ -1,3 +1,4 @@
+#include "Error.h"
 #include "Internal.h"
 
 #include "modules/DFSDL.h"
diff --git a/library/modules/EventManager.cpp b/library/modules/EventManager.cpp
index 5a24f1174a..d504e74c3d 100644
--- a/library/modules/EventManager.cpp
+++ b/library/modules/EventManager.cpp
@@ -2,6 +2,7 @@
 #include "Console.h"
 #include "Debug.h"
 #include "VTableInterpose.h"
+#include "MemAccess.h"
 
 #include "modules/Buildings.h"
 #include "modules/Constructions.h"
diff --git a/plugins/autofarm.cpp b/plugins/autofarm.cpp
index 571cd13608..f961bc13a7 100644
--- a/plugins/autofarm.cpp
+++ b/plugins/autofarm.cpp
@@ -22,6 +22,7 @@
 #include "df/unit.h"
 #include "df/world.h"
 
+#include <set>
 #include <queue>
 
 using namespace DFHack;
diff --git a/plugins/buildingplan/itemfilter.h b/plugins/buildingplan/itemfilter.h
index 8a1f67d3cf..95a216c302 100644
--- a/plugins/buildingplan/itemfilter.h
+++ b/plugins/buildingplan/itemfilter.h
@@ -7,6 +7,8 @@
 #include "df/dfhack_material_category.h"
 #include "df/item_quality.h"
 
+#include <set>
+
 class ItemFilter {
 public:
     ItemFilter();
diff --git a/plugins/burrow.cpp b/plugins/burrow.cpp
index d06e95efb6..b016014d0c 100644
--- a/plugins/burrow.cpp
+++ b/plugins/burrow.cpp
@@ -1,3 +1,5 @@
+#include <stack>
+
 #include "Debug.h"
 #include "LuaTools.h"
 #include "PluginManager.h"
diff --git a/plugins/eventful.cpp b/plugins/eventful.cpp
index 0ed06d9284..8dd3bbc85d 100644
--- a/plugins/eventful.cpp
+++ b/plugins/eventful.cpp
@@ -22,6 +22,7 @@
 #include "df/unit_wound.h"
 #include "df/world.h"
 
+#include <stack>
 #include <string.h>
 #include <stdexcept>
 #include <array>
diff --git a/plugins/filltraffic.cpp b/plugins/filltraffic.cpp
index c8b0a209e3..f16e8bdd83 100644
--- a/plugins/filltraffic.cpp
+++ b/plugins/filltraffic.cpp
@@ -1,6 +1,7 @@
 // Wide-area traffic designation utility.
 // Flood-fill from cursor or fill entire map.
 
+#include <stack>
 #include <ctype.h>      //For toupper().
 #include <algorithm>    //for min().
 #include <map>
diff --git a/plugins/getplants.cpp b/plugins/getplants.cpp
index 29c6655fc9..18570fda95 100644
--- a/plugins/getplants.cpp
+++ b/plugins/getplants.cpp
@@ -21,6 +21,8 @@
 #include "df/world_object_data.h"
 #include "df/world_site.h"
 
+#include <set>
+
 using std::string;
 using std::vector;
 using std::set;
diff --git a/plugins/pathable.cpp b/plugins/pathable.cpp
index 3bf9e2c010..45a5827df6 100644
--- a/plugins/pathable.cpp
+++ b/plugins/pathable.cpp
@@ -1,3 +1,5 @@
+#include <stack>
+
 #include "Debug.h"
 #include "Error.h"
 #include "PluginManager.h"
diff --git a/plugins/reveal.cpp b/plugins/reveal.cpp
index 1feb72bbc6..e5bd2479f5 100644
--- a/plugins/reveal.cpp
+++ b/plugins/reveal.cpp
@@ -16,6 +16,7 @@
 #include "df/map_block.h"
 #include "df/world.h"
 
+#include <stack>
 #include <unordered_set>
 
 using std::string;