diff --git a/Source/Core/InputCommon/Src/InputCommon.cpp b/Source/Core/InputCommon/Src/InputCommon.cpp
new file mode 100644
index 0000000000..f34ccbb588
--- /dev/null
+++ b/Source/Core/InputCommon/Src/InputCommon.cpp
@@ -0,0 +1,17 @@
+#include "EventHandler.h"
+
+EventHandler *eventHandler = NULL;
+
+namespace InputCommon {
+    void Init() {
+#if defined GLTEST && GLTEST
+	// init the event handler
+	eventHandler = new EventHandler();
+#endif
+    }
+
+    void Shutdown() {
+	if (eventHandler)
+	    delete eventHandler;
+    }
+}
diff --git a/Source/Core/InputCommon/Src/InputCommon.h b/Source/Core/InputCommon/Src/InputCommon.h
new file mode 100644
index 0000000000..6128e8cf5d
--- /dev/null
+++ b/Source/Core/InputCommon/Src/InputCommon.h
@@ -0,0 +1,8 @@
+#include "EventHandler.h"
+
+extern EventHandler *eventHandler;
+
+namespace InputCommon {
+    void Init(); 
+    void Shutdown();
+}