From edad66ead275fe1f2dbd0293a6fcff9d8d1c1994 Mon Sep 17 00:00:00 2001
From: Stefan Ginsberg <stefanginsberg@gmail.com>
Date: Wed, 26 Nov 2008 19:04:55 +0000
Subject: [PATCH] - Ksuser: Cleanup header usage a bit, and make sure NTSTATUS
 gets defined - Kernel32: Undefine IOCTL_SERIAL_LSRMST_INSERT so we don't get
 a (bogus) incompatible redefinition warning

svn path=/trunk/; revision=37669
---
 reactos/dll/directx/ksuser/ksuser.c    |  2 ++
 reactos/dll/directx/ksuser/ksuser.h    | 14 ++------------
 reactos/dll/win32/kernel32/misc/comm.c |  1 +
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/reactos/dll/directx/ksuser/ksuser.c b/reactos/dll/directx/ksuser/ksuser.c
index fe059baa126..469fa672831 100644
--- a/reactos/dll/directx/ksuser/ksuser.c
+++ b/reactos/dll/directx/ksuser/ksuser.c
@@ -20,6 +20,8 @@
 
 
 #include "ksuser.h"
+#define NDEBUG
+#include <debug.h>
 
 NTSTATUS NTAPI  KsiCreateObjectType( HANDLE hHandle, PVOID guidstr, PVOID Buffer, ULONG BufferSize, ACCESS_MASK DesiredAccess, PHANDLE phHandle);
 
diff --git a/reactos/dll/directx/ksuser/ksuser.h b/reactos/dll/directx/ksuser/ksuser.h
index 4bb54502306..5da145bf5de 100644
--- a/reactos/dll/directx/ksuser/ksuser.h
+++ b/reactos/dll/directx/ksuser/ksuser.h
@@ -1,15 +1,5 @@
-
-
-
 #define _KSDDK_
 #include <windows.h>
-#include <reactos/helper.h>
-
-
-
+#include <ntsecapi.h>
 #include <ks.h>
-#include <debug.h>
-
-
-
-
+#include <reactos/helper.h>
diff --git a/reactos/dll/win32/kernel32/misc/comm.c b/reactos/dll/win32/kernel32/misc/comm.c
index e548d1094bb..9eae700caf7 100644
--- a/reactos/dll/win32/kernel32/misc/comm.c
+++ b/reactos/dll/win32/kernel32/misc/comm.c
@@ -38,6 +38,7 @@
 #undef SERIAL_IOC_MCR_OUT1
 #undef SERIAL_IOC_MCR_OUT2
 #undef SERIAL_IOC_MCR_LOOP
+#undef IOCTL_SERIAL_LSRMST_INSERT
 #include <ntddser.h>
 
 #define NDEBUG