diff --git a/reactos/win32ss/CMakeLists.txt b/reactos/win32ss/CMakeLists.txt
index 67962bfb05b..eb53a470e96 100644
--- a/reactos/win32ss/CMakeLists.txt
+++ b/reactos/win32ss/CMakeLists.txt
@@ -70,6 +70,7 @@ list(APPEND SOURCE
     gdi/eng/lineto.c
     gdi/eng/ldevobj.c
     gdi/eng/mapping.c
+    gdi/eng/math.c
     gdi/eng/mem.c
     gdi/eng/engmisc.c
     gdi/eng/mouse.c
@@ -87,11 +88,9 @@ list(APPEND SOURCE
     gdi/eng/xlateobj.c
     user/ntuser/main.c
     user/ntuser/misc/file.c
-    user/ntuser/misc/math.c
     user/ntuser/misc/rtlstr.c
     user/ntuser/misc/copy.c
     user/ntuser/misc/registry.c
-    user/ntuser/misc/usrheap.c
     reactx/ntddraw/ddraw.c
     reactx/ntddraw/dd.c
     reactx/ntddraw/ddsurf.c
@@ -135,6 +134,7 @@ list(APPEND SOURCE
     user/ntuser/sysparams.c
     user/ntuser/timer.c
     user/ntuser/useratom.c
+    user/ntuser/usrheap.c
     user/ntuser/vis.c
     user/ntuser/windc.c
     user/ntuser/window.c
diff --git a/reactos/win32ss/user/ntuser/misc/math.c b/reactos/win32ss/gdi/eng/math.c
similarity index 100%
rename from reactos/win32ss/user/ntuser/misc/math.c
rename to reactos/win32ss/gdi/eng/math.c
diff --git a/reactos/win32ss/user/ntuser/misc/driver.c b/reactos/win32ss/user/ntuser/misc/driver.c
deleted file mode 100644
index 8b137891791..00000000000
--- a/reactos/win32ss/user/ntuser/misc/driver.c
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/reactos/win32ss/user/ntuser/misc/usrheap.c b/reactos/win32ss/user/ntuser/usrheap.c
similarity index 100%
rename from reactos/win32ss/user/ntuser/misc/usrheap.c
rename to reactos/win32ss/user/ntuser/usrheap.c