diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 015ff635c2..96fac86bca 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -11,9 +11,9 @@
 #include <SDL.h>
 
 #include <components/debug/debuglog.hpp>
+#include <components/debug/gldebug.hpp>
 
 #include <components/misc/rng.hpp>
-#include <components/misc/gldebug.hpp>
 
 #include <components/vfs/manager.hpp>
 #include <components/vfs/registerarchives.hpp>
@@ -427,7 +427,7 @@ void OMW::Engine::createWindow(Settings::Manager& settings)
     camera->setGraphicsContext(graphicsWindow);
     camera->setViewport(0, 0, width, height);
 
-    mViewer->setRealizeOperation(new EnableGLDebugOperation());
+    mViewer->setRealizeOperation(new Debug::EnableGLDebugOperation());
 
     mViewer->realize();
 
diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index ec0e511ca6..d57a61f46c 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -86,11 +86,11 @@ add_component_dir (esmterrain
     )
 
 add_component_dir (misc
-    constants utf8stream stringops resourcehelpers rng messageformatparser weakcache gldebug
+    constants utf8stream stringops resourcehelpers rng messageformatparser weakcache
     )
 
 add_component_dir (debug
-    debugging debuglog
+    debugging debuglog gldebug
     )
 
 IF(NOT WIN32 AND NOT APPLE)
diff --git a/components/debug/gldebug.hpp b/components/debug/gldebug.hpp
index 2401a53a44..77d6c82a85 100644
--- a/components/debug/gldebug.hpp
+++ b/components/debug/gldebug.hpp
@@ -1,16 +1,19 @@
-#ifndef OPENMW_COMPONENTS_MISC_GLDEBUG_H
-#define OPENMW_COMPONENTS_MISC_GLDEBUG_H
+#ifndef OPENMW_COMPONENTS_DEBUG_GLDEBUG_H
+#define OPENMW_COMPONENTS_DEBUG_GLDEBUG_H
 
 #include <osgViewer/ViewerEventHandlers>
 
-class EnableGLDebugOperation : public osg::GraphicsOperation
+namespace Debug
 {
-public:
-    EnableGLDebugOperation();
+    class EnableGLDebugOperation : public osg::GraphicsOperation
+    {
+    public:
+        EnableGLDebugOperation();
 
-    virtual void operator()(osg::GraphicsContext* graphicsContext);
+        virtual void operator()(osg::GraphicsContext* graphicsContext);
 
-private:
-    OpenThreads::Mutex mMutex;
-};
+    private:
+        OpenThreads::Mutex mMutex;
+    };
+}
 #endif