8 files changed, 6 insertions, 6 deletions
diff --git a/src/shared/lua_api/common.c b/src/shared/lua_api/common.cpp
index 2eeee11..68bf203 100644
--- a/src/shared/lua_api/common.c
+++ b/src/shared/lua_api/common.cpp
@@ -5,7 +5,7 @@ extern "C" {
   #include <lualib.h>
 }
 
-#include "common.h"
+#include "common.hpp"
 
 //Expose things to the lua state
 void loadLLibs(lua_State* L){
diff --git a/src/shared/lua_api/common.h b/src/shared/lua_api/common.hpp
index 6086065..6086065 100644
--- a/src/shared/lua_api/common.h
+++ b/src/shared/lua_api/common.hpp
diff --git a/src/shared/lua_api/load_net.cpp b/src/shared/lua_api/load_net.cpp
index 5280d42..740d997 100644
--- a/src/shared/lua_api/load_net.cpp
+++ b/src/shared/lua_api/load_net.cpp
@@ -20,7 +20,7 @@ extern "C" {
 
 #include "load_net.hpp"
 
-#include "../util/hashmap.h"
+#include <shared/util/hashmap.hpp>
 #include "stream.hpp"
 
 std::map<int,std::map<std::string,int>> netfuncs;
diff --git a/src/shared/lua_api/phys/bphysbox.cpp b/src/shared/lua_api/phys/bphysbox.cpp
index 0fe9f72..728b6d1 100644
--- a/src/shared/lua_api/phys/bphysbox.cpp
+++ b/src/shared/lua_api/phys/bphysbox.cpp
@@ -9,7 +9,7 @@ extern "C" {
 }
 #include <btBulletDynamicsCommon.h>
 #include "bphysbox.hpp"
-#include "../common.h"
+#include <shared/lua_api/common.hpp>
 
 extern btDiscreteDynamicsWorld* World;
 extern std::list<btRigidBody*> Objects;
diff --git a/src/shared/lua_api/phys/bphysbox.hpp b/src/shared/lua_api/phys/bphysbox.hpp
index 96b58a7..1471381 100644
--- a/src/shared/lua_api/phys/bphysbox.hpp
+++ b/src/shared/lua_api/phys/bphysbox.hpp
@@ -8,7 +8,6 @@ extern "C" {
   #include <lualib.h>
 }
 #include <irrlicht.h>
-#include "../common.h"
 
 void bphysbox_register(lua_State* L);
 void makenewbphysbox(lua_State* L);
diff --git a/src/shared/phys/physcommon.hpp b/src/shared/phys/physcommon.hpp
index e4660ab..00061ec 100644
--- a/src/shared/phys/physcommon.hpp
+++ b/src/shared/phys/physcommon.hpp
@@ -1,4 +1,5 @@
-
+#ifndef _shared_physcommon_
 void gameloop_phys(void(*f)(btRigidBody*));
 void phys_genesis();
 void phys_shutdown(void(*f)(btRigidBody*));
+#endif
diff --git a/src/shared/util/hashmap.c b/src/shared/util/hashmap.cpp
index f91e743..9d7ac71 100644
--- a/src/shared/util/hashmap.c
+++ b/src/shared/util/hashmap.cpp
@@ -1,7 +1,7 @@
 /*
  * Generic map implementation.
  */
-#include "hashmap.h"
+#include "hashmap.hpp"
 
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/src/shared/util/hashmap.h b/src/shared/util/hashmap.hpp
index 16c76dd..16c76dd 100644
--- a/src/shared/util/hashmap.h
+++ b/src/shared/util/hashmap.hpp