diff --git a/src/ide/vc9/supertuxkart.vcproj b/src/ide/vc9/supertuxkart.vcproj
index d24c5f264..653a41d6e 100644
--- a/src/ide/vc9/supertuxkart.vcproj
+++ b/src/ide/vc9/supertuxkart.vcproj
@@ -763,10 +763,6 @@
 				RelativePath="../../../src\user_config.hpp"
 				>
 			</File>
-			<File
-				RelativePath="..\..\user_pointer.hpp"
-				>
-			</File>
 			<File
 				RelativePath="..\..\vec3.hpp"
 				>
@@ -1118,6 +1114,10 @@
 					RelativePath="..\..\physics\triangle_mesh.hpp"
 					>
 				</File>
+				<File
+					RelativePath="..\..\physics\user_pointer.hpp"
+					>
+				</File>
 			</Filter>
 			<Filter
 				Name="karts"
diff --git a/src/karts/moveable.hpp b/src/karts/moveable.hpp
index 5b4f271d6..026102296 100644
--- a/src/karts/moveable.hpp
+++ b/src/karts/moveable.hpp
@@ -25,8 +25,8 @@
 using namespace irr;
 #include "btBulletDynamicsCommon.h"
 
-#include "user_pointer.hpp"
 #include "physics/kart_motion_state.hpp"
+#include "physics/user_pointer.hpp"
 #include "utils/vec3.hpp"
 
 class Material;
diff --git a/src/physics/physical_object.hpp b/src/physics/physical_object.hpp
index 5bbe42dab..898799c88 100644
--- a/src/physics/physical_object.hpp
+++ b/src/physics/physical_object.hpp
@@ -25,7 +25,7 @@
 using namespace irr;
 
 #include "btBulletDynamicsCommon.h"
-#include "user_pointer.hpp"
+#include "physics/user_pointer.hpp"
 
 class Vec3;
 class scene::IAnimatedMesh;
diff --git a/src/physics/physics.hpp b/src/physics/physics.hpp
index 43249f0b4..c71f15cff 100644
--- a/src/physics/physics.hpp
+++ b/src/physics/physics.hpp
@@ -27,7 +27,7 @@
 #include "bullet/Demos/OpenGL/GLDebugDrawer.h"
 #include "bullet/Demos/OpenGL/GL_ShapeDrawer.h"
 
-#include "user_pointer.hpp"
+#include "physics/user_pointer.hpp"
 
 class Vec3;
 class Kart;
diff --git a/src/physics/triangle_mesh.hpp b/src/physics/triangle_mesh.hpp
index a2c2b833f..da4e41ce4 100644
--- a/src/physics/triangle_mesh.hpp
+++ b/src/physics/triangle_mesh.hpp
@@ -21,9 +21,10 @@
 #define HEADER_TRIANGLE_MESH_HPP
 
 #include <vector>
-#include "user_pointer.hpp"
 #include "btBulletDynamicsCommon.h"
 
+#include "physics/user_pointer.hpp"
+
 class Material;
 
 /** A special class to store a triangle mesh with a separate material
diff --git a/src/user_pointer.hpp b/src/physics/user_pointer.hpp
similarity index 100%
rename from src/user_pointer.hpp
rename to src/physics/user_pointer.hpp