diff --git a/reactos/subsystems/win32/win32k/include/clipboard.h b/reactos/subsystems/win32/win32k/include/clipboard.h
index 3f901148817..274f9b4d1e9 100644
--- a/reactos/subsystems/win32/win32k/include/clipboard.h
+++ b/reactos/subsystems/win32/win32k/include/clipboard.h
@@ -40,6 +40,9 @@ typedef struct _CLIPBOARDSYSTEM
     
 } CLIPBOARDSYSTEM, *PCLIPBOARDSYSTEM;
 
+VOID FASTCALL 
+IntClipboardFreeWindow(PWINDOW_OBJECT window);
+
 /*
 UINT FASTCALL
 IntEnumClipboardFormats(UINT format);
diff --git a/reactos/subsystems/win32/win32k/ntuser/clipboard.c b/reactos/subsystems/win32/win32k/ntuser/clipboard.c
index cfc08cbbefe..b0a9f3e8718 100644
--- a/reactos/subsystems/win32/win32k/ntuser/clipboard.c
+++ b/reactos/subsystems/win32/win32k/ntuser/clipboard.c
@@ -1202,17 +1202,6 @@ NtUserGetClipboardSequenceNumber(VOID)
     return sn;
 }
 
-BOOL FASTCALL
-IntSetupClipboard(PWINSTATION_OBJECT WinStaObj)
-{
-    WinStaObj->Clipboard = ExAllocatePool(PagedPool, sizeof(CLIPBOARDSYSTEM));
-    if (WinStaObj->Clipboard)
-    {
-        RtlZeroMemory(WinStaObj->Clipboard, sizeof(CLIPBOARDSYSTEM));
-        return TRUE;
-    }
-    return FALSE;
-}
 
 /**************** VISTA FUNCTIONS******************/
 
diff --git a/reactos/subsystems/win32/win32k/ntuser/winsta.c b/reactos/subsystems/win32/win32k/ntuser/winsta.c
index bbaf1b801ed..7a30356307a 100644
--- a/reactos/subsystems/win32/win32k/ntuser/winsta.c
+++ b/reactos/subsystems/win32/win32k/ntuser/winsta.c
@@ -55,6 +55,7 @@ static GENERIC_MAPPING IntWindowStationMapping =
       WINSTA_READATTRIBUTES    | WINSTA_READSCREEN        | WINSTA_WRITEATTRIBUTES
    };
 
+
 NTSTATUS FASTCALL
 InitWindowStationImpl(VOID)
 {
@@ -92,6 +93,18 @@ CleanupWindowStationImpl(VOID)
    return STATUS_SUCCESS;
 }
 
+BOOL FASTCALL
+IntSetupClipboard(PWINSTATION_OBJECT WinStaObj)
+{
+    WinStaObj->Clipboard = ExAllocatePool(PagedPool, sizeof(CLIPBOARDSYSTEM));
+    if (WinStaObj->Clipboard)
+    {
+        RtlZeroMemory(WinStaObj->Clipboard, sizeof(CLIPBOARDSYSTEM));
+        return TRUE;
+    }
+    return FALSE;
+}
+
 /* OBJECT CALLBACKS  **********************************************************/
 
 VOID STDCALL