try to cleanup unused includes from headers

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
 {

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>

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>
 

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"

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>

library/include/Error.h

@@ -25,7 +25,6 @@ distribution.
 #pragma once
 
 #include <exception>
-#include <sstream>
 #include <string>
 
 #include "Export.h"

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>

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>
 

library/include/MemAccess.h

@@ -29,7 +29,6 @@ distribution.
 #define PROCESS_H_INCLUDED
 
 #include "Export.h"
-#include <iostream>
 #include <cstring>
 #include <map>
 #include <memory>

library/include/MiscUtils.h

@@ -33,7 +33,6 @@ distribution.
 #include <iomanip>
 #include <iostream>
 #include <map>
-#include <memory>
 #include <sstream>
 #include <stdint.h>
 #include <vector>

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>

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;

library/include/VTableInterpose.h

@@ -25,7 +25,8 @@ distribution.
 #pragma once
 
 #include "DataDefs.h"
-#include "DataIdentity.h"
+
+#include <set>
 
 namespace DFHack
 {

library/include/modules/DFSDL.h

@@ -1,6 +1,5 @@
 #pragma once
 
-#include "Error.h"
 #include "Export.h"
 #include "ColorText.h"
 

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"

library/include/modules/Gui.h

@@ -25,16 +25,13 @@ distribution.
 #pragma once
 
 #include "Export.h"
-#include "Module.h"
-#include "BitArray.h"
 #include "ColorText.h"
 #include "Types.h"
 #include "DataDefs.h"
 
 #include "modules/GuiHooks.h"
 
 #include "df/announcement_type.h"
-#include "df/report_zoom_type.h"
 #include "df/unit_report_type.h"
 
 namespace df {

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"

library/include/modules/Job.h

@@ -27,16 +27,13 @@ distribution.
 #define CL_MOD_JOB
 
 #include "Export.h"
-#include "Module.h"
 #include "Types.h"
 #include "DataDefs.h"
 
 #include "df/building_workshopst.h"
 #include "df/item_type.h"
 #include "df/job_item_ref.h"
 
-#include <ostream>
-
 namespace df
 {
     struct job;

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"
 

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"

library/include/modules/Random.h

@@ -31,9 +31,6 @@ distribution.
  */
 
 #include "Export.h"
-#include "Module.h"
-#include "Types.h"
-
 #include "DataDefs.h"
 
 namespace DFHack

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"
 

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;

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;

library/modules/DFSDL.cpp

@@ -1,3 +1,4 @@
+#include "Error.h"
 #include "Internal.h"
 
 #include "modules/DFSDL.h"

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"

plugins/autofarm.cpp

@@ -22,6 +22,7 @@
 #include "df/unit.h"
 #include "df/world.h"
 
+#include <set>
 #include <queue>
 
 using namespace DFHack;

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();

plugins/burrow.cpp

@@ -1,3 +1,5 @@
+#include <stack>
+
 #include "Debug.h"
 #include "LuaTools.h"
 #include "PluginManager.h"

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>

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>

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;

plugins/pathable.cpp

@@ -1,3 +1,5 @@
+#include <stack>
+
 #include "Debug.h"
 #include "Error.h"
 #include "PluginManager.h"

plugins/reveal.cpp

@@ -16,6 +16,7 @@
 #include "df/map_block.h"
 #include "df/world.h"
 
+#include <stack>
 #include <unordered_set>
 
 using std::string;