diff --git a/reactos/subsys/win32k/include/userfuncs.h b/reactos/subsys/win32k/include/userfuncs.h
index 270f0a69f23..1c3e12ed455 100644
--- a/reactos/subsys/win32k/include/userfuncs.h
+++ b/reactos/subsys/win32k/include/userfuncs.h
@@ -74,6 +74,8 @@ BOOL FASTCALL UserValidateRgn(HWND hWnd, HRGN hRgn);
/*************** WINDOW.C ***************/
+PWINDOW_OBJECT FASTCALL UserGetWindowObjectNoRef(HWND hWnd);
+
VOID FASTCALL
co_DestroyThreadWindows(struct _ETHREAD *Thread);
diff --git a/reactos/subsys/win32k/misc/object.c b/reactos/subsys/win32k/ntuser/object.c
similarity index 100%
rename from reactos/subsys/win32k/misc/object.c
rename to reactos/subsys/win32k/ntuser/object.c
diff --git a/reactos/subsys/win32k/misc/ssec.c b/reactos/subsys/win32k/ntuser/ssec.c
similarity index 100%
rename from reactos/subsys/win32k/misc/ssec.c
rename to reactos/subsys/win32k/ntuser/ssec.c
diff --git a/reactos/subsys/win32k/ntuser/window.c b/reactos/subsys/win32k/ntuser/window.c
index cafc7ea7ffa..04f18832dc2 100644
--- a/reactos/subsys/win32k/ntuser/window.c
+++ b/reactos/subsys/win32k/ntuser/window.c
@@ -75,6 +75,18 @@ CleanupWindowImpl(VOID)
/* HELPER FUNCTIONS ***********************************************************/
+
+
+/* temp hack */
+PWINDOW_OBJECT FASTCALL UserGetWindowObjectNoRef(HWND hWnd)
+{
+
+ PWINDOW_OBJECT w = IntGetWindowObject(hWnd);
+ if (w) IntReleaseWindowObject(w);
+ return w;
+}
+
+
/*
* IntIsWindow
*
diff --git a/reactos/subsys/win32k/win32k.xml b/reactos/subsys/win32k/win32k.xml
index b340c517302..7a5c66ad5bb 100644
--- a/reactos/subsys/win32k/win32k.xml
+++ b/reactos/subsys/win32k/win32k.xml
@@ -58,8 +58,6 @@
driver.c
error.c
math.c
- object.c
- ssec.c
copy.c
@@ -99,6 +97,8 @@
window.c
winpos.c
winsta.c
+ object.c
+ ssec.c
bezier.c