diff --git a/src/engine/aa.cc b/src/engine/aa.cc
index c0167c0..586e941 100644
--- a/src/engine/aa.cc
+++ b/src/engine/aa.cc
@@ -1,4 +1,4 @@
-#include "engine.h"
+#include "engine.hh"
 
 extern int intel_texalpha_bug;
 
diff --git a/src/engine/animmodel.h b/src/engine/animmodel.hh
similarity index 100%
rename from src/engine/animmodel.h
rename to src/engine/animmodel.hh
diff --git a/src/engine/bih.cc b/src/engine/bih.cc
index 0a4a821..9532288 100644
--- a/src/engine/bih.cc
+++ b/src/engine/bih.cc
@@ -1,4 +1,4 @@
-#include "engine.h"
+#include "engine.hh"
 
 extern vec hitsurface;
 
diff --git a/src/engine/bih.h b/src/engine/bih.hh
similarity index 100%
rename from src/engine/bih.h
rename to src/engine/bih.hh
diff --git a/src/engine/blend.cc b/src/engine/blend.cc
index 38b9bed..1034098 100644
--- a/src/engine/blend.cc
+++ b/src/engine/blend.cc
@@ -1,4 +1,4 @@
-#include "engine.h"
+#include "engine.hh"
 
 enum
 {
diff --git a/src/engine/client.cc b/src/engine/client.cc
index 78bab0e..24e2135 100644
--- a/src/engine/client.cc
+++ b/src/engine/client.cc
@@ -1,6 +1,6 @@
 // client.cpp, mostly network related client game code
 
-#include "engine.h"
+#include "engine.hh"
 
 ENetHost *clienthost = NULL;
 ENetPeer *curpeer = NULL, *connpeer = NULL;
diff --git a/src/engine/command.cc b/src/engine/command.cc
index 1c727f4..62f01ac 100644
--- a/src/engine/command.cc
+++ b/src/engine/command.cc
@@ -1,7 +1,7 @@
 // command.cpp: implements the parsing and execution of a tiny script language which
 // is largely backwards compatible with the quake console language.
 
-#include "engine.h"
+#include "engine.hh"
 
 hashnameset<ident> idents; // contains ALL vars/commands/aliases
 vector<ident *> identmap;
diff --git a/src/engine/console.cc b/src/engine/console.cc
index 6a4a599..46d66e0 100644
--- a/src/engine/console.cc
+++ b/src/engine/console.cc
@@ -1,6 +1,6 @@
 // console.cpp: the console buffer, its display, and command line control
 
-#include "engine.h"
+#include "engine.hh"
 
 #define MAXCONLINES 1000
 struct cline { char *line; int type, outtime; };
diff --git a/src/engine/dynlight.cc b/src/engine/dynlight.cc
index 17f0134..ab10b9b 100644
--- a/src/engine/dynlight.cc
+++ b/src/engine/dynlight.cc
@@ -1,4 +1,4 @@
-#include "engine.h"
+#include "engine.hh"
 
 VARNP(dynlights, usedynlights, 0, 1, 1);
 VARP(dynlightdist, 0, 1024, 10000);
diff --git a/src/engine/engine.h b/src/engine/engine.hh
similarity index 99%
rename from src/engine/engine.h
rename to src/engine/engine.hh
index d97f995..f0e7bf8 100644
--- a/src/engine/engine.h
+++ b/src/engine/engine.hh
@@ -1,16 +1,16 @@
 #ifndef __ENGINE_H__
 #define __ENGINE_H__
 
-#include "cube.h"
-#include "world.h"
+#include "cube.hh"
+#include "world.hh"
 
 #ifndef STANDALONE
 
-#include "octa.h"
-#include "light.h"
-#include "texture.h"
-#include "bih.h"
-#include "model.h"
+#include "octa.hh"
+#include "light.hh"
+#include "texture.hh"
+#include "bih.hh"
+#include "model.hh"
 
 extern dynent *player;
 extern physent *camera1;                // special ent that acts as camera, same object as player1 in FPS mode
diff --git a/src/engine/explosion.h b/src/engine/explosion.hh
similarity index 100%
rename from src/engine/explosion.h
rename to src/engine/explosion.hh
diff --git a/src/engine/grass.cc b/src/engine/grass.cc
index 3a4ff06..d3fe477 100644
--- a/src/engine/grass.cc
+++ b/src/engine/grass.cc
@@ -1,4 +1,4 @@
-#include "engine.h"
+#include "engine.hh"
 
 VARP(grass, 0, 1, 1);
 VAR(dbggrass, 0, 0, 1);
diff --git a/src/engine/hitzone.h b/src/engine/hitzone.hh
similarity index 100%
rename from src/engine/hitzone.h
rename to src/engine/hitzone.hh
diff --git a/src/engine/iqm.h b/src/engine/iqm.hh
similarity index 100%
rename from src/engine/iqm.h
rename to src/engine/iqm.hh
diff --git a/src/engine/lensflare.h b/src/engine/lensflare.hh
similarity index 100%
rename from src/engine/lensflare.h
rename to src/engine/lensflare.hh
diff --git a/src/engine/light.cc b/src/engine/light.cc
index 09c7864..5a43148 100644
--- a/src/engine/light.cc
+++ b/src/engine/light.cc
@@ -1,4 +1,4 @@
-#include "engine.h"
+#include "engine.hh"
 
 CVAR1R(ambient, 0x191919);
 FVARR(ambientscale, 0, 1, 16);
diff --git a/src/engine/light.h b/src/engine/light.hh
similarity index 100%
rename from src/engine/light.h
rename to src/engine/light.hh
diff --git a/src/engine/lightning.h b/src/engine/lightning.hh
similarity index 100%
rename from src/engine/lightning.h
rename to src/engine/lightning.hh
diff --git a/src/engine/main.cc b/src/engine/main.cc
index e22862e..dcba38a 100644
--- a/src/engine/main.cc
+++ b/src/engine/main.cc
@@ -1,6 +1,6 @@
 // main.cpp: initialisation & main loop
 
-#include "engine.h"
+#include "engine.hh"
 
 extern void cleargamma();
 
diff --git a/src/engine/master.cc b/src/engine/master.cc
index a33b88a..50bcc2d 100644
--- a/src/engine/master.cc
+++ b/src/engine/master.cc
@@ -6,7 +6,7 @@
 #define __FD_SETSIZE 4096
 #endif
 
-#include "cube.h"
+#include "cube.hh"
 #include <signal.h>
 #include <enet/time.h>
 
diff --git a/src/engine/material.cc b/src/engine/material.cc
index 8860eff..3fc903c 100644
--- a/src/engine/material.cc
+++ b/src/engine/material.cc
@@ -1,4 +1,4 @@
-#include "engine.h"
+#include "engine.hh"
 
 struct QuadNode
 {
diff --git a/src/engine/md2.h b/src/engine/md2.hh
similarity index 100%
rename from src/engine/md2.h
rename to src/engine/md2.hh
diff --git a/src/engine/md3.h b/src/engine/md3.hh
similarity index 100%
rename from src/engine/md3.h
rename to src/engine/md3.hh
diff --git a/src/engine/md5.h b/src/engine/md5.hh
similarity index 100%
rename from src/engine/md5.h
rename to src/engine/md5.hh
diff --git a/src/engine/menus.cc b/src/engine/menus.cc
index 113073d..b104ca9 100644
--- a/src/engine/menus.cc
+++ b/src/engine/menus.cc
@@ -1,4 +1,4 @@
-#include "engine.h"
+#include "engine.hh"
 
 void notifywelcome()
 {
diff --git a/src/engine/model.h b/src/engine/model.hh
similarity index 100%
rename from src/engine/model.h
rename to src/engine/model.hh
diff --git a/src/engine/movie.cc b/src/engine/movie.cc
index 2ee6f45..e30d9eb 100644
--- a/src/engine/movie.cc
+++ b/src/engine/movie.cc
@@ -7,12 +7,7 @@
 //   avidemux - ok - 3Apr09-RockKeyman:had to swap UV channels as it showed up blue
 //   kino - ok
 
-#include "engine.h"
-#ifdef __APPLE__
-  #include "SDL2_mixer/SDL_mixer.h"
-#else
-  #include "SDL_mixer.h"
-#endif
+#include "engine.hh"
 
 VAR(dbgmovie, 0, 0, 1);
 
diff --git a/src/engine/mpr.h b/src/engine/mpr.hh
similarity index 100%
rename from src/engine/mpr.h
rename to src/engine/mpr.hh
diff --git a/src/engine/normal.cc b/src/engine/normal.cc
index 2d9e776..44002c5 100644
--- a/src/engine/normal.cc
+++ b/src/engine/normal.cc
@@ -1,4 +1,4 @@
-#include "engine.h"
+#include "engine.hh"
 
 struct normalkey
 {
diff --git a/src/engine/obj.h b/src/engine/obj.hh
similarity index 100%
rename from src/engine/obj.h
rename to src/engine/obj.hh
diff --git a/src/engine/octa.cc b/src/engine/octa.cc
index 238cb3a..14e3c93 100644
--- a/src/engine/octa.cc
+++ b/src/engine/octa.cc
@@ -1,6 +1,6 @@
 // core world management routines
 
-#include "engine.h"
+#include "engine.hh"
 
 static struct emptycube : cube
 {
diff --git a/src/engine/octa.h b/src/engine/octa.hh
similarity index 100%
rename from src/engine/octa.h
rename to src/engine/octa.hh
diff --git a/src/engine/octaedit.cc b/src/engine/octaedit.cc
index 242c4b2..a4c1ec0 100644
--- a/src/engine/octaedit.cc
+++ b/src/engine/octaedit.cc
@@ -1,4 +1,4 @@
-#include "engine.h"
+#include "engine.hh"
 
 extern int outline;
 
diff --git a/src/engine/octarender.cc b/src/engine/octarender.cc
index 7aa1df6..706d308 100644
--- a/src/engine/octarender.cc
+++ b/src/engine/octarender.cc
@@ -1,6 +1,6 @@
 // octarender.cpp: fill vertex arrays with different cube surfaces.
 
-#include "engine.h"
+#include "engine.hh"
 
 struct vboinfo
 {
diff --git a/src/engine/physics.cc b/src/engine/physics.cc
index dd2ad71..be523ce 100644
--- a/src/engine/physics.cc
+++ b/src/engine/physics.cc
@@ -3,8 +3,8 @@
 // they "felt right", and have no basis in reality. Collision detection is simplistic but
 // very robust (uses discrete steps at fixed fps).
 
-#include "engine.h"
-#include "mpr.h"
+#include "engine.hh"
+#include "mpr.hh"
 
 const int MAXCLIPOFFSET = 4;
 const int MAXCLIPPLANES = 1024;
diff --git a/src/engine/pvs.cc b/src/engine/pvs.cc
index 4d84395..3a283ab 100644
--- a/src/engine/pvs.cc
+++ b/src/engine/pvs.cc
@@ -1,4 +1,4 @@
-#include "engine.h"
+#include "engine.hh"
 
 enum
 {
diff --git a/src/engine/ragdoll.h b/src/engine/ragdoll.hh
similarity index 100%
rename from src/engine/ragdoll.h
rename to src/engine/ragdoll.hh
diff --git a/src/engine/rendergl.cc b/src/engine/rendergl.cc
index e9d1bd7..21bd7cb 100644
--- a/src/engine/rendergl.cc
+++ b/src/engine/rendergl.cc
@@ -1,6 +1,6 @@
 // rendergl.cpp: core opengl rendering stuff
 
-#include "engine.h"
+#include "engine.hh"
 
 bool hasVAO = false, hasTR = false, hasTSW = false, hasPBO = false, hasFBO = false, hasAFBO = false, hasDS = false, hasTF = false, hasCBF = false, hasS3TC = false, hasFXT1 = false, hasLATC = false, hasRGTC = false, hasAF = false, hasFBB = false, hasFBMS = false, hasTMS = false, hasMSS = false, hasFBMSBS = false, hasUBO = false, hasMBR = false, hasDB2 = false, hasDBB = false, hasTG = false, hasTQ = false, hasPF = false, hasTRG = false, hasTI = false, hasHFV = false, hasHFP = false, hasDBT = false, hasDC = false, hasDBGO = false, hasEGPU4 = false, hasGPU4 = false, hasGPU5 = false, hasBFE = false, hasEAL = false, hasCR = false, hasOQ2 = false, hasES3 = false, hasCB = false, hasCI = false;
 bool mesa = false, intel = false, amd = false, nvidia = false;
diff --git a/src/engine/renderlights.cc b/src/engine/renderlights.cc
index d51925f..a6b9a82 100644
--- a/src/engine/renderlights.cc
+++ b/src/engine/renderlights.cc
@@ -1,4 +1,4 @@
-#include "engine.h"
+#include "engine.hh"
 
 int gw = -1, gh = -1, bloomw = -1, bloomh = -1, lasthdraccum = 0;
 GLuint gfbo = 0, gdepthtex = 0, gcolortex = 0, gnormaltex = 0, gglowtex = 0, gdepthrb = 0, gstencilrb = 0;
diff --git a/src/engine/rendermodel.cc b/src/engine/rendermodel.cc
index 13c40cb..4a6927e 100644
--- a/src/engine/rendermodel.cc
+++ b/src/engine/rendermodel.cc
@@ -1,15 +1,15 @@
-#include "engine.h"
+#include "engine.hh"
 
 VAR(oqdynent, 0, 1, 1);
 VAR(animationinterpolationtime, 0, 200, 1000);
 
 model *loadingmodel = NULL;
 
-#include "ragdoll.h"
-#include "animmodel.h"
-#include "vertmodel.h"
-#include "skelmodel.h"
-#include "hitzone.h"
+#include "ragdoll.hh"
+#include "animmodel.hh"
+#include "vertmodel.hh"
+#include "skelmodel.hh"
+#include "hitzone.hh"
 
 static model *(__cdecl *modeltypes[NUMMODELTYPES])(const char *);
 
@@ -26,12 +26,12 @@ static model *__loadmodel__##modelclass(const char *filename) \
 } \
 UNUSED static int __dummy__##modelclass = addmodeltype((modeltype), __loadmodel__##modelclass);
 
-#include "md2.h"
-#include "md3.h"
-#include "md5.h"
-#include "obj.h"
-#include "smd.h"
-#include "iqm.h"
+#include "md2.hh"
+#include "md3.hh"
+#include "md5.hh"
+#include "obj.hh"
+#include "smd.hh"
+#include "iqm.hh"
 
 MODELTYPE(MDL_MD2, md2);
 MODELTYPE(MDL_MD3, md3);
diff --git a/src/engine/renderparticles.cc b/src/engine/renderparticles.cc
index 1dc409c..d9cb29b 100644
--- a/src/engine/renderparticles.cc
+++ b/src/engine/renderparticles.cc
@@ -1,6 +1,6 @@
 // renderparticles.cpp
 
-#include "engine.h"
+#include "engine.hh"
 
 Shader *particleshader = NULL, *particlenotextureshader = NULL, *particlesoftshader = NULL, *particletextshader = NULL;
 
@@ -825,9 +825,9 @@ typedef varenderer<PT_PART> quadrenderer;
 typedef varenderer<PT_TAPE> taperenderer;
 typedef varenderer<PT_TRAIL> trailrenderer;
 
-#include "explosion.h"
-#include "lensflare.h"
-#include "lightning.h"
+#include "explosion.hh"
+#include "lensflare.hh"
+#include "lightning.hh"
 
 struct softquadrenderer : quadrenderer
 {
diff --git a/src/engine/rendersky.cc b/src/engine/rendersky.cc
index 72fc8e3..91b34ca 100644
--- a/src/engine/rendersky.cc
+++ b/src/engine/rendersky.cc
@@ -1,4 +1,4 @@
-#include "engine.h"
+#include "engine.hh"
 
 Texture *sky[6] = { 0, 0, 0, 0, 0, 0 }, *clouds[6] = { 0, 0, 0, 0, 0, 0 };
 
diff --git a/src/engine/rendertext.cc b/src/engine/rendertext.cc
index cfa45b5..0322f6e 100644
--- a/src/engine/rendertext.cc
+++ b/src/engine/rendertext.cc
@@ -1,4 +1,4 @@
-#include "engine.h"
+#include "engine.hh"
 
 static hashnameset<font> fonts;
 static font *fontdef = NULL;
diff --git a/src/engine/renderva.cc b/src/engine/renderva.cc
index 69acce8..a7a9aba 100644
--- a/src/engine/renderva.cc
+++ b/src/engine/renderva.cc
@@ -1,6 +1,6 @@
 // renderva.cpp: handles the occlusion and rendering of vertex arrays
 
-#include "engine.h"
+#include "engine.hh"
 
 static inline void drawtris(GLsizei numindices, const GLvoid *indices, ushort minvert, ushort maxvert)
 {
diff --git a/src/engine/server.cc b/src/engine/server.cc
index 4278a45..58c5f70 100644
--- a/src/engine/server.cc
+++ b/src/engine/server.cc
@@ -1,7 +1,7 @@
 // server.cpp: little more than enhanced multicaster
 // runs dedicated or as client coroutine
 
-#include "engine.h"
+#include "engine.hh"
 
 #define LOGSTRLEN 512
 
diff --git a/src/engine/serverbrowser.cc b/src/engine/serverbrowser.cc
index e3bf927..26b875b 100644
--- a/src/engine/serverbrowser.cc
+++ b/src/engine/serverbrowser.cc
@@ -1,4 +1,4 @@
-#include "engine.h"
+#include "engine.hh"
 
 struct resolverthread
 {
diff --git a/src/engine/shader.cc b/src/engine/shader.cc
index da6a416..1e36946 100644
--- a/src/engine/shader.cc
+++ b/src/engine/shader.cc
@@ -1,6 +1,6 @@
 // shader.cpp: OpenGL GLSL shader management
 
-#include "engine.h"
+#include "engine.hh"
 
 Shader *Shader::lastshader = NULL;
 
diff --git a/src/engine/skelmodel.h b/src/engine/skelmodel.hh
similarity index 100%
rename from src/engine/skelmodel.h
rename to src/engine/skelmodel.hh
diff --git a/src/engine/smd.h b/src/engine/smd.hh
similarity index 100%
rename from src/engine/smd.h
rename to src/engine/smd.hh
diff --git a/src/engine/stain.cc b/src/engine/stain.cc
index 930fbd7..2039b00 100644
--- a/src/engine/stain.cc
+++ b/src/engine/stain.cc
@@ -1,4 +1,4 @@
-#include "engine.h"
+#include "engine.hh"
 
 struct stainvert
 {
diff --git a/src/engine/textedit.h b/src/engine/textedit.hh
similarity index 100%
rename from src/engine/textedit.h
rename to src/engine/textedit.hh
diff --git a/src/engine/texture.cc b/src/engine/texture.cc
index 451907c..9cffa47 100644
--- a/src/engine/texture.cc
+++ b/src/engine/texture.cc
@@ -1,6 +1,6 @@
 // texture.cpp: texture slot management
 
-#include "engine.h"
+#include "engine.hh"
 
 #ifdef __APPLE__
   #include "SDL2_image/SDL_image.h"
diff --git a/src/engine/texture.h b/src/engine/texture.hh
similarity index 100%
rename from src/engine/texture.h
rename to src/engine/texture.hh
diff --git a/src/engine/ui.cc b/src/engine/ui.cc
index 8e3f18a..576aad5 100644
--- a/src/engine/ui.cc
+++ b/src/engine/ui.cc
@@ -1,5 +1,5 @@
-#include "engine.h"
-#include "textedit.h"
+#include "engine.hh"
+#include "textedit.hh"
 
 namespace UI
 {
diff --git a/src/engine/vertmodel.h b/src/engine/vertmodel.hh
similarity index 100%
rename from src/engine/vertmodel.h
rename to src/engine/vertmodel.hh
diff --git a/src/engine/water.cc b/src/engine/water.cc
index f71d1c1..c8946c9 100644
--- a/src/engine/water.cc
+++ b/src/engine/water.cc
@@ -1,4 +1,4 @@
-#include "engine.h"
+#include "engine.hh"
 
 #define NUMCAUSTICS 32
 
diff --git a/src/engine/world.cc b/src/engine/world.cc
index 557e3cf..eea3181 100644
--- a/src/engine/world.cc
+++ b/src/engine/world.cc
@@ -1,6 +1,6 @@
 // world.cpp: core map management stuff
 
-#include "engine.h"
+#include "engine.hh"
 
 VARR(mapversion, 1, MAPVERSION, 0);
 VARNR(mapscale, worldscale, 1, 0, 0);
diff --git a/src/engine/world.h b/src/engine/world.hh
similarity index 100%
rename from src/engine/world.h
rename to src/engine/world.hh
diff --git a/src/engine/worldio.cc b/src/engine/worldio.cc
index c3ea97a..de700eb 100644
--- a/src/engine/worldio.cc
+++ b/src/engine/worldio.cc
@@ -1,6 +1,6 @@
 // worldio.cpp: loading & saving of maps and savegames
 
-#include "engine.h"
+#include "engine.hh"
 
 void validmapname(char *dst, const char *src, const char *prefix = NULL, const char *alt = "untitled", size_t maxlen = 100)
 {
diff --git a/src/game/ai.cc b/src/game/ai.cc
index 8a36e75..8ea83bc 100644
--- a/src/game/ai.cc
+++ b/src/game/ai.cc
@@ -1,4 +1,4 @@
-#include "game.h"
+#include "game.hh"
 
 extern int fog;
 
diff --git a/src/game/ai.h b/src/game/ai.hh
similarity index 100%
rename from src/game/ai.h
rename to src/game/ai.hh
diff --git a/src/game/aiman.h b/src/game/aiman.hh
similarity index 100%
rename from src/game/aiman.h
rename to src/game/aiman.hh
diff --git a/src/game/client.cc b/src/game/client.cc
index dfd3bd3..8283c5c 100644
--- a/src/game/client.cc
+++ b/src/game/client.cc
@@ -1,4 +1,4 @@
-#include "game.h"
+#include "game.hh"
 
 namespace game
 {
@@ -122,7 +122,7 @@ namespace game
         if(dead) gle::end();
     }
 
-    #include "ctf.h"
+    #include "ctf.hh"
 
     clientmode *cmode = NULL;
     ctfclientmode ctfmode;
@@ -1938,7 +1938,7 @@ namespace game
             }
 
             #define PARSEMESSAGES 1
-            #include "ctf.h"
+            #include "ctf.hh"
             #undef PARSEMESSAGES
 
             case N_NEWMAP:
diff --git a/src/game/ctf.h b/src/game/ctf.hh
similarity index 100%
rename from src/game/ctf.h
rename to src/game/ctf.hh
diff --git a/src/game/entities.cc b/src/game/entities.cc
index 528be2d..dfbc0b6 100644
--- a/src/game/entities.cc
+++ b/src/game/entities.cc
@@ -1,4 +1,4 @@
-#include "game.h"
+#include "game.hh"
 
 namespace entities
 {
diff --git a/src/game/extinfo.h b/src/game/extinfo.hh
similarity index 100%
rename from src/game/extinfo.h
rename to src/game/extinfo.hh
diff --git a/src/game/game.cc b/src/game/game.cc
index 1f88aa1..05d3c9d 100644
--- a/src/game/game.cc
+++ b/src/game/game.cc
@@ -1,4 +1,4 @@
-#include "game.h"
+#include "game.hh"
 
 namespace game
 {
diff --git a/src/game/game.h b/src/game/game.hh
similarity index 99%
rename from src/game/game.h
rename to src/game/game.hh
index 0b4170d..bbd76d0 100644
--- a/src/game/game.h
+++ b/src/game/game.hh
@@ -1,7 +1,7 @@
 #ifndef __GAME_H__
 #define __GAME_H__
 
-#include "cube.h"
+#include "cube.hh"
 
 // animations
 
@@ -280,7 +280,7 @@ static const struct guninfo { const char *name, *file, *vwep; int attacks[NUMACT
     { "pulse rifle", "pulserifle", "worldgun/pulserifle", { -1, ATK_PULSE_SHOOT, ATK_PULSE_MELEE } }
 };
 
-#include "ai.h"
+#include "ai.hh"
 
 // inherited by gameent and server clients
 struct gamestate
diff --git a/src/game/render.cc b/src/game/render.cc
index 60ae138..fd6574a 100644
--- a/src/game/render.cc
+++ b/src/game/render.cc
@@ -1,4 +1,4 @@
-#include "game.h"
+#include "game.hh"
 
 namespace game
 {
diff --git a/src/game/scoreboard.cc b/src/game/scoreboard.cc
index 9a25633..eaf798f 100644
--- a/src/game/scoreboard.cc
+++ b/src/game/scoreboard.cc
@@ -1,5 +1,5 @@
 // creation of scoreboard
-#include "game.h"
+#include "game.hh"
 
 namespace game
 {
diff --git a/src/game/server.cc b/src/game/server.cc
index 2439922..e9e8f2b 100644
--- a/src/game/server.cc
+++ b/src/game/server.cc
@@ -1,4 +1,4 @@
-#include "game.h"
+#include "game.hh"
 
 namespace game
 {
@@ -839,7 +839,7 @@ namespace server
     };
 
     #define SERVMODE 1
-    #include "ctf.h"
+    #include "ctf.hh"
 
     ctfservmode ctfmode;
     servmode *smode = NULL;
@@ -3539,7 +3539,7 @@ namespace server
                 break;
 
             #define PARSEMESSAGES 1
-            #include "ctf.h"
+            #include "ctf.hh"
             #undef PARSEMESSAGES
 
             case -1:
@@ -3571,7 +3571,7 @@ namespace server
     int masterport() { return TESSERACT_MASTER_PORT; }
     int numchannels() { return 3; }
 
-    #include "extinfo.h"
+    #include "extinfo.hh"
 
     void serverinforeply(ucharbuf &req, ucharbuf &p)
     {
@@ -3600,6 +3600,6 @@ namespace server
 
     int protocolversion() { return PROTOCOL_VERSION; }
 
-    #include "aiman.h"
+    #include "aiman.hh"
 }
 
diff --git a/src/game/waypoint.cc b/src/game/waypoint.cc
index 933667c..8e98d40 100644
--- a/src/game/waypoint.cc
+++ b/src/game/waypoint.cc
@@ -1,4 +1,4 @@
-#include "game.h"
+#include "game.hh"
 
 extern selinfo sel;
 
diff --git a/src/game/weapon.cc b/src/game/weapon.cc
index e972363..e0a2658 100644
--- a/src/game/weapon.cc
+++ b/src/game/weapon.cc
@@ -1,5 +1,5 @@
 // weapon.cpp: all shooting and effects code, projectile management
-#include "game.h"
+#include "game.hh"
 
 namespace game
 {
diff --git a/src/shared/command.h b/src/shared/command.hh
similarity index 100%
rename from src/shared/command.h
rename to src/shared/command.hh
diff --git a/src/shared/crypto.cc b/src/shared/crypto.cc
index 552d606..f70768f 100644
--- a/src/shared/crypto.cc
+++ b/src/shared/crypto.cc
@@ -1,4 +1,4 @@
-#include "cube.h"
+#include "cube.hh"
 
 ///////////////////////// cryptography /////////////////////////////////
 
diff --git a/src/shared/cube.h b/src/shared/cube.hh
similarity index 85%
rename from src/shared/cube.h
rename to src/shared/cube.hh
index 8927a0a..40edd08 100644
--- a/src/shared/cube.h
+++ b/src/shared/cube.hh
@@ -53,18 +53,18 @@
 
 #include <zlib.h>
 
-#include "tools.h"
-#include "geom.h"
-#include "ents.h"
-#include "command.h"
+#include "tools.hh"
+#include "geom.hh"
+#include "ents.hh"
+#include "command.hh"
 
 #ifndef STANDALONE
-#include "glexts.h"
-#include "glemu.h"
+#include "glexts.hh"
+#include "glemu.hh"
 #endif
 
-#include "iengine.h"
-#include "igame.h"
+#include "iengine.hh"
+#include "igame.hh"
 
 #endif
 
diff --git a/src/shared/ents.h b/src/shared/ents.hh
similarity index 100%
rename from src/shared/ents.h
rename to src/shared/ents.hh
diff --git a/src/shared/geom.cc b/src/shared/geom.cc
index 3dc5ac1..04fb3f3 100644
--- a/src/shared/geom.cc
+++ b/src/shared/geom.cc
@@ -1,4 +1,4 @@
-#include "cube.h"
+#include "cube.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/geom.h b/src/shared/geom.hh
similarity index 100%
rename from src/shared/geom.h
rename to src/shared/geom.hh
diff --git a/src/shared/glemu.cc b/src/shared/glemu.cc
index e4c4ffa..4f153f2 100644
--- a/src/shared/glemu.cc
+++ b/src/shared/glemu.cc
@@ -1,4 +1,4 @@
-#include "cube.h"
+#include "cube.hh"
 
 extern int glversion;
 extern int intel_mapbufferrange_bug;
diff --git a/src/shared/glemu.h b/src/shared/glemu.hh
similarity index 100%
rename from src/shared/glemu.h
rename to src/shared/glemu.hh
diff --git a/src/shared/glexts.h b/src/shared/glexts.hh
similarity index 100%
rename from src/shared/glexts.h
rename to src/shared/glexts.hh
diff --git a/src/shared/iengine.h b/src/shared/iengine.hh
similarity index 100%
rename from src/shared/iengine.h
rename to src/shared/iengine.hh
diff --git a/src/shared/igame.h b/src/shared/igame.hh
similarity index 100%
rename from src/shared/igame.h
rename to src/shared/igame.hh
diff --git a/src/shared/stream.cc b/src/shared/stream.cc
index e8e4525..89fbc01 100644
--- a/src/shared/stream.cc
+++ b/src/shared/stream.cc
@@ -1,4 +1,4 @@
-#include "cube.h"
+#include "cube.hh"
 
 ///////////////////////// character conversion ///////////////
 
diff --git a/src/shared/tools.cc b/src/shared/tools.cc
index 5646894..e9c9f30 100644
--- a/src/shared/tools.cc
+++ b/src/shared/tools.cc
@@ -1,6 +1,6 @@
 // implementation of generic tools
 
-#include "cube.h"
+#include "cube.hh"
 
 void *operator new(size_t size)
 {
diff --git a/src/shared/tools.h b/src/shared/tools.hh
similarity index 100%
rename from src/shared/tools.h
rename to src/shared/tools.hh
diff --git a/src/shared/zip.cc b/src/shared/zip.cc
index c859909..7317e54 100644
--- a/src/shared/zip.cc
+++ b/src/shared/zip.cc
@@ -1,4 +1,4 @@
-#include "cube.h"
+#include "cube.hh"
 
 enum
 {