diff --git a/code/nel/src/3d/driver/opengl/unix_event_emitter.h b/code/nel/include/nel/3d/unix_event_emitter.h
similarity index 100%
rename from code/nel/src/3d/driver/opengl/unix_event_emitter.h
rename to code/nel/include/nel/3d/unix_event_emitter.h
diff --git a/code/nel/src/3d/CMakeLists.txt b/code/nel/src/3d/CMakeLists.txt
index 46f4027a8..2305719d8 100644
--- a/code/nel/src/3d/CMakeLists.txt
+++ b/code/nel/src/3d/CMakeLists.txt
@@ -170,6 +170,8 @@ SOURCE_GROUP(Driver FILES
 		../../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 bfe73492d..7e49d5003 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 "unix_event_emitter.h"
+#include "nel/3d/unix_event_emitter.h"
 #endif // NL_OS_UNIX
 
 
diff --git a/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp b/code/nel/src/3d/unix_event_emitter.cpp
similarity index 99%
rename from code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
rename to code/nel/src/3d/unix_event_emitter.cpp
index c59167183..d8729e032 100644
--- a/code/nel/src/3d/driver/opengl/unix_event_emitter.cpp
+++ b/code/nel/src/3d/unix_event_emitter.cpp
@@ -14,8 +14,8 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-#include "stdopengl.h"
-#include "unix_event_emitter.h"
+//#include "stdopengl.h"
+#include "nel/3d/unix_event_emitter.h"
 
 #if defined(NL_OS_UNIX) && !defined(NL_OS_MAC)