diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ad4cfdf86..28f976331 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -806,7 +806,6 @@ set( FASTMATH_SOURCES
 	sound/sndfile_decoder.cpp
 	sound/timiditypp/fft4g.cpp
 	sound/timiditypp/reverb.cpp
-	gl/utility/gl_clock.cpp
 	textures/hires/hqnx/init.cpp
 	textures/hires/hqnx/hq2x.cpp
 	textures/hires/hqnx/hq3x.cpp
@@ -1059,6 +1058,7 @@ set (PCH_SOURCES
 	hwrenderer/dynlights/hw_aabbtree.cpp
 	hwrenderer/textures/hw_material.cpp
 	hwrenderer/textures/hw_precache.cpp
+	hwrenderer/utility/hw_clock.cpp
 	
 	menu/joystickmenu.cpp
 	menu/loadsavemenu.cpp
diff --git a/src/gl/data/gl_vertexbuffer.h b/src/gl/data/gl_vertexbuffer.h
index fc77c683f..321714ad9 100644
--- a/src/gl/data/gl_vertexbuffer.h
+++ b/src/gl/data/gl_vertexbuffer.h
@@ -24,7 +24,7 @@
 #define __VERTEXBUFFER_H
 
 #include "tarray.h"
-#include "gl/utility/gl_clock.h"
+#include "hwrenderer/utility/hw_clock.h"
 #include "gl/system/gl_interface.h"
 #include "r_data/models/models.h"
 #include "hwrenderer/data/flatvertices.h"
diff --git a/src/gl/dynlights/gl_lightbuffer.cpp b/src/gl/dynlights/gl_lightbuffer.cpp
index b9a477a03..bb490baec 100644
--- a/src/gl/dynlights/gl_lightbuffer.cpp
+++ b/src/gl/dynlights/gl_lightbuffer.cpp
@@ -28,7 +28,7 @@
 #include "gl/system/gl_system.h"
 #include "gl/shaders/gl_shader.h"
 #include "gl/dynlights/gl_lightbuffer.h"
-#include "gl/utility//gl_clock.h"
+#include "hwrenderer/utility/hw_clock.h"
 #include "hwrenderer/dynlights/hw_dynlightdata.h"
 
 static const int INITIAL_BUFFER_SIZE = 160000;	// This means 80000 lights per frame and 160000*16 bytes == 2.56 MB.
diff --git a/src/gl/scene/gl_walls.cpp b/src/gl/scene/gl_walls.cpp
index c7cbd8808..03b076543 100644
--- a/src/gl/scene/gl_walls.cpp
+++ b/src/gl/scene/gl_walls.cpp
@@ -39,7 +39,7 @@
 #include "gl/scene/gl_drawinfo.h"
 #include "gl/scene/gl_portal.h"
 
-#include "gl/utility/gl_clock.h"
+#include "hwrenderer/utility/hw_clock.h"
 
 
 void FDrawInfo::AddWall(GLWall *wall)
diff --git a/src/gl/system/gl_framebuffer.cpp b/src/gl/system/gl_framebuffer.cpp
index 857b6fa48..dec0861da 100644
--- a/src/gl/system/gl_framebuffer.cpp
+++ b/src/gl/system/gl_framebuffer.cpp
@@ -36,7 +36,7 @@
 #include "gl/renderer/gl_renderer.h"
 #include "gl/renderer/gl_renderbuffers.h"
 #include "gl/textures/gl_samplers.h"
-#include "gl/utility/gl_clock.h"
+#include "hwrenderer/utility/hw_clock.h"
 #include "gl/data/gl_vertexbuffer.h"
 #include "gl/models/gl_models.h"
 #include "gl_debug.h"
diff --git a/src/hwrenderer/scene/hw_renderhacks.cpp b/src/hwrenderer/scene/hw_renderhacks.cpp
index 3d25d2158..3b3670069 100644
--- a/src/hwrenderer/scene/hw_renderhacks.cpp
+++ b/src/hwrenderer/scene/hw_renderhacks.cpp
@@ -31,7 +31,7 @@
 #include "g_levellocals.h"
 
 #include "hwrenderer/scene/hw_drawinfo.h"
-#include "gl/utility/gl_clock.h"
+#include "hwrenderer/utility/hw_clock.h"
 
 sector_t * hw_FakeFlat(sector_t * sec, sector_t * dest, area_t in_area, bool back);
 
diff --git a/src/gl/utility/gl_clock.cpp b/src/hwrenderer/utility/hw_clock.cpp
similarity index 98%
rename from src/gl/utility/gl_clock.cpp
rename to src/hwrenderer/utility/hw_clock.cpp
index 30e75a21f..e015bae82 100644
--- a/src/gl/utility/gl_clock.cpp
+++ b/src/hwrenderer/utility/hw_clock.cpp
@@ -3,8 +3,7 @@
 **  Hardware render profiling info
 **
 **---------------------------------------------------------------------------
-** Copyright 1998-2016 Randy Heit
-** Copyright 2007-2016 Christoph Oelckers
+** Copyright 2007-2018 Christoph Oelckers
 ** All rights reserved.
 **
 ** Redistribution and use in source and binary forms, with or without
@@ -40,7 +39,7 @@
 #include "r_utility.h"
 #include "v_video.h"
 #include "g_levellocals.h"
-#include "gl/utility/gl_clock.h"
+#include "hw_clock.h"
 #include "i_time.h"
 
 glcycle_t RenderWall,SetupWall,ClipWall;
diff --git a/src/gl/utility/gl_clock.h b/src/hwrenderer/utility/hw_clock.h
similarity index 100%
rename from src/gl/utility/gl_clock.h
rename to src/hwrenderer/utility/hw_clock.h