renamed .h to .hpp in game because they are c++ headers

49 files changed, 127 insertions, 125 deletions

diff --git a/src/engine/e_config_variables.h b/src/engine/e_config_variables.h
index 3683fc85..3707f0e6 100644
--- a/src/engine/e_config_variables.h
+++ b/src/engine/e_config_variables.h
@@ -1,5 +1,7 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include "../game/g_variables.h"
+
+/* TODO: remove this */
+#include "../game/g_variables.hpp"
 
 
 MACRO_CONFIG_STR(player_name, 32, "nameless tee")
diff --git a/src/game/client/gc_anim.h b/src/game/client/gc_anim.hpp
index f6e9aac3..f6e9aac3 100644
--- a/src/game/client/gc_anim.h
+++ b/src/game/client/gc_anim.hpp
diff --git a/src/game/client/gc_client.cpp b/src/game/client/gc_client.cpp
index 89c7ffcd..c42c354e 100644
--- a/src/game/client/gc_client.cpp
+++ b/src/game/client/gc_client.cpp
@@ -1,5 +1,5 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include <game/g_math.h>
+#include <game/g_math.hpp>
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -10,19 +10,19 @@ extern "C" {
 	#include <engine/e_client_interface.h>
 };
 
-#include "../g_game.h"
-#include "../g_version.h"
-#include "../g_layers.h"
-#include "../g_math.h"
-#include "gc_map_image.h"
-#include "../generated/gc_data.h"
-#include "gc_menu.h"
-#include "gc_skin.h"
-#include "gc_ui.h"
-#include "gc_client.h"
-#include "gc_render.h"
-#include "gc_anim.h"
-#include "gc_console.h"
+#include "../g_game.hpp"
+#include "../g_version.hpp"
+#include "../g_layers.hpp"
+#include "../g_math.hpp"
+#include "gc_map_image.hpp"
+#include "../generated/gc_data.hpp"
+#include "gc_menu.hpp"
+#include "gc_skin.hpp"
+#include "gc_ui.hpp"
+#include "gc_client.hpp"
+#include "gc_render.hpp"
+#include "gc_anim.hpp"
+#include "gc_console.hpp"
 
 //struct data_container *data = 0;
 int64 debug_firedelay = 0;
diff --git a/src/game/client/gc_client.h b/src/game/client/gc_client.hpp
index bb8a69cf..750154b3 100644
--- a/src/game/client/gc_client.h
+++ b/src/game/client/gc_client.hpp
@@ -1,8 +1,8 @@
-#include <game/g_vmath.h>
-#include <game/g_protocol.h>
-#include <game/g_game.h>
+#include <game/g_vmath.hpp>
+#include <game/g_protocol.hpp>
+#include <game/g_game.hpp>
 
-#include <game/client/gc_render.h>
+#include <game/client/gc_render.hpp>
 
 // sound channels
 enum
diff --git a/src/game/client/gc_console.cpp b/src/game/client/gc_console.cpp
index 76bf7218..45666a01 100644
--- a/src/game/client/gc_console.cpp
+++ b/src/game/client/gc_console.cpp
@@ -1,5 +1,5 @@
-#include "gc_console.h"
-#include "../generated/gc_data.h"
+#include "gc_console.hpp"
+#include "../generated/gc_data.hpp"
 
 extern "C" {
 	#include <engine/e_system.h>
@@ -13,10 +13,10 @@ extern "C" {
 #include <cstring>
 #include <cstdio>
 
-#include "gc_ui.h"
-#include "gc_client.h"
+#include "gc_ui.hpp"
+#include "gc_client.hpp"
 
-#include "../g_version.h"
+#include "../g_version.hpp"
 
 enum
 {
diff --git a/src/game/client/gc_console.h b/src/game/client/gc_console.hpp
index 0f5e7b9f..0f5e7b9f 100644
--- a/src/game/client/gc_console.h
+++ b/src/game/client/gc_console.hpp
diff --git a/src/game/client/gc_effects.cpp b/src/game/client/gc_effects.cpp
index 5a9ebfc6..387e1471 100644
--- a/src/game/client/gc_effects.cpp
+++ b/src/game/client/gc_effects.cpp
@@ -1,7 +1,7 @@
 #include <engine/e_client_interface.h>
-#include "gc_client.h"
-#include "gc_skin.h"
-#include "../generated/gc_data.h"
+#include "gc_client.hpp"
+#include "gc_skin.hpp"
+#include "../generated/gc_data.hpp"
 
 static bool add_50hz = false;
 static bool add_100hz = false;
diff --git a/src/game/client/gc_flow.cpp b/src/game/client/gc_flow.cpp
index aac35058..63e60617 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.h"
-#include "../g_layers.h"
+#include "gc_client.hpp"
+#include "../g_layers.hpp"
 
 struct FLOWCELL
 {
diff --git a/src/game/client/gc_hooks.cpp b/src/game/client/gc_hooks.cpp
index 61e5f2e8..2aaca900 100644
--- a/src/game/client/gc_hooks.cpp
+++ b/src/game/client/gc_hooks.cpp
@@ -8,17 +8,17 @@ extern "C" {
 	#include <engine/e_console.h>
 };
 
-#include <game/generated/gc_data.h>
-#include <game/g_game.h>
-#include <game/g_version.h>
+#include <game/generated/gc_data.hpp>
+#include <game/g_game.hpp>
+#include <game/g_version.hpp>
 
-#include <game/g_layers.h>
+#include <game/g_layers.hpp>
 
-#include "gc_client.h"
-#include "gc_skin.h"
-#include "gc_render.h"
-#include "gc_map_image.h"
-#include "gc_console.h"
+#include "gc_client.hpp"
+#include "gc_skin.hpp"
+#include "gc_render.hpp"
+#include "gc_map_image.hpp"
+#include "gc_console.hpp"
 
 extern unsigned char internal_data[];
 
diff --git a/src/game/client/gc_map_image.cpp b/src/game/client/gc_map_image.cpp
index 65cb0608..63a57c70 100644
--- a/src/game/client/gc_map_image.cpp
+++ b/src/game/client/gc_map_image.cpp
@@ -2,8 +2,8 @@
 #include <stdio.h>
 #include <engine/e_system.h>
 #include <engine/e_client_interface.h>
-#include <game/g_mapitems.h>
-#include "gc_map_image.h"
+#include <game/g_mapitems.hpp>
+#include "gc_map_image.hpp"
 
 static int map_textures[64] = {0};
 static int count = 0;
diff --git a/src/game/client/gc_map_image.h b/src/game/client/gc_map_image.hpp
index d73f43d3..d73f43d3 100644
--- a/src/game/client/gc_map_image.h
+++ b/src/game/client/gc_map_image.hpp
diff --git a/src/game/client/gc_menu.cpp b/src/game/client/gc_menu.cpp
index 3a41aee4..cb8324a7 100644
--- a/src/game/client/gc_menu.cpp
+++ b/src/game/client/gc_menu.cpp
@@ -4,8 +4,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <game/g_math.h>
-#include <game/g_vmath.h>
+#include <game/g_math.hpp>
+#include <game/g_vmath.hpp>
 
 extern "C" {
 	#include <engine/e_system.h>
@@ -14,15 +14,15 @@ extern "C" {
 	#include <engine/client/ec_font.h>
 }
 
-#include "../g_version.h"
-#include "../g_protocol.h"
+#include "../g_version.hpp"
+#include "../g_protocol.hpp"
 
-#include "../generated/gc_data.h"
-#include "gc_render.h"
-#include "gc_anim.h"
-#include "gc_skin.h"
-#include "gc_ui.h"
-#include "gc_client.h"
+#include "../generated/gc_data.hpp"
+#include "gc_render.hpp"
+#include "gc_anim.hpp"
+#include "gc_skin.hpp"
+#include "gc_ui.hpp"
+#include "gc_client.hpp"
 #include <mastersrv/mastersrv.h>
 
 //extern data_container *data;
diff --git a/src/game/client/gc_menu.h b/src/game/client/gc_menu.hpp
index ba12894c..ba12894c 100644
--- a/src/game/client/gc_menu.h
+++ b/src/game/client/gc_menu.hpp
diff --git a/src/game/client/gc_particles.cpp b/src/game/client/gc_particles.cpp
index 2c3ef36c..504ebbab 100644
--- a/src/game/client/gc_particles.cpp
+++ b/src/game/client/gc_particles.cpp
@@ -1,6 +1,6 @@
 #include <engine/e_client_interface.h>
-#include "gc_client.h"
-#include "../generated/gc_data.h"
+#include "gc_client.hpp"
+#include "../generated/gc_data.hpp"
 
 // NOTE: the way the particle system works isn't very cache friendly
 
diff --git a/src/game/client/gc_render.cpp b/src/game/client/gc_render.cpp
index 364b33eb..2e5a3d50 100644
--- a/src/game/client/gc_render.cpp
+++ b/src/game/client/gc_render.cpp
@@ -2,14 +2,14 @@
 #include <math.h>
 #include <engine/e_client_interface.h>
 #include <engine/e_config.h>
-#include <game/generated/gc_data.h>
-#include <game/g_protocol.h>
-#include <game/g_math.h>
-#include <game/g_layers.h>
-#include "gc_render.h"
-#include "gc_anim.h"
-#include "gc_client.h"
-#include "gc_map_image.h"
+#include <game/generated/gc_data.hpp>
+#include <game/g_protocol.hpp>
+#include <game/g_math.hpp>
+#include <game/g_layers.hpp>
+#include "gc_render.hpp"
+#include "gc_anim.hpp"
+#include "gc_client.hpp"
+#include "gc_map_image.hpp"
 
 static float sprite_w_scale;
 static float sprite_h_scale;
diff --git a/src/game/client/gc_render.h b/src/game/client/gc_render.hpp
index 508ab195..02bc224d 100644
--- a/src/game/client/gc_render.h
+++ b/src/game/client/gc_render.hpp
@@ -2,9 +2,9 @@
 #ifndef GAME_CLIENT_RENDER_H
 #define GAME_CLIENT_RENDER_H
 
-#include "../g_vmath.h"
-#include "../g_mapitems.h"
-#include "gc_ui.h"
+#include "../g_vmath.hpp"
+#include "../g_mapitems.hpp"
+#include "gc_ui.hpp"
 
 struct TEE_RENDER_INFO
 {
diff --git a/src/game/client/gc_render_map.cpp b/src/game/client/gc_render_map.cpp
index 2ad3ad94..90579aa7 100644
--- a/src/game/client/gc_render_map.cpp
+++ b/src/game/client/gc_render_map.cpp
@@ -1,7 +1,7 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 #include <engine/e_client_interface.h>
-#include "../g_math.h"
-#include "gc_client.h"
+#include "../g_math.hpp"
+#include "gc_client.hpp"
 
 void render_eval_envelope(ENVPOINT *points, int num_points, int channels, float time, float *result)
 {
diff --git a/src/game/client/gc_render_obj.cpp b/src/game/client/gc_render_obj.cpp
index a6cd2b69..119db4d6 100644
--- a/src/game/client/gc_render_obj.cpp
+++ b/src/game/client/gc_render_obj.cpp
@@ -3,13 +3,13 @@
 #include <stdio.h>
 #include <engine/e_client_interface.h>
 #include <engine/e_config.h>
-#include "../generated/gc_data.h"
-#include "../g_protocol.h"
-#include "../g_math.h"
-#include "gc_render.h"
-#include "gc_anim.h"
-#include "gc_client.h"
-#include "gc_skin.h"
+#include "../generated/gc_data.hpp"
+#include "../g_protocol.hpp"
+#include "../g_math.hpp"
+#include "gc_render.hpp"
+#include "gc_anim.hpp"
+#include "gc_client.hpp"
+#include "gc_skin.hpp"
 
 
 void render_projectile(const NETOBJ_PROJECTILE *current, int itemid)
diff --git a/src/game/client/gc_skin.cpp b/src/game/client/gc_skin.cpp
index a876c960..2bd2d4ff 100644
--- a/src/game/client/gc_skin.cpp
+++ b/src/game/client/gc_skin.cpp
@@ -4,8 +4,8 @@
 #include <math.h>
 #include <engine/e_system.h>
 #include <engine/e_client_interface.h>
-#include "gc_skin.h"
-#include "../g_math.h"
+#include "gc_skin.hpp"
+#include "../g_math.hpp"
 
 enum
 {
diff --git a/src/game/client/gc_skin.h b/src/game/client/gc_skin.hpp
index d3840302..3a746589 100644
--- a/src/game/client/gc_skin.h
+++ b/src/game/client/gc_skin.hpp
@@ -1,5 +1,5 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include "../g_vmath.h"
+#include "../g_vmath.hpp"
 
 // do this better and nicer
 typedef struct 
diff --git a/src/game/client/gc_ui.cpp b/src/game/client/gc_ui.cpp
index dc78c0ca..a344d661 100644
--- a/src/game/client/gc_ui.cpp
+++ b/src/game/client/gc_ui.cpp
@@ -2,7 +2,7 @@
 #include <engine/e_system.h>
 #include <engine/e_client_interface.h>
 #include <engine/e_config.h>
-#include "gc_ui.h"
+#include "gc_ui.hpp"
 
 /********************************************************
  UI                                                      
diff --git a/src/game/client/gc_ui.h b/src/game/client/gc_ui.hpp
index 26c4dcdb..26c4dcdb 100644
--- a/src/game/client/gc_ui.h
+++ b/src/game/client/gc_ui.hpp
diff --git a/src/game/editor/array.h b/src/game/editor/array.hpp
index fe9f2739..fe9f2739 100755
--- a/src/game/editor/array.h
+++ b/src/game/editor/array.hpp
diff --git a/src/game/editor/ed_editor.cpp b/src/game/editor/ed_editor.cpp
index 3632a034..731d4f4a 100644
--- a/src/game/editor/ed_editor.cpp
+++ b/src/game/editor/ed_editor.cpp
@@ -11,10 +11,10 @@ extern "C" {
 	#include <engine/e_config.h>
 }
 
-#include <game/client/gc_map_image.h>
-#include <game/client/gc_ui.h>
-#include <game/g_game.h>
-#include <game/client/gc_render.h>
+#include <game/client/gc_map_image.hpp>
+#include <game/client/gc_ui.hpp>
+#include <game/g_game.hpp>
+#include <game/client/gc_render.hpp>
 
 #include "ed_editor.hpp"
 
diff --git a/src/game/editor/ed_editor.hpp b/src/game/editor/ed_editor.hpp
index 62f8871a..dbca4a0e 100644
--- a/src/game/editor/ed_editor.hpp
+++ b/src/game/editor/ed_editor.hpp
@@ -2,10 +2,10 @@
 
 #include <stdlib.h>
 #include <math.h>
-#include "array.h"
-#include "../g_mapitems.h"
-#include "../g_math.h"
-#include "../client/gc_render.h"
+#include "array.hpp"
+#include "../g_mapitems.hpp"
+#include "../g_math.hpp"
+#include "../client/gc_render.hpp"
 
 extern "C" {
 	#include <engine/e_system.h>
@@ -14,7 +14,7 @@ extern "C" {
 	#include <engine/e_config.h>
 }
 
-#include <game/client/gc_ui.h>
+#include <game/client/gc_ui.hpp>
 
 typedef void (*INDEX_MODIFY_FUNC)(int *index);
 
diff --git a/src/game/editor/ed_layer_quads.cpp b/src/game/editor/ed_layer_quads.cpp
index f3df3818..8c8a47a7 100644
--- a/src/game/editor/ed_layer_quads.cpp
+++ b/src/game/editor/ed_layer_quads.cpp
@@ -1,7 +1,7 @@
 #include "ed_editor.hpp"
-#include <game/g_math.h>
-#include <game/generated/gc_data.h>
-#include <game/client/gc_render.h>
+#include <game/g_math.hpp>
+#include <game/generated/gc_data.hpp>
+#include <game/client/gc_render.hpp>
 
 LAYER_QUADS::LAYER_QUADS()
 {
diff --git a/src/game/editor/ed_layer_tiles.cpp b/src/game/editor/ed_layer_tiles.cpp
index 18e3b695..d77f0970 100644
--- a/src/game/editor/ed_layer_tiles.cpp
+++ b/src/game/editor/ed_layer_tiles.cpp
@@ -1,6 +1,6 @@
-#include <game/g_math.h>
-#include <game/generated/gc_data.h>
-#include <game/client/gc_render.h>
+#include <game/g_math.hpp>
+#include <game/generated/gc_data.hpp>
+#include <game/client/gc_render.hpp>
 #include "ed_editor.hpp"
 
 LAYER_TILES::LAYER_TILES(int w, int h)
diff --git a/src/game/g_collision.cpp b/src/game/g_collision.cpp
index 6c50064b..b91c0e29 100644
--- a/src/game/g_collision.cpp
+++ b/src/game/g_collision.cpp
@@ -1,11 +1,11 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 #include <engine/e_system.h>
-#include <game/g_vmath.h>
+#include <game/g_vmath.hpp>
 #include <math.h>
 #include <engine/e_common_interface.h>
-#include <game/g_math.h>
-#include <game/g_mapitems.h>
-#include <game/g_layers.h>
+#include <game/g_math.hpp>
+#include <game/g_mapitems.hpp>
+#include <game/g_layers.hpp>
 
 static TILE *tiles;
 static int width = 0;
diff --git a/src/game/g_collision.h b/src/game/g_collision.hpp
index e738bc64..e42764c1 100644
--- a/src/game/g_collision.h
+++ b/src/game/g_collision.hpp
@@ -3,7 +3,7 @@
 #define GAME_MAPRES_COL_H
 
 
-#include <game/g_vmath.h>
+#include <game/g_vmath.hpp>
 
 int col_init();
 int col_is_solid(int x, int y);
diff --git a/src/game/g_game.cpp b/src/game/g_game.cpp
index b5b37918..6545a75d 100644
--- a/src/game/g_game.cpp
+++ b/src/game/g_game.cpp
@@ -1,11 +1,11 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 #include <string.h>
-#include "g_game.h"
+#include "g_game.hpp"
 
 const char *TUNING_PARAMS::names[] =
 {
 	#define MACRO_TUNING_PARAM(name,value) #name,
-	#include "g_tuning.h"
+	#include "g_tuning.hpp"
 	#undef MACRO_TUNING_PARAM
 };
 
diff --git a/src/game/g_game.h b/src/game/g_game.hpp
index 414dfdbf..7ab8df40 100644
--- a/src/game/g_game.h
+++ b/src/game/g_game.hpp
@@ -5,9 +5,9 @@
 #include <engine/e_system.h>
 #include <engine/e_common_interface.h>
 #include <math.h>
-#include "g_math.h"
-#include "g_collision.h"
-#include "g_protocol.h"
+#include "g_math.hpp"
+#include "g_collision.hpp"
+#include "g_protocol.hpp"
 
 struct TUNING_PARAMS
 {
@@ -15,14 +15,14 @@ struct TUNING_PARAMS
 	{
 		const float ticks_per_second = 50.0f;
 		#define MACRO_TUNING_PARAM(name,value) name.set((int)(value*100.0f));
-		#include "g_tuning.h"
+		#include "g_tuning.hpp"
 		#undef MACRO_TUNING_PARAM
 	}
 
 	static const char *names[];
 	
 	#define MACRO_TUNING_PARAM(name,value) tune_param name;
-	#include "g_tuning.h"
+	#include "g_tuning.hpp"
 	#undef MACRO_TUNING_PARAM
 	
 	static int num() { return sizeof(TUNING_PARAMS)/sizeof(int); }
diff --git a/src/game/g_layers.cpp b/src/game/g_layers.cpp
index 07ffec4b..254bc083 100644
--- a/src/game/g_layers.cpp
+++ b/src/game/g_layers.cpp
@@ -1,5 +1,5 @@
 #include <engine/e_common_interface.h>
-#include "g_layers.h"
+#include "g_layers.hpp"
 
 static MAPITEM_LAYER_TILEMAP *game_layer = 0;
 static MAPITEM_GROUP *game_group = 0;
diff --git a/src/game/g_layers.h b/src/game/g_layers.hpp
index 3ece897f..f977bd65 100644
--- a/src/game/g_layers.h
+++ b/src/game/g_layers.hpp
@@ -1,4 +1,4 @@
-#include "g_mapitems.h"
+#include "g_mapitems.hpp"
 
 void layers_init();
 
diff --git a/src/game/g_mapitems.h b/src/game/g_mapitems.hpp
index 8093435a..8093435a 100644
--- a/src/game/g_mapitems.h
+++ b/src/game/g_mapitems.hpp
diff --git a/src/game/g_math.h b/src/game/g_math.hpp
index 5e3f7ede..5e3f7ede 100644
--- a/src/game/g_math.h
+++ b/src/game/g_math.hpp
diff --git a/src/game/g_protocol.h b/src/game/g_protocol.hpp
index 195f5ae2..8650b8be 100644
--- a/src/game/g_protocol.h
+++ b/src/game/g_protocol.hpp
@@ -4,7 +4,7 @@
 #ifndef GAME_PROTOCOL_H
 #define GAME_PROTOCOL_H
 
-#include <game/generated/g_protocol.h>
+#include <game/generated/g_protocol.hpp>
 
 // Network stuff
 /*
diff --git a/src/game/g_tuning.h b/src/game/g_tuning.hpp
index d35ef148..d35ef148 100644
--- a/src/game/g_tuning.h
+++ b/src/game/g_tuning.hpp
diff --git a/src/game/g_variables.h b/src/game/g_variables.hpp
index fb69584e..fb69584e 100644
--- a/src/game/g_variables.h
+++ b/src/game/g_variables.hpp
diff --git a/src/game/g_version.h b/src/game/g_version.hpp
index 7472c783..7472c783 100644
--- a/src/game/g_version.h
+++ b/src/game/g_version.hpp
diff --git a/src/game/g_vmath.h b/src/game/g_vmath.hpp
index ac3e1870..ac3e1870 100644
--- a/src/game/g_vmath.h
+++ b/src/game/g_vmath.hpp
diff --git a/src/game/server/gs_common.h b/src/game/server/gs_common.hpp
index 6b307cdf..b6c809fa 100644
--- a/src/game/server/gs_common.h
+++ b/src/game/server/gs_common.hpp
@@ -1,6 +1,6 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include "../g_game.h"
-#include "../generated/gs_data.h"
+#include "../g_game.hpp"
+#include "../generated/gs_data.hpp"
 
 
 extern TUNING_PARAMS tuning;
diff --git a/src/game/server/gs_game.cpp b/src/game/server/gs_game.cpp
index 4a8aa9bd..55ffc288 100644
--- a/src/game/server/gs_game.cpp
+++ b/src/game/server/gs_game.cpp
@@ -2,8 +2,8 @@
 #include <string.h>
 #include <engine/e_config.h>
 #include <engine/e_server_interface.h>
-#include <game/g_mapitems.h>
-#include "gs_common.h"
+#include <game/g_mapitems.hpp>
+#include "gs_common.hpp"
 
 GAMECONTROLLER::GAMECONTROLLER()
 : ENTITY(NETOBJTYPE_GAME)
diff --git a/src/game/server/gs_game_ctf.cpp b/src/game/server/gs_game_ctf.cpp
index 59ec3981..031be42a 100644
--- a/src/game/server/gs_game_ctf.cpp
+++ b/src/game/server/gs_game_ctf.cpp
@@ -1,8 +1,8 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 #include <engine/e_server_interface.h>
-#include <game/g_mapitems.h>
-#include "gs_common.h"
-#include "gs_game_ctf.h"
+#include <game/g_mapitems.hpp>
+#include "gs_common.hpp"
+#include "gs_game_ctf.hpp"
 
 GAMECONTROLLER_CTF::GAMECONTROLLER_CTF()
 {
diff --git a/src/game/server/gs_game_ctf.h b/src/game/server/gs_game_ctf.hpp
index 6d512815..6d512815 100644
--- a/src/game/server/gs_game_ctf.h
+++ b/src/game/server/gs_game_ctf.hpp
diff --git a/src/game/server/gs_game_dm.cpp b/src/game/server/gs_game_dm.cpp
index 1d565372..264063bf 100644
--- a/src/game/server/gs_game_dm.cpp
+++ b/src/game/server/gs_game_dm.cpp
@@ -1,7 +1,7 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 #include <engine/e_config.h>
-#include "gs_common.h"
-#include "gs_game_dm.h"
+#include "gs_common.hpp"
+#include "gs_game_dm.hpp"
 
 void GAMECONTROLLER_DM::tick()
 {
diff --git a/src/game/server/gs_game_dm.h b/src/game/server/gs_game_dm.hpp
index 99ceaec1..99ceaec1 100644
--- a/src/game/server/gs_game_dm.h
+++ b/src/game/server/gs_game_dm.hpp
diff --git a/src/game/server/gs_game_tdm.cpp b/src/game/server/gs_game_tdm.cpp
index 10c5a7dc..c591b447 100644
--- a/src/game/server/gs_game_tdm.cpp
+++ b/src/game/server/gs_game_tdm.cpp
@@ -1,7 +1,7 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
 #include <engine/e_config.h>
-#include "gs_common.h"
-#include "gs_game_tdm.h"
+#include "gs_common.hpp"
+#include "gs_game_tdm.hpp"
 
 GAMECONTROLLER_TDM::GAMECONTROLLER_TDM()
 {
diff --git a/src/game/server/gs_game_tdm.h b/src/game/server/gs_game_tdm.hpp
index 516b581c..516b581c 100644
--- a/src/game/server/gs_game_tdm.h
+++ b/src/game/server/gs_game_tdm.hpp
diff --git a/src/game/server/gs_server.cpp b/src/game/server/gs_server.cpp
index 86d7fe32..4e7b4179 100644
--- a/src/game/server/gs_server.cpp
+++ b/src/game/server/gs_server.cpp
@@ -4,14 +4,14 @@
 #include <string.h>
 #include <engine/e_config.h>
 #include <engine/e_server_interface.h>
-#include <game/g_version.h>
-#include <game/g_collision.h>
-#include <game/g_layers.h>
-#include <game/g_math.h>
-#include "gs_common.h"
-#include "gs_game_ctf.h"
-#include "gs_game_tdm.h"
-#include "gs_game_dm.h"
+#include <game/g_version.hpp>
+#include <game/g_collision.hpp>
+#include <game/g_layers.hpp>
+#include <game/g_math.hpp>
+#include "gs_common.hpp"
+#include "gs_game_ctf.hpp"
+#include "gs_game_tdm.hpp"
+#include "gs_game_dm.hpp"
 
 TUNING_PARAMS tuning;