diff --git a/reactos/include/ddk/kefuncs.h b/reactos/include/ddk/kefuncs.h
index dfc26595b0e..5be685aa4a2 100644
--- a/reactos/include/ddk/kefuncs.h
+++ b/reactos/include/ddk/kefuncs.h
@@ -28,7 +28,7 @@ VOID FASTCALL KiReleaseSpinLock(PKSPIN_LOCK SpinLock);
 
 VOID KeDrainApcQueue(VOID);
 
-struct _KPROCESS* KeGetCurrentProcess(VOID);
+struct _KPROCESS* STDCALL KeGetCurrentProcess(VOID);
 
 /*
  * FUNCTION: Acquires a spinlock so the caller can synchronize access to 
diff --git a/reactos/include/napi/teb.h b/reactos/include/napi/teb.h
index b980f2b05b9..d9d2c0ad1f7 100644
--- a/reactos/include/napi/teb.h
+++ b/reactos/include/napi/teb.h
@@ -86,6 +86,7 @@ typedef struct _PEB_FREE_BLOCK
 /* RTL_USER_PROCESS_PARAMETERS.Flags */
 #define PPF_NORMALIZED	(1)
 
+#define TEB_BASE        (0x7FFDE000)
 #define PEB_BASE        (0x7FFDF000)
 
 typedef struct _PEB_LDR_DATA
diff --git a/reactos/include/ntos/tss.h b/reactos/include/ntos/tss.h
index 566651a450d..c48b43663b5 100755
--- a/reactos/include/ntos/tss.h
+++ b/reactos/include/ntos/tss.h
@@ -6,6 +6,7 @@
 #define __INCLUDE_DDK_I386_TSS_H
 
 #define KTSS_ESP0      (0x4)
+#define KTSS_CR3       (0x1C)
 #define KTSS_EFLAGS    (0x24)
 #define KTSS_IOMAPBASE (0x66)
 
diff --git a/reactos/include/ntos/zwtypes.h b/reactos/include/ntos/zwtypes.h
index 3a88cd6c78d..e124f77b84e 100755
--- a/reactos/include/ntos/zwtypes.h
+++ b/reactos/include/ntos/zwtypes.h
@@ -31,17 +31,6 @@ typedef struct _LDT_ENTRY {
   } HighWord;
 } LDT_ENTRY, *PLDT_ENTRY, *LPLDT_ENTRY;
 
-typedef enum _THREAD_STATE {
-	StateInitialized,
-	StateReady,
-	StateRunning,
-	StateStandby,
-	StateTerminated,
-	StateWait,
-	StateTransition,
-	StateUnknown
-} THREAD_STATE;
-
 typedef enum _DEBUG_CONTROL_CODE
 {
   DebugGetTraceInformation = 1,
@@ -1325,7 +1314,7 @@ typedef struct _SYSTEM_THREADS {
 	KPRIORITY  Priority;
 	KPRIORITY  BasePriority;
 	ULONG  ContextSwitchCount;
-	THREAD_STATE  State;
+	ULONG  State;
 	KWAIT_REASON  WaitReason;
 } SYSTEM_THREADS, *PSYSTEM_THREADS;