diff --git a/reactos/subsys/system/services/database.c b/reactos/subsys/system/services/database.c
index ce94e1b4934..134a14c75a2 100644
--- a/reactos/subsys/system/services/database.c
+++ b/reactos/subsys/system/services/database.c
@@ -25,15 +25,10 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NTOS_MODE_USER
-#include <ntos.h>
-#include <rosrtl/string.h>
-
-#include <windows.h>
-#include <tchar.h>
-
-#include <services/services.h>
 #include "services.h"
+#include <services/services.h>
+
+#include <rosrtl/string.h>
 
 #define NDEBUG
 #include <debug.h>
diff --git a/reactos/subsys/system/services/rpcserver.c b/reactos/subsys/system/services/rpcserver.c
index 2f0b28443d5..58dd2029335 100644
--- a/reactos/subsys/system/services/rpcserver.c
+++ b/reactos/subsys/system/services/rpcserver.c
@@ -4,11 +4,6 @@
 
 /* INCLUDES ****************************************************************/
 
-#define NTOS_MODE_USER
-#include <ntos.h>
-#include <stdio.h>
-#include <windows.h>
-
 #include "services.h"
 #include "svcctl_s.h"
 
diff --git a/reactos/subsys/system/services/services.c b/reactos/subsys/system/services/services.c
index 5f12e99eefb..6a7eb53c870 100644
--- a/reactos/subsys/system/services/services.c
+++ b/reactos/subsys/system/services/services.c
@@ -29,12 +29,6 @@
 
 /* INCLUDES *****************************************************************/
 
-#define NTOS_MODE_USER
-#include <ntos.h>
-#include <stdio.h>
-#include <tchar.h>
-#include <windows.h>
-
 #include "services.h"
 
 #define NDEBUG
@@ -74,14 +68,14 @@ ScmCreateStartEvent(PHANDLE StartEvent)
   hEvent = CreateEvent(NULL,
                        TRUE,
                        FALSE,
-                       _T("SvcctrlStartEvent_A3725DX"));
+                       TEXT("SvcctrlStartEvent_A3725DX"));
   if (hEvent == NULL)
   {
     if (GetLastError() == ERROR_ALREADY_EXISTS)
     {
       hEvent = OpenEvent(EVENT_ALL_ACCESS,
                          FALSE,
-                         _T("SvcctrlStartEvent_A3725DX"));
+                         TEXT("SvcctrlStartEvent_A3725DX"));
       if (hEvent == NULL)
       {
         return FALSE;
@@ -166,7 +160,7 @@ ScmCreateNamedPipe(VOID)
 
     DPRINT("ScmCreateNamedPipe() - CreateNamedPipe(\"\\\\.\\pipe\\Ntsvcs\")\n");
 
-    hPipe = CreateNamedPipe(_T("\\\\.\\pipe\\Ntsvcs"),
+    hPipe = CreateNamedPipe(TEXT("\\\\.\\pipe\\Ntsvcs"),
               PIPE_ACCESS_DUPLEX,
               PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE | PIPE_WAIT,
               PIPE_UNLIMITED_INSTANCES,
diff --git a/reactos/subsys/system/services/services.h b/reactos/subsys/system/services/services.h
index 05f1a94e2ca..c11a017397a 100644
--- a/reactos/subsys/system/services/services.h
+++ b/reactos/subsys/system/services/services.h
@@ -1,3 +1,7 @@
+#include <windows.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
+
 /*
  * services.h
  */