kernel32: Moved private function prototypes out of toolhelp.h.

dlls/kernel32/dosmem.c

@@ -38,7 +38,7 @@
 #include "wine/winbase16.h"
 
 #include "kernel_private.h"
-#include "toolhelp.h"
+#include "kernel16_private.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dosmem);

dlls/kernel32/kernel16.c

@@ -26,7 +26,6 @@
 #include "winternl.h"
 #include "wownt32.h"
 
-#include "toolhelp.h"
 #include "kernel_private.h"
 #include "kernel16_private.h"
 #include "wine/debug.h"

dlls/kernel32/kernel16_private.h

@@ -188,6 +188,13 @@ static inline void stack16_pop( int size )
     NtCurrentTeb()->WOW32Reserved = (char *)NtCurrentTeb()->WOW32Reserved + size;
 }
 
+/* global16.c */
+extern HGLOBAL16 GLOBAL_CreateBlock( UINT16 flags, void *ptr, DWORD size,
+                                     HGLOBAL16 hOwner, unsigned char selflags );
+extern BOOL16 GLOBAL_FreeBlock( HGLOBAL16 handle );
+extern BOOL16 GLOBAL_MoveBlock( HGLOBAL16 handle, void *ptr, DWORD size );
+extern HGLOBAL16 GLOBAL_Alloc( WORD flags, DWORD size, HGLOBAL16 hOwner, unsigned char selflags );
+
 /* ne_module.c */
 extern NE_MODULE *NE_GetPtr( HMODULE16 hModule );
 extern WORD NE_GetOrdinal( HMODULE16 hModule, const char *name );

dlls/kernel32/kernel_main.c

@@ -35,7 +35,6 @@
 
 #include "wine/winbase16.h"
 #include "wine/library.h"
-#include "toolhelp.h"
 #include "kernel_private.h"
 #include "kernel16_private.h"
 #include "console_private.h"

dlls/kernel32/ne_segment.c

@@ -39,7 +39,6 @@
 #include "wine/library.h"
 #include "kernel_private.h"
 #include "kernel16_private.h"
-#include "toolhelp.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(fixup);

dlls/kernel32/snoop16.c

@@ -33,7 +33,6 @@
 #include "wine/library.h"
 #include "kernel_private.h"
 #include "kernel16_private.h"
-#include "toolhelp.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(snoop);

dlls/kernel32/toolhelp.h

@@ -102,13 +102,6 @@ BOOL16 WINAPI GlobalEntryHandle16( GLOBALENTRY *pGlobal, HGLOBAL16 hItem );
 BOOL16 WINAPI GlobalEntryModule16( GLOBALENTRY *pGlobal, HMODULE16 hModule,
                                  WORD wSeg );
 
-/* FIXME: Wine internal functions */
-extern HGLOBAL16 GLOBAL_CreateBlock( UINT16 flags, void *ptr, DWORD size,
-                                     HGLOBAL16 hOwner, unsigned char selflags );
-extern BOOL16 GLOBAL_FreeBlock( HGLOBAL16 handle );
-extern BOOL16 GLOBAL_MoveBlock( HGLOBAL16 handle, void *ptr, DWORD size );
-extern HGLOBAL16 GLOBAL_Alloc( WORD flags, DWORD size, HGLOBAL16 hOwner, unsigned char selflags );
-
 /* Local heap */
 
 typedef struct