kernel32: Don't use wine/server.h.

dlls/kernel32/comm.c

@@ -24,13 +24,12 @@
 
 #include "windef.h"
 #include "winbase.h"
+#include "winternl.h"
 #include "winnls.h"
 #include "winerror.h"
 #include "winioctl.h"
 #include "ddk/ntddser.h"
 
-#include "wine/server.h"
-
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(comm);

dlls/kernel32/console.c

@@ -33,11 +33,11 @@
 #define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
+#include "winternl.h"
 #include "winnls.h"
 #include "winerror.h"
 #include "wincon.h"
 #include "wine/condrv.h"
-#include "wine/server.h"
 #include "wine/exception.h"
 #include "wine/debug.h"
 #include "excpt.h"
@@ -59,7 +59,7 @@ HWND WINAPI GetConsoleWindow(void)
 
     ret = DeviceIoControl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle,
                            IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL, NULL );
-    return ret ? wine_server_ptr_handle(info.win) : NULL;
+    return ret ? LongToHandle( info.win ) : NULL;
 }
 
 

dlls/kernel32/process.c

@@ -36,7 +36,6 @@
 #include "psapi.h"
 #include "ddk/wdm.h"
 #include "wine/exception.h"
-#include "wine/server.h"
 #include "wine/asm.h"
 #include "wine/debug.h"