4 files changed, 6 insertions, 16 deletions
diff --git a/src/core/application.h b/src/core/application.h
index f335e26..b2d8467 100644
--- a/src/core/application.h
+++ b/src/core/application.h
@@ -8,12 +8,12 @@
 #define __INCLUDED_CORE_APPLICATION_H__
 
 #include "sys/sys.h"
+
 #include "core/commandbuffer.h"
+#include "core/cvar.h"
+#include "core/func.h"
 #include "core/message.h"
-#include "core/netserver.h"
-#include "core/netconnection.h"
 #include "core/gameinterface.h"
-#include "core/module.h"
 
 namespace core
 {
diff --git a/src/core/core.cc b/src/core/core.cc
index 0f68ab3..f511ee7 100644
--- a/src/core/core.cc
+++ b/src/core/core.cc
@@ -7,6 +7,7 @@
 #include <string>
 
 #include "core.h"
+#include "sys/sys.h"
 
 namespace core
 {
diff --git a/src/core/core.h b/src/core/core.h
index 80f6d54..91cf72a 100644
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -9,19 +9,7 @@
 
 #include <string>
 
-#include "core/application.h"
-#include "core/commandbuffer.h"
-#include "core/cvar.h"
-#include "core/entity.h"
-#include "core/func.h"
-#include "core/gameinterface.h"
-#include "core/module.h"
-#include "core/player.h"
-#include "core/range.h"
-#include "core/stats.h"
-#include "core/zone.h"
-
-/// core contains the basic functionality of the engine
+/// core functions of the engine
 namespace core
 {
 
diff --git a/src/core/netserver.cc b/src/core/netserver.cc
index 6838e34..62d9b74 100644
--- a/src/core/netserver.cc
+++ b/src/core/netserver.cc
@@ -23,6 +23,7 @@
 #include <sstream>
 
 #include "sys/sys.h"
+#include "core/application.h"
 #include "core/gameserver.h"
 #include "core/netclient.h"
 #include "core/netserver.h"