Removed the special casing of kernel32 and ntdll for the TEB

definition in winternl.h.

dlls/dbghelp/stack.c

@@ -30,7 +30,6 @@
 #include "dbghelp_private.h"
 #include "winreg.h"
 #include "ntstatus.h"
-#include "thread.h" /* FIXME: must be included before winternl.h */
 #include "winternl.h"
 #include "wine/winbase16.h"
 #include "wine/debug.h"

dlls/kernel/comm.c

@@ -94,9 +94,9 @@
 #include "winbase.h"
 #include "winerror.h"
 
+#include "thread.h"
 #include "wine/server.h"
 #include "wine/unicode.h"
-#include "thread.h"
 
 #include "wine/debug.h"
 

dlls/kernel/instr.c

@@ -29,10 +29,10 @@
 #include "wingdi.h"
 #include "wine/winuser16.h"
 #include "excpt.h"
+#include "thread.h"
 #include "module.h"
 #include "wine/debug.h"
 #include "kernel_private.h"
-#include "thread.h"
 #include "wine/exception.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(int);

dlls/kernel/kernel_main.c

@@ -33,13 +33,13 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wincon.h"
+#include "thread.h"
 #include "winreg.h"
 #include "winternl.h"
 
 #include "wine/winbase16.h"
 #include "wine/library.h"
 #include "module.h"
-#include "thread.h"
 #include "wincon.h"
 #include "toolhelp.h"
 #include "kernel_private.h"

dlls/kernel/locale.c

@@ -35,13 +35,13 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winuser.h"  /* for RT_STRINGW */
+#include "thread.h"
 #include "winreg.h"
 #include "winternl.h"
 #include "wine/unicode.h"
 #include "winnls.h"
 #include "winerror.h"
 #include "winver.h"
-#include "thread.h"
 #include "kernel_private.h"
 #include "wine/debug.h"
 

dlls/kernel/syslevel.c

@@ -27,10 +27,10 @@
 #include <sys/types.h>
 #include "windef.h"
 #include "winbase.h"
+#include "thread.h"
 #include "winreg.h"
 #include "winternl.h"
 #include "wine/winbase16.h"
-#include "thread.h"
 #include "kernel_private.h"
 #include "wine/library.h"
 #include "wine/debug.h"

dlls/kernel/task.c

@@ -37,10 +37,10 @@
 #include "winuser.h"
 
 #include "wine/winbase16.h"
+#include "thread.h"
 #include "module.h"
 #include "winternl.h"
 #include "wine/server.h"
-#include "thread.h"
 #include "toolhelp.h"
 #include "kernel_private.h"
 

dlls/kernel/thread.c

@@ -38,8 +38,8 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "winnls.h"
-#include "module.h"
 #include "thread.h"
+#include "module.h"
 #include "wine/winbase16.h"
 #include "wine/exception.h"
 #include "wine/library.h"

dlls/kernel/thunk.c

@@ -34,6 +34,7 @@
 #include "windef.h"
 #include "winbase.h"
 #include "winerror.h"
+#include "thread.h"
 #include "winreg.h"
 #include "winternl.h"
 #include "wownt32.h"

dlls/kernel/wowthunk.c

@@ -30,6 +30,7 @@
 #include "winerror.h"
 #include "wownt32.h"
 #include "excpt.h"
+#include "thread.h"
 #include "winreg.h"
 #include "winternl.h"
 #include "module.h"

dlls/ntdll/file.c

@@ -61,6 +61,7 @@
 #define NONAMELESSSTRUCT
 #include "wine/unicode.h"
 #include "wine/debug.h"
+#include "thread.h"
 #include "wine/server.h"
 #include "ntdll_misc.h"
 

dlls/ntdll/ntdll_misc.h

@@ -27,7 +27,6 @@
 #include "winreg.h"
 #include "ntstatus.h"
 #include "winternl.h"
-#include "thread.h"
 #include "wine/server.h"
 
 /* The per-thread signal stack size */

dlls/ntdll/path.c

@@ -29,12 +29,11 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
-#include "winternl.h"
 #include "winioctl.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
 #include "wine/library.h"
+#include "thread.h"
 #include "ntdll_misc.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(file);

dlls/ntdll/signal_i386.c

@@ -53,8 +53,7 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
-#include "winternl.h"
+#include "thread.h"
 #include "wine/library.h"
 #include "ntdll_misc.h"
 

dlls/ntdll/sync.c

@@ -52,8 +52,6 @@
 
 #include "windef.h"
 #include "winbase.h"
-#include "winreg.h"
-#include "winternl.h"
 #include "thread.h"
 #include "wine/server.h"
 #include "wine/debug.h"

dlls/user/winproc.c

@@ -35,7 +35,6 @@
 #include "win.h"
 #include "winproc.h"
 #include "user_private.h"
-#include "thread.h"
 #include "dde.h"
 #include "winternl.h"
 #include "wine/unicode.h"

include/winternl.h

@@ -213,10 +213,6 @@ typedef struct _PEB
 /***********************************************************************
  * TEB data structure
  */
-#if defined(_NTSYSTEM_) || defined(_KERNEL32_)  /* hack, should go away */
-# define WINE_NO_TEB
-#endif
-
 #ifndef WINE_NO_TEB  /* don't define TEB if included from thread.h */
 # ifndef WINE_TEB_DEFINED
 # define WINE_TEB_DEFINED