diff --git a/code/nel/src/3d/CMakeLists.txt b/code/nel/src/3d/CMakeLists.txt
index 2305719d8..6fccb4c17 100644
--- a/code/nel/src/3d/CMakeLists.txt
+++ b/code/nel/src/3d/CMakeLists.txt
@@ -144,10 +144,10 @@ SOURCE_GROUP(Driver FILES
         ../../include/nel/3d/light.h
         material.cpp
         ../../include/nel/3d/material.h
-		dynamic_material.cpp
-		../../include/nel/3d/dynamic_material.h
-		dyn_mat_loader.cpp
-		../../include/nel/3d/dyb_mat_loader.h
+	dynamic_material.cpp
+	../../include/nel/3d/dynamic_material.h
+	dyn_mat_loader.cpp
+	../../include/nel/3d/dyb_mat_loader.h
         nelu.cpp
         ../../include/nel/3d/nelu.h
         ../../include/nel/3d/occlusion_query.h
@@ -159,19 +159,17 @@ SOURCE_GROUP(Driver FILES
         ../../include/nel/3d/scene_group.h
         shader.cpp
         ../../include/nel/3d/shader.h
-		shader_loader.cpp
-		../../include/nel/3d/shader_loader.h
-		shader_manager.cpp
-		../../include/nel/3d/shader_manager.h
-		shader_program.cpp
-		../../include/nel/3d/shader_program.h
-		shader_saver.cpp
-		../../include/nel/3d/shader_saver.h
-		../../include/nel/3d/shader_visitor.h
+	shader_loader.cpp
+	../../include/nel/3d/shader_loader.h
+	shader_manager.cpp
+	../../include/nel/3d/shader_manager.h
+	shader_program.cpp
+	../../include/nel/3d/shader_program.h
+	shader_saver.cpp
+	../../include/nel/3d/shader_saver.h
+	../../include/nel/3d/shader_visitor.h
         texture.cpp
         ../../include/nel/3d/texture.h
-		unix_event_emitter.cpp
-		../../include/nel/3d/unix_event_emitter.h
         vertex_buffer.cpp
         ../../include/nel/3d/vertex_buffer.h
         vertex_buffer_heap.cpp
diff --git a/code/nel/src/3d/driver/opengl/driver_opengl.h b/code/nel/src/3d/driver/opengl/driver_opengl.h
index 7e49d5003..bfe73492d 100644
--- a/code/nel/src/3d/driver/opengl/driver_opengl.h
+++ b/code/nel/src/3d/driver/opengl/driver_opengl.h
@@ -68,7 +68,7 @@
 #elif defined(NL_OS_MAC)
 #include "mac/cocoa_event_emitter.h"
 #elif defined (NL_OS_UNIX)
-#include "nel/3d/unix_event_emitter.h"
+#include "unix_event_emitter.h"
 #endif // NL_OS_UNIX
 
 
diff --git a/code/nel/src/3d/unix_event_emitter.cpp b/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
similarity index 99%
rename from code/nel/src/3d/unix_event_emitter.cpp
rename to code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
index d8729e032..475b58d57 100644
--- a/code/nel/src/3d/unix_event_emitter.cpp
+++ b/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
@@ -15,7 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 //#include "stdopengl.h"
-#include "nel/3d/unix_event_emitter.h"
+#include "unix_event_emitter.h"
 
 #if defined(NL_OS_UNIX) && !defined(NL_OS_MAC)
 
diff --git a/code/nel/include/nel/3d/unix_event_emitter.h b/code/nel/src/3d/driver/opengl/unix_event_emitter.h
similarity index 100%
rename from code/nel/include/nel/3d/unix_event_emitter.h
rename to code/nel/src/3d/driver/opengl/unix_event_emitter.h