diff --git a/src/shared/command.hh b/src/shared/command.hh
index a7f1462..ba35080 100644
--- a/src/shared/command.hh
+++ b/src/shared/command.hh
@@ -3,6 +3,8 @@
 #ifndef SHARED_COMMAND_HH
 #define SHARED_COMMAND_HH
 
+#include "tools.hh"
+
 enum { VAL_NULL = 0, VAL_INT, VAL_FLOAT, VAL_STR, VAL_ANY, VAL_CODE, VAL_MACRO, VAL_IDENT, VAL_CSTR, VAL_CANY, VAL_WORD, VAL_POP, VAL_COND };
 
 enum
diff --git a/src/shared/cube.hh b/src/shared/cube.hh
index e783b23..06315eb 100644
--- a/src/shared/cube.hh
+++ b/src/shared/cube.hh
@@ -1,8 +1,6 @@
 #ifndef __CUBE_H__
 #define __CUBE_H__
 
-#include "tools.hh"
-#include "geom.hh"
 #include "command.hh"
 
 #endif
diff --git a/src/shared/geom.cc b/src/shared/geom.cc
index 04fb3f3..81c177d 100644
--- a/src/shared/geom.cc
+++ b/src/shared/geom.cc
@@ -1,4 +1,4 @@
-#include "cube.hh"
+#include "geom.hh"
 
 static inline double det2x2(double a, double b, double c, double d) { return a*d - b*c; }
 static inline double det3x3(double a1, double a2, double a3,
diff --git a/src/shared/igame.hh b/src/shared/igame.hh
index 8fe30b9..b365bc9 100644
--- a/src/shared/igame.hh
+++ b/src/shared/igame.hh
@@ -7,6 +7,7 @@ struct selinfo;
 struct VSlot;
 
 #include "tools.hh"
+#include "geom.hh"
 
 namespace entities
 {
diff --git a/src/shared/tools.hh b/src/shared/tools.hh
index 5b62c83..db6c8ed 100644
--- a/src/shared/tools.hh
+++ b/src/shared/tools.hh
@@ -4,6 +4,7 @@
 #define _TOOLS_H
 
 #include <cstdio>
+#include <cstdlib>
 #include <cstring>
 #include <cmath>