1 files changed, 5 insertions, 3 deletions
diff --git a/src/state.h b/src/state.h
index ba32bdcd..65acf4bb 100644
--- a/src/state.h
+++ b/src/state.h
@@ -24,15 +24,17 @@
 #ifndef _TMW_SERVER_STATE_
 #define _TMW_SERVER_STATE_
 
-#include <string>
 #include <map>
-#include "connectionhandler.h"
+
 #include "being.h"
-#include "map.h"
+
 #include "utils/singleton.h"
 
+class ConnectionHandler;
+
 namespace tmwserv
 {
+    class Map;
 
 /**
  * Combined map/entity structure