Merge pull request #127 from myk002/myk_header_cleanup

clean up headers
DFHack · Jan 12, 2025 · 79fa22c · 79fa22c
2 parents 8f40e92 + ad25224
commit 79fa22c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/Constructions.cpp b/Constructions.cpp
@@ -3,8 +3,6 @@
 #include "Constructions.h"
 #include "WorldSegment.h"
 
-#include "df/construction.h"
-
 using namespace DFHack;
 using namespace df::enums;
 

diff --git a/Constructions.h b/Constructions.h
@@ -1,4 +1,6 @@
 #pragma once
 
+#include "df/construction.h"
+
 void changeConstructionMaterials(WorldSegment* segment, std::vector<df::construction>* allConstructions);
 bool readConstructionsToTile( Tile* b, const DFHack::Buildings::t_building* building );
diff --git a/common.h b/common.h
@@ -10,11 +10,13 @@
 #define SKIP_DFHACK_STDINT
 #define DFHACK_WANT_PLATETYPES
 
-#include <DFHack.h>
-#include <Console.h>
-#include <Export.h>
 #include <PluginManager.h>
 
+#include <modules/Buildings.h>
+#include <modules/Gui.h>
+#include <modules/Units.h>
+#include <modules/World.h>
+
 #define ALLEGRO_NO_MAGIC_MAIN //This is a DLL file. we got no main function.
 #define ALLEGRO_HAVE_STDINT_H
 
@@ -26,10 +28,6 @@
 #include <allegro5/allegro_opengl.h>
 #include <allegro5/utf8.h>
 
-#ifdef _LINUX
-#include <GL/glext.h>
-#endif
-
 // allegro leaks X headers, undef some of it here:
 #undef TileShape
 #undef None