diff --git a/src/engine/bih.cc b/src/engine/bih.cc
index 12e77db..c44fc65 100644
--- a/src/engine/bih.cc
+++ b/src/engine/bih.cc
@@ -3,6 +3,7 @@
 #include "stain.hh"
 #include "texture.hh"
 
+#include <shared/ents.hh>
 #include <shared/cube.hh>
 
 extern vec hitsurface;
diff --git a/src/engine/physics.cc b/src/engine/physics.cc
index 7ab2103..978888f 100644
--- a/src/engine/physics.cc
+++ b/src/engine/physics.cc
@@ -12,6 +12,7 @@
 #include "octa.hh"
 #include "world.hh"
 
+#include <shared/ents.hh>
 #include <shared/cube.hh>
 #include <shared/igame.hh>
 
diff --git a/src/shared/cube.hh b/src/shared/cube.hh
index 216c2af..e783b23 100644
--- a/src/shared/cube.hh
+++ b/src/shared/cube.hh
@@ -3,7 +3,6 @@
 
 #include "tools.hh"
 #include "geom.hh"
-#include "ents.hh"
 #include "command.hh"
 
 #endif
diff --git a/src/shared/igame.hh b/src/shared/igame.hh
index 037986a..8fe30b9 100644
--- a/src/shared/igame.hh
+++ b/src/shared/igame.hh
@@ -1,8 +1,13 @@
 // the interface the engine uses to run the gameplay module
 
+struct entity;
+struct extentity;
+struct physent;
 struct selinfo;
 struct VSlot;
 
+#include "tools.hh"
+
 namespace entities
 {
     extern void editent(int i, bool local);