--- trunk/reactos/subsys/system/services/database.c 2005-06-20 21:03:51 UTC (rev 16182)
+++ trunk/reactos/subsys/system/services/database.c 2005-06-20 21:04:03 UTC (rev 16183)
@@ -25,16 +25,11 @@
/* 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>
--- trunk/reactos/subsys/system/services/rpcserver.c 2005-06-20 21:03:51 UTC (rev 16182)
+++ trunk/reactos/subsys/system/services/rpcserver.c 2005-06-20 21:04:03 UTC (rev 16183)
@@ -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"
--- trunk/reactos/subsys/system/services/services.c 2005-06-20 21:03:51 UTC (rev 16182)
+++ trunk/reactos/subsys/system/services/services.c 2005-06-20 21:04:03 UTC (rev 16183)
@@ -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 @@
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 @@
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,
--- trunk/reactos/subsys/system/services/services.h 2005-06-20 21:03:51 UTC (rev 16182)
+++ trunk/reactos/subsys/system/services/services.h 2005-06-20 21:04:03 UTC (rev 16183)
@@ -1,3 +1,7 @@
+#include <windows.h>
+#define NTOS_MODE_USER
+#include <ndk/ntndk.h>
+
/*
* services.h
*/