diff --git a/dll/ntdll/include/ntdll.h b/dll/ntdll/include/ntdll.h
index d76e6f68da3..212f7005631 100644
--- a/dll/ntdll/include/ntdll.h
+++ b/dll/ntdll/include/ntdll.h
@@ -41,7 +41,8 @@
 /* Internal NTDLL */
 #include "ntdllp.h"
 
-/* CSRSS Header */
+/* CSRSS Headers */
+#include <csr/csrsrv.h>
 #include <csr/csr.h>
 
 /* PSEH */
diff --git a/include/reactos/subsys/csr/csrmsg.h b/include/reactos/subsys/csr/csrmsg.h
index a870b2d2361..c6d129b6a72 100644
--- a/include/reactos/subsys/csr/csrmsg.h
+++ b/include/reactos/subsys/csr/csrmsg.h
@@ -97,9 +97,6 @@ typedef struct _CSR_CAPTURE_BUFFER
     ULONG_PTR PointerArray[1];
 } CSR_CAPTURE_BUFFER, *PCSR_CAPTURE_BUFFER;
 
-
-#include "csrss.h" // remove it when the data structures are not used anymore.
-
 /* Keep in sync with definition below. */
 // #define CSRSS_HEADER_SIZE (sizeof(PORT_MESSAGE) + sizeof(ULONG) + sizeof(NTSTATUS))
 
@@ -118,17 +115,8 @@ typedef struct _CSR_API_MESSAGE
             union
             {
                 CSR_CLIENT_CONNECT CsrClientConnect;
-
                 CSR_SET_PRIORITY_CLASS SetPriorityClass;
                 CSR_IDENTIFY_ALTERTABLE_THREAD IdentifyAlertableThread;
-
-            /*** win32csr thingies to remove. ***/
-#if 1
-                CSRSS_CREATE_DESKTOP CreateDesktopRequest;
-                CSRSS_SHOW_DESKTOP ShowDesktopRequest;
-                CSRSS_HIDE_DESKTOP HideDesktopRequest;
-#endif
-            /************************************/
             } Data;
         };
     };
diff --git a/include/reactos/subsys/csr/csrsrv.h b/include/reactos/subsys/csr/csrsrv.h
index e485ce8d2f2..22c1941dbc2 100644
--- a/include/reactos/subsys/csr/csrsrv.h
+++ b/include/reactos/subsys/csr/csrsrv.h
@@ -23,6 +23,9 @@
 
 /* TYPES **********************************************************************/
 
+// Used in ntdll/csr/connect.c
+#define CSR_CSRSS_SECTION_SIZE    (65536)
+
 typedef struct _CSR_NT_SESSION
 {
     ULONG ReferenceCount;
diff --git a/include/reactos/subsys/csr/csrss.h b/include/reactos/subsys/csr/csrss.h
deleted file mode 100644
index afc2fe6340b..00000000000
--- a/include/reactos/subsys/csr/csrss.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*****************************  CSRSS Data  ***********************************/
-
-#ifndef __INCLUDE_CSRSS_CSRSS_H
-#define __INCLUDE_CSRSS_CSRSS_H
-
-// Used in ntdll/csr/connect.c
-#define CSR_CSRSS_SECTION_SIZE    (65536)
-
-
-/*** win32csr thingies to remove. ***/
-#if 1
-
-typedef struct
-{
-    HDESK DesktopHandle;
-} CSRSS_CREATE_DESKTOP, *PCSRSS_CREATE_DESKTOP;
-
-typedef struct
-{
-    HWND DesktopWindow;
-    ULONG Width;
-    ULONG Height;
-} CSRSS_SHOW_DESKTOP, *PCSRSS_SHOW_DESKTOP;
-
-typedef struct
-{
-    HWND DesktopWindow;
-} CSRSS_HIDE_DESKTOP, *PCSRSS_HIDE_DESKTOP;
-
-#endif
-/************************************/
-
-#endif /* __INCLUDE_CSRSS_CSRSS_H */
diff --git a/include/reactos/subsys/sm/helper.h b/include/reactos/subsys/sm/helper.h
index 22464cc3f60..82491e7f95f 100644
--- a/include/reactos/subsys/sm/helper.h
+++ b/include/reactos/subsys/sm/helper.h
@@ -5,36 +5,33 @@
 #include <sm/api.h>
 #endif
 
-/* $Id$ */
-
 /* smlib/connect.c */
 NTSTATUS WINAPI
-SmConnectApiPort (IN      PUNICODE_STRING  pSbApiPortName  OPTIONAL,
-		  IN      HANDLE           hSbApiPort      OPTIONAL,
-		  IN      WORD             wSubsystem      OPTIONAL, /* pe.h */
-		  IN OUT  PHANDLE          phSmApiPort);
+SmConnectApiPort(IN      PUNICODE_STRING  pSbApiPortName  OPTIONAL,
+                 IN      HANDLE           hSbApiPort      OPTIONAL,
+                 IN      WORD             wSubsystem      OPTIONAL, /* pe.h */
+                 IN OUT  PHANDLE          phSmApiPort);
 /* smlib/compses.c */
 NTSTATUS WINAPI
-SmCompleteSession (IN     HANDLE  hSmApiPort,
-		   IN     HANDLE  hSbApiPort,
-		   IN     HANDLE  hApiPort);
+SmCompleteSession(IN     HANDLE  hSmApiPort,
+                  IN     HANDLE  hSbApiPort,
+                  IN     HANDLE  hApiPort);
 /* smlib/execpgm.c */
 NTSTATUS WINAPI
-SmExecuteProgram (IN     HANDLE           hSmApiPort,
-		  IN     PUNICODE_STRING  Pgm
-		  );
+SmExecuteProgram(IN     HANDLE           hSmApiPort,
+                 IN     PUNICODE_STRING  Pgm);
 /* smdll/query.c */
 NTSTATUS WINAPI
-SmQueryInformation (IN      HANDLE                SmApiPort,
-		    IN      SM_INFORMATION_CLASS  SmInformationClass,
-		    IN OUT  PVOID                 Data,
-		    IN      ULONG                 DataLength,
-		    IN OUT  PULONG                ReturnedDataLength OPTIONAL);
+SmQueryInformation(IN      HANDLE                SmApiPort,
+                   IN      SM_INFORMATION_CLASS  SmInformationClass,
+                   IN OUT  PVOID                 Data,
+                   IN      ULONG                 DataLength,
+                   IN OUT  PULONG                ReturnedDataLength OPTIONAL);
 /* smlib/lookupss.c */
 NTSTATUS WINAPI
-SmLookupSubsystem (IN     PWSTR   Name,
-		   IN OUT PWSTR   Data,
-		   IN OUT PULONG  DataLength,
-		   IN OUT PULONG  DataType,
-		   IN     PVOID   Environment OPTIONAL);
+SmLookupSubsystem(IN     PWSTR   Name,
+                  IN OUT PWSTR   Data,
+                  IN OUT PULONG  DataLength,
+                  IN OUT PULONG  DataType,
+                  IN     PVOID   Environment OPTIONAL);
 #endif /* ndef INCLUDE_SM_HELPER_H */
diff --git a/include/reactos/subsys/sm/ns.h b/include/reactos/subsys/sm/ns.h
index 56279a9222c..2cd37850656 100644
--- a/include/reactos/subsys/sm/ns.h
+++ b/include/reactos/subsys/sm/ns.h
@@ -1,9 +1,7 @@
 #if !defined(INCLUDE_SM_NS_H)
 #define INCLUDE_SM_NS_H
 
-/* $Id$ */
-
-#define SM_REGISTRY_ROOT_NAME	     L"\\Session Manager"
+#define SM_REGISTRY_ROOT_NAME        L"\\Session Manager"
 #define SM_REGISTRY_SUBSYSTEMS_NAME  L"SubSystems"
 
 #define SM_API_PORT_NAME    L"\\SmApiPort"
diff --git a/include/reactos/subsys/win/base.h b/include/reactos/subsys/win/base.h
index ce953d6bb5d..f08a76cf96e 100644
--- a/include/reactos/subsys/win/base.h
+++ b/include/reactos/subsys/win/base.h
@@ -13,7 +13,7 @@
 
 typedef VOID (CALLBACK * BASE_PROCESS_CREATE_NOTIFY_ROUTINE)(PVOID);
 
-NTSTATUS WINAPI BaseSetProcessCreateNotify (BASE_PROCESS_CREATE_NOTIFY_ROUTINE);
+NTSTATUS WINAPI BaseSetProcessCreateNotify(BASE_PROCESS_CREATE_NOTIFY_ROUTINE);
 // CSR_SERVER_DLL_INIT(ServerDllInitialization);
 
 typedef struct _NLS_USER_INFO