continued with clean up

9 files changed, 13 insertions, 13 deletions

diff --git a/src/game/client/gc_client.cpp b/src/game/client/gc_client.cpp
index 2be38637..f9900ab3 100644
--- a/src/game/client/gc_client.cpp
+++ b/src/game/client/gc_client.cpp
@@ -11,9 +11,9 @@ extern "C" {
 	#include <engine/e_client_interface.h>
 };
 
-#include "../g_game.hpp"
-#include "../g_version.hpp"
-#include "../g_layers.hpp"
+#include "../gamecore.hpp"
+#include "../version.hpp"
+#include "../layers.hpp"
 #include "gc_map_image.hpp"
 #include "../generated/gc_data.hpp"
 #include "gc_menu.hpp"
diff --git a/src/game/client/gc_client.hpp b/src/game/client/gc_client.hpp
index 4634aa58..2b6ccd46 100644
--- a/src/game/client/gc_client.hpp
+++ b/src/game/client/gc_client.hpp
@@ -1,7 +1,7 @@
 #include <base/vmath.hpp>
 
 #include <game/generated/g_protocol.hpp>
-#include <game/g_game.hpp>
+#include <game/gamecore.hpp>
 
 #include <game/client/gc_render.hpp>
 
diff --git a/src/game/client/gc_console.cpp b/src/game/client/gc_console.cpp
index d1e517de..eb73ebc6 100644
--- a/src/game/client/gc_console.cpp
+++ b/src/game/client/gc_console.cpp
@@ -17,7 +17,7 @@ extern "C" {
 #include "gc_ui.hpp"
 #include "gc_client.hpp"
 
-#include "../g_version.hpp"
+#include "../version.hpp"
 
 enum
 {
diff --git a/src/game/client/gc_flow.cpp b/src/game/client/gc_flow.cpp
index 63e60617..b18a41e6 100644
--- a/src/game/client/gc_flow.cpp
+++ b/src/game/client/gc_flow.cpp
@@ -1,7 +1,7 @@
 #include <engine/e_client_interface.h>
 #include <engine/e_config.h>
 #include "gc_client.hpp"
-#include "../g_layers.hpp"
+#include "../layers.hpp"
 
 struct FLOWCELL
 {
diff --git a/src/game/client/gc_hooks.cpp b/src/game/client/gc_hooks.cpp
index 5d9570fb..8db0995f 100644
--- a/src/game/client/gc_hooks.cpp
+++ b/src/game/client/gc_hooks.cpp
@@ -9,10 +9,10 @@ extern "C" {
 };
 
 #include <game/generated/gc_data.hpp>
-#include <game/g_game.hpp>
-#include <game/g_version.hpp>
+#include <game/gamecore.hpp>
+#include <game/version.hpp>
 
-#include <game/g_layers.hpp>
+#include <game/layers.hpp>
 
 #include "gc_client.hpp"
 #include "gc_skin.hpp"
diff --git a/src/game/client/gc_map_image.cpp b/src/game/client/gc_map_image.cpp
index b48b6b1d..ca16674a 100644
--- a/src/game/client/gc_map_image.cpp
+++ b/src/game/client/gc_map_image.cpp
@@ -3,7 +3,7 @@
 
 #include <stdio.h>
 #include <engine/e_client_interface.h>
-#include <game/g_mapitems.hpp>
+#include <game/mapitems.hpp>
 #include "gc_map_image.hpp"
 
 static int map_textures[64] = {0};
diff --git a/src/game/client/gc_menu.cpp b/src/game/client/gc_menu.cpp
index c867720b..fb7c5437 100644
--- a/src/game/client/gc_menu.cpp
+++ b/src/game/client/gc_menu.cpp
@@ -15,7 +15,7 @@ extern "C" {
 	#include <engine/client/ec_font.h>
 }
 
-#include "../g_version.hpp"
+#include "../version.hpp"
 #include <game/generated/g_protocol.hpp>
 
 #include "../generated/gc_data.hpp"
diff --git a/src/game/client/gc_render.cpp b/src/game/client/gc_render.cpp
index 28e16686..56e82c69 100644
--- a/src/game/client/gc_render.cpp
+++ b/src/game/client/gc_render.cpp
@@ -7,7 +7,7 @@
 #include <engine/e_config.h>
 #include <game/generated/gc_data.hpp>
 #include <game/generated/g_protocol.hpp>
-#include <game/g_layers.hpp>
+#include <game/layers.hpp>
 #include "gc_render.hpp"
 #include "gc_anim.hpp"
 #include "gc_client.hpp"
diff --git a/src/game/client/gc_render.hpp b/src/game/client/gc_render.hpp
index faaff094..e48d0fcd 100644
--- a/src/game/client/gc_render.hpp
+++ b/src/game/client/gc_render.hpp
@@ -4,7 +4,7 @@
 
 #include <base/vmath.hpp>
 
-#include "../g_mapitems.hpp"
+#include "../mapitems.hpp"
 #include "gc_ui.hpp"
 
 struct TEE_RENDER_INFO