diff --git a/reactos/subsys/win32k/include/prop.h b/reactos/subsys/win32k/include/prop.h
index c3af2a738ff..a1f9ea9fafd 100644
--- a/reactos/subsys/win32k/include/prop.h
+++ b/reactos/subsys/win32k/include/prop.h
@@ -1,11 +1,6 @@
 #ifndef _WIN32K_PROP_H
 #define _WIN32K_PROP_H
 
-BOOL FASTCALL
-W32kSetProp(struct _WINDOW_OBJECT* Wnd, ATOM Atom, HANDLE Data);
-
-struct _PROPERTY* FASTCALL
-W32kGetProp(struct _WINDOW_OBJECT* WindowObject, ATOM Atom);
 
 
 #endif /* _WIN32K_PROP_H */
diff --git a/reactos/subsys/win32k/include/window.h b/reactos/subsys/win32k/include/window.h
index ede2c4c0589..10bd778386b 100644
--- a/reactos/subsys/win32k/include/window.h
+++ b/reactos/subsys/win32k/include/window.h
@@ -98,27 +98,59 @@ typedef struct _WINDOW_OBJECT
 #define WINDOWOBJECT_NEED_INTERNALPAINT   (0x00000010)
 #define WINDOWOBJECT_RESTOREMAX           (0x00000020)
 
-NTSTATUS FASTCALL InitWindowImpl (VOID);
-NTSTATUS FASTCALL CleanupWindowImpl (VOID);
-VOID     FASTCALL W32kGetClientRect (PWINDOW_OBJECT WindowObject, PRECT Rect);
-PWINDOW_OBJECT FASTCALL W32kGetWindowObject (HWND hWnd);
-VOID     FASTCALL W32kReleaseWindowObject (PWINDOW_OBJECT Window);
-HWND     STDCALL  W32kCreateDesktopWindow (PWINSTATION_OBJECT WindowStation,
+NTSTATUS FASTCALL
+InitWindowImpl (VOID);
+
+NTSTATUS FASTCALL
+CleanupWindowImpl (VOID);
+
+VOID FASTCALL
+W32kGetClientRect (PWINDOW_OBJECT WindowObject, PRECT Rect);
+
+PWINDOW_OBJECT FASTCALL
+W32kGetWindowObject (HWND hWnd);
+
+VOID FASTCALL
+W32kReleaseWindowObject (PWINDOW_OBJECT Window);
+
+HWND STDCALL
+W32kCreateDesktopWindow (PWINSTATION_OBJECT WindowStation,
 			PWNDCLASS_OBJECT DesktopClass,
 			ULONG Width, ULONG Height);
-BOOL     FASTCALL W32kIsDesktopWindow (PWINDOW_OBJECT Window);
-HWND     FASTCALL W32kGetActiveWindow (VOID);
-BOOL     FASTCALL W32kIsWindowVisible (HWND Wnd);
-BOOL     FASTCALL W32kIsChildWindow (HWND Parent, HWND Child);
-HWND     FASTCALL W32kGetDesktopWindow (VOID);
-HWND     FASTCALL W32kGetFocusWindow (VOID);
-HWND     FASTCALL W32kSetFocusWindow (HWND hWnd);
+
+BOOL FASTCALL
+W32kIsDesktopWindow (PWINDOW_OBJECT Window);
+
+HWND FASTCALL
+W32kGetActiveWindow (VOID);
+
+BOOL FASTCALL
+W32kIsWindowVisible (HWND Wnd);
+
+BOOL FASTCALL
+W32kIsChildWindow (HWND Parent, HWND Child);
+
+HWND FASTCALL
+W32kGetDesktopWindow (VOID);
+
+HWND FASTCALL
+W32kGetFocusWindow (VOID);
+
+HWND FASTCALL
+W32kSetFocusWindow (HWND hWnd);
+
+BOOL FASTCALL
+W32kSetProp(PWINDOW_OBJECT Wnd, ATOM Atom, HANDLE Data);
+
+PPROPERTY FASTCALL
+W32kGetProp(PWINDOW_OBJECT WindowObject, ATOM Atom);
 
 DWORD FASTCALL
 W32kGetWindowThreadProcessId(PWINDOW_OBJECT Wnd, PDWORD pid);
 
 ULONG
 UserHasDlgFrameStyle(ULONG Style, ULONG ExStyle);
+
 ULONG
 UserHasThickFrameStyle(ULONG Style, ULONG ExStyle);