diff --git a/reactos/include/ddk/ntddk.h b/reactos/include/ddk/ntddk.h
index 42a3c4230d6..22067536dcc 100644
--- a/reactos/include/ddk/ntddk.h
+++ b/reactos/include/ddk/ntddk.h
@@ -3769,6 +3769,7 @@ HalBugCheckSystem(
 
 #endif /* (NTDDI_VERSION >= NTDDI_WIN7) */
 
+
 /******************************************************************************
  *                         I/O Manager Functions                              *
  ******************************************************************************/
diff --git a/reactos/include/ddk/ntifs.h b/reactos/include/ddk/ntifs.h
index 135d2abc55a..4b7c7d3f201 100644
--- a/reactos/include/ddk/ntifs.h
+++ b/reactos/include/ddk/ntifs.h
@@ -800,6 +800,26 @@ typedef struct _SE_EXPORTS {
 typedef NTSTATUS
 (NTAPI *PSE_LOGON_SESSION_TERMINATED_ROUTINE)(
   IN PLUID LogonId);
+
+typedef struct _SECURITY_CLIENT_CONTEXT {
+  SECURITY_QUALITY_OF_SERVICE SecurityQos;
+  PACCESS_TOKEN ClientToken;
+  BOOLEAN DirectlyAccessClientToken;
+  BOOLEAN DirectAccessEffectiveOnly;
+  BOOLEAN ServerIsRemote;
+  TOKEN_CONTROL ClientTokenControl;
+} SECURITY_CLIENT_CONTEXT, *PSECURITY_CLIENT_CONTEXT;
+
+/******************************************************************************
+ *                            Object Manager Types                            *
+ ******************************************************************************/
+
+typedef enum _OBJECT_INFORMATION_CLASS {
+  ObjectBasicInformation = 0,
+  ObjectTypeInformation = 2,
+} OBJECT_INFORMATION_CLASS;
+
+
 /******************************************************************************
  *                           Runtime Library Types                            *
  ******************************************************************************/
@@ -1887,16 +1907,6 @@ RtlCreateVirtualAccountSid(
 #define RtlOffsetToPointer(B,O) ((PCHAR)(((PCHAR)(B)) + ((ULONG_PTR)(O))))
 #define RtlPointerToOffset(B,P) ((ULONG)(((PCHAR)(P)) - ((PCHAR)(B))))
 
-typedef enum _OBJECT_INFORMATION_CLASS {
-  ObjectBasicInformation = 0,
-  ObjectNameInformation = 1, /* FIXME, not in WDK */
-  ObjectTypeInformation = 2,
-  ObjectTypesInformation = 3, /* FIXME, not in WDK */
-  ObjectHandleFlagInformation = 4, /* FIXME, not in WDK */
-  ObjectSessionInformation = 5, /* FIXME, not in WDK */
-  MaxObjectInfoClass /* FIXME, not in WDK */
-} OBJECT_INFORMATION_CLASS;
-
 NTSYSCALLAPI
 NTSTATUS
 NTAPI
@@ -4737,18 +4747,12 @@ typedef struct _PUBLIC_OBJECT_TYPE_INFORMATION {
   ULONG Reserved [22];
 } PUBLIC_OBJECT_TYPE_INFORMATION, *PPUBLIC_OBJECT_TYPE_INFORMATION;
 
-typedef struct _SECURITY_CLIENT_CONTEXT {
-  SECURITY_QUALITY_OF_SERVICE SecurityQos;
-  PACCESS_TOKEN ClientToken;
-  BOOLEAN DirectlyAccessClientToken;
-  BOOLEAN DirectAccessEffectiveOnly;
-  BOOLEAN ServerIsRemote;
-  TOKEN_CONTROL ClientTokenControl;
-} SECURITY_CLIENT_CONTEXT, *PSECURITY_CLIENT_CONTEXT;
-
 #define SYSTEM_PAGE_PRIORITY_BITS       3
 #define SYSTEM_PAGE_PRIORITY_LEVELS     (1 << SYSTEM_PAGE_PRIORITY_BITS)
 
+/******************************************************************************
+ *                              Kernel Types                                  *
+ ******************************************************************************/
 typedef struct _KAPC_STATE {
   LIST_ENTRY ApcListHead[MaximumMode];
   PKPROCESS Process;
@@ -4769,6 +4773,7 @@ typedef struct _KQUEUE {
   LIST_ENTRY ThreadListHead;
 } KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE;
 
+
 /******************************************************************************
  *                              Kernel Functions                              *
  ******************************************************************************/
@@ -4944,7 +4949,8 @@ KeQueryOwnerMutant(
 
 NTKERNELAPI
 ULONG
-KeRemoveQueueEx (
+NTAPI
+KeRemoveQueueEx(
   IN OUT PKQUEUE Queue,
   IN KPROCESSOR_MODE WaitMode,
   IN BOOLEAN Alertable,
@@ -10286,6 +10292,9 @@ typedef struct _QUERY_PATH_RESPONSE {
 
 #include "csq.h"
 
+extern PACL                         SePublicDefaultDacl;
+extern PACL                         SeSystemDefaultDacl;
+
 #define FS_LFN_APIS                             0x00004000
 
 #define FILE_STORAGE_TYPE_SPECIFIED             0x00000041  /* FILE_DIRECTORY_FILE | FILE_NON_DIRECTORY_FILE */
diff --git a/reactos/include/ddk/wdm.h b/reactos/include/ddk/wdm.h
index 663dda6f335..2948402116a 100644
--- a/reactos/include/ddk/wdm.h
+++ b/reactos/include/ddk/wdm.h
@@ -7561,6 +7561,7 @@ extern POBJECT_TYPE NTSYSAPI PsThreadType;
 extern POBJECT_TYPE NTSYSAPI SeTokenObjectType;
 extern POBJECT_TYPE NTSYSAPI PsProcessType;
 
+
 /******************************************************************************
  *                           Process Manager Types                            *
  ******************************************************************************/
@@ -7896,6 +7897,7 @@ FORCEINLINE
 VOID
 KeMemoryBarrier(VOID)
 {
+  // FIXME: Do we really need lfence after the __faststorefence ?
   FastFence();
   LFENCE_ACQUIRE();
 }
@@ -10351,12 +10353,14 @@ KeQueryMaximumProcessorCount(VOID);
 #if (NTDDI_VERSION >= NTDDI_WS08)
 
 PVOID
+NTAPI
 KeRegisterProcessorChangeCallback(
   IN PPROCESSOR_CALLBACK_FUNCTION CallbackFunction,
   IN PVOID CallbackContext OPTIONAL,
   IN ULONG Flags);
 
 VOID
+NTAPI
 KeDeregisterProcessorChangeCallback(
   IN PVOID CallbackHandle);
 
@@ -14757,6 +14761,7 @@ HalGetDmaAlignment(
 
 #endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */
 
+
 #ifndef _NTTMAPI_
 #define _NTTMAPI_
 
diff --git a/reactos/include/xdk/exfuncs.h b/reactos/include/xdk/exfuncs.h
index 4c3dd7dc890..e754ea84c16 100644
--- a/reactos/include/xdk/exfuncs.h
+++ b/reactos/include/xdk/exfuncs.h
@@ -815,7 +815,7 @@ $endif (_NTIFS_)
 
 $if (_WDMDDK_ || _NTIFS_)
 #if (NTDDI_VERSION >= NTDDI_WINXP)
-$endif
+$endif (_WDMDDK_ || _NTIFS_)
 $if (_WDMDDK_)
 
 NTKERNELAPI
@@ -872,7 +872,7 @@ InterlockedPushListSList(
 $endif (_NTIFS_)
 $if (_WDMDDK_ || _NTIFS_)
 #endif /* (NTDDI_VERSION >= NTDDI_WINXP) */
-$endif
+$endif (_WDMDDK_ || _NTIFS_)
 
 $if (_WDMDDK_)
 #if (NTDDI_VERSION >= NTDDI_WINXPSP2)
diff --git a/reactos/include/xdk/extypes.h b/reactos/include/xdk/extypes.h
index 89728aa95d5..d53c66432e3 100644
--- a/reactos/include/xdk/extypes.h
+++ b/reactos/include/xdk/extypes.h
@@ -2,7 +2,7 @@ $if (_WDMDDK_ || _NTDDK_)
 /******************************************************************************
  *                            Executive Types                                 *
  ******************************************************************************/
-$endif
+$endif (_WDMDDK_ || _NTDDK_)
 $if (_WDMDDK_)
 #define EX_RUNDOWN_ACTIVE                 0x1
 #define EX_RUNDOWN_COUNT_SHIFT            0x1
diff --git a/reactos/include/xdk/iofuncs.h b/reactos/include/xdk/iofuncs.h
index a8ac52ec878..9e2b35aa599 100644
--- a/reactos/include/xdk/iofuncs.h
+++ b/reactos/include/xdk/iofuncs.h
@@ -2051,7 +2051,7 @@ IoValidateDeviceIoControlAccess(
 $endif (_WDMDDK_)
 $if (_WDMDDK_ || _NTDDK_)
 #if (NTDDI_VERSION >= NTDDI_WS03)
-$endif
+$endif (_WDMDDK_ || _NTDDK_)
 $if (_NTDDK_)
 NTKERNELAPI
 IO_PAGING_PRIORITY
@@ -2084,10 +2084,10 @@ IoCsqInsertIrpEx(
 $endif (_WDMDDK_)
 $if (_WDMDDK_ || _NTDDK_)
 #endif /* (NTDDI_VERSION >= NTDDI_WS03) */
-$endif
+$endif (_WDMDDK_ || _NTDDK_)
 $if (_NTDDK_ || _NTIFS_)
 #if (NTDDI_VERSION >= NTDDI_WS03SP1)
-$endif
+$endif (_NTDDK_ || _NTIFS_)
 
 $if (_NTDDK_)
 BOOLEAN
@@ -2111,7 +2111,7 @@ IoEnumerateRegisteredFiltersList(
 $endif (_NTIFS_)
 $if (_NTDDK_ || _NTIFS_)
 #endif /* (NTDDI_VERSION >= NTDDI_WS03SP1) */
-$endif
+$endif (_NTDDK_ || _NTIFS_)
 
 #if (NTDDI_VERSION >= NTDDI_VISTA)
 $if (_WDMDDK_)
diff --git a/reactos/include/xdk/iotypes.h b/reactos/include/xdk/iotypes.h
index 1d266bb4c33..9f358794700 100644
--- a/reactos/include/xdk/iotypes.h
+++ b/reactos/include/xdk/iotypes.h
@@ -2,7 +2,7 @@ $if (_WDMDDK_ || _NTDDK_)
 /******************************************************************************
  *                         I/O Manager Types                                  *
  ******************************************************************************/
-$endif
+$endif (_WDMDDK_ || _NTDDK_)
 
 $if (_WDMDDK_)
 
@@ -214,7 +214,7 @@ $if (_NTDDK_)
 #define DO_SYSTEM_CRITICAL_PARTITION      0x00400000
 #define DO_DISALLOW_EXECUTE               0x00800000
 
-$endif
+$endif (_NTDDK_)
 $if (_WDMDDK_)
 /* DEVICE_OBJECT.Flags */
 #define DO_VERIFY_VOLUME                  0x00000002
@@ -254,12 +254,12 @@ $if (_WDMDDK_)
 #define FILE_256_BYTE_ALIGNMENT         0x000000ff
 #define FILE_512_BYTE_ALIGNMENT         0x000001ff
 
-$endif
+$endif (_NTDDK_)
 $if (_WDMDDK_ || _DEVIOCTL_)
 /* DEVICE_OBJECT.DeviceType */
 #define DEVICE_TYPE ULONG
 
-$endif
+$endif (_WDMDDK_ || _DEVIOCTL_)
 $if (_WDMDDK_)
 typedef struct _DEVICE_OBJECT {
   CSHORT Type;
diff --git a/reactos/include/xdk/kdfuncs.h b/reactos/include/xdk/kdfuncs.h
index 1817849b425..07312583144 100644
--- a/reactos/include/xdk/kdfuncs.h
+++ b/reactos/include/xdk/kdfuncs.h
@@ -9,7 +9,7 @@ DbgPrompt(
   IN PCCH Prompt,
   OUT PCH Response,
   IN ULONG MaximumResponseLength);
-$endif
+$endif (_NTDDK_)
 
 $if (_WDMDDK_)
 #ifndef _DBGNT_
@@ -189,4 +189,4 @@ KdChangeOption(
   OUT PVOID OutBuffer,
   OUT PULONG OutBufferNeeded OPTIONAL);
 #endif
-$endif
+$endif (_WDMDDK_)
diff --git a/reactos/include/xdk/kdtypes.h b/reactos/include/xdk/kdtypes.h
index b030a2349f0..0b7fe7fd35b 100644
--- a/reactos/include/xdk/kdtypes.h
+++ b/reactos/include/xdk/kdtypes.h
@@ -91,4 +91,4 @@ typedef ULONG
   IN PVOID Buffer,
   IN ULONG Offset,
   IN ULONG Length);
-$endif
+$endif (_NTDDK_)
diff --git a/reactos/include/xdk/kefuncs.h b/reactos/include/xdk/kefuncs.h
index 7574f4c0b6d..96b012bbd33 100644
--- a/reactos/include/xdk/kefuncs.h
+++ b/reactos/include/xdk/kefuncs.h
@@ -103,7 +103,7 @@ KeBugCheck(
 $endif(_NTDDK_)
 $if (_WDMDDK_ || _NTDDK_)
 #if defined(SINGLE_GROUP_LEGACY_API)
-$endif
+$endif (_WDMDDK_ || _NTDDK_)
 
 $if (_WDMDDK_)
 NTKERNELAPI
@@ -145,7 +145,7 @@ KeQueryActiveProcessors(VOID);
 $endif (_NTDDK_)
 $if (_WDMDDK_ || _NTDDK_)
 #endif /* defined(SINGLE_GROUP_LEGACY_API) */
-$endif
+$endif (_WDMDDK_ || _NTDDK_)
 
 $if (_WDMDDK_)
 #if !defined(_M_AMD64)
@@ -605,7 +605,7 @@ KIRQL
 KeAcquireSpinLockRaiseToSynch(
   IN OUT PKSPIN_LOCK SpinLock);
 #endif
-$endif
+$endif (_NTIFS_)
 
 #endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */
 
@@ -735,7 +735,7 @@ KeFlushQueuedDpcs(VOID);
 $endif (_WDMDDK_)
 $if (_WDMDDK_ || _NTDDK_)
 #if (NTDDI_VERSION >= NTDDI_WS03)
-$endif
+$endif (_WDMDDK_ || _NTDDK_)
 
 $if (_WDMDDK_)
 NTKERNELAPI
@@ -794,10 +794,10 @@ KeInvalidateAllCaches(VOID);
 $endif (_NTDDK_)
 $if (_WDMDDK_ || _NTDDK_)
 #endif /* (NTDDI_VERSION >= NTDDI_WS03) */
-$endif
+$endif (_WDMDDK_ || _NTDDK_)
 $if (_WDMDDK_ || _NTDDK_)
 #if (NTDDI_VERSION >= NTDDI_WS03SP1)
-$endif
+$endif (_WDMDDK_ || _NTDDK_)
 
 $if (_WDMDDK_)
 NTKERNELAPI
@@ -878,7 +878,7 @@ KeLeaveGuardedRegion(VOID);
 $endif (_NTDDK_)
 $if (_WDMDDK_ || _NTDDK_)
 #endif /* (NTDDI_VERSION >= NTDDI_WS03SP1) */
-$endif
+$endif (_WDMDDK_ || _NTDDK_)
 
 #if (NTDDI_VERSION >= NTDDI_VISTA)
 $if (_WDMDDK_)
@@ -903,7 +903,7 @@ KeQueryDpcWatchdogInformation(
 $endif (_WDMDDK_)
 $if (_WDMDDK_ || _NTDDK_)
 #if defined(SINGLE_GROUP_LEGACY_API)
-$endif
+$endif (_WDMDDK_ || _NTDDK_)
 
 $if (_WDMDDK_)
 NTKERNELAPI
@@ -943,7 +943,7 @@ KeQueryMaximumProcessorCount(VOID);
 $endif (_NTDDK_)
 $if (_WDMDDK_ || _NTDDK_)
 #endif /* SINGLE_GROUP_LEGACY_API */
-$endif
+$endif (_WDMDDK_ || _NTDDK_)
 $if (_NTIFS_)
 NTKERNELAPI
 VOID
@@ -953,7 +953,8 @@ KeQueryOwnerMutant(
 
 NTKERNELAPI
 ULONG
-KeRemoveQueueEx (
+NTAPI
+KeRemoveQueueEx(
   IN OUT PKQUEUE Queue,
   IN KPROCESSOR_MODE WaitMode,
   IN BOOLEAN Alertable,
@@ -968,12 +969,14 @@ $if (_WDMDDK_)
 #if (NTDDI_VERSION >= NTDDI_WS08)
 
 PVOID
+NTAPI
 KeRegisterProcessorChangeCallback(
   IN PPROCESSOR_CALLBACK_FUNCTION CallbackFunction,
   IN PVOID CallbackContext OPTIONAL,
   IN ULONG Flags);
 
 VOID
+NTAPI
 KeDeregisterProcessorChangeCallback(
   IN PVOID CallbackHandle);
 
@@ -981,7 +984,7 @@ KeDeregisterProcessorChangeCallback(
 $endif (_WDMDDK_)
 $if (_WDMDDK_ || _NTDDK_)
 #if (NTDDI_VERSION >= NTDDI_WIN7)
-$endif
+$endif (_WDMDDK_ || _NTDDK_)
 
 $if (_WDMDDK_)
 ULONG64
@@ -1207,7 +1210,7 @@ KeQueryHardwareCounterConfiguration(
 $endif (_NTDDK_)
 $if (_WDMDDK_ || _NTDDK_)
 #endif /* (NTDDI_VERSION >= NTDDI_WIN7) */
-$endif
+$endif (_WDMDDK_ || _NTDDK_)
 $if (_WDMDDK_)
 #if !defined(_IA64_)
 NTHALAPI
diff --git a/reactos/include/xdk/ketypes.h b/reactos/include/xdk/ketypes.h
index 0bbb6964297..71139eec7f8 100644
--- a/reactos/include/xdk/ketypes.h
+++ b/reactos/include/xdk/ketypes.h
@@ -999,7 +999,7 @@ extern NTSYSAPI CCHAR KeNumberProcessors;
 extern PCCHAR KeNumberProcessors;
 #endif
 
-$endif /* _WDMDDK_ */
+$endif (_WDMDDK_)
 $if (_NTDDK_)
 
 #define NX_SUPPORT_POLICY_ALWAYSOFF 0
@@ -1182,5 +1182,27 @@ extern NTSYSAPI CCHAR KeNumberProcessors;
 extern PCCHAR KeNumberProcessors;
 #endif
 
-$endif /* _NTDDK_ */
+$endif (_NTDDK_)
+$if (_NTIFS_)
+typedef struct _KAPC_STATE {
+  LIST_ENTRY ApcListHead[MaximumMode];
+  PKPROCESS Process;
+  BOOLEAN KernelApcInProgress;
+  BOOLEAN KernelApcPending;
+  BOOLEAN UserApcPending;
+} KAPC_STATE, *PKAPC_STATE, *RESTRICTED_POINTER PRKAPC_STATE;
+
+#define KAPC_STATE_ACTUAL_LENGTH (FIELD_OFFSET(KAPC_STATE, UserApcPending) + sizeof(BOOLEAN))
+
+#define ASSERT_QUEUE(Q) ASSERT(((Q)->Header.Type & KOBJECT_TYPE_MASK) == QueueObject);
+
+typedef struct _KQUEUE {
+  DISPATCHER_HEADER Header;
+  LIST_ENTRY EntryListHead;
+  volatile ULONG CurrentCount;
+  ULONG MaximumCount;
+  LIST_ENTRY ThreadListHead;
+} KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE;
+
+$endif (_NTIFS_)
 
diff --git a/reactos/include/xdk/mmfuncs.h b/reactos/include/xdk/mmfuncs.h
index 02902e33eab..e389fad3044 100644
--- a/reactos/include/xdk/mmfuncs.h
+++ b/reactos/include/xdk/mmfuncs.h
@@ -591,7 +591,7 @@ $endif (_NTIFS_)
 
 $if (_WDMDDK_ || _NTIFS_)
 #if (NTDDI_VERSION >= NTDDI_WINXP)
-$endif
+$endif (_WDMDDK_ || _NTIFS_)
 
 $if (_WDMDDK_)
 NTKERNELAPI
@@ -664,10 +664,10 @@ $endif (_NTIFS_)
 
 $if (_WDMDDK_ || _NTIFS_)
 #endif /* (NTDDI_VERSION >= NTDDI_WINXP) */
-$endif
+$endif (_WDMDDK_ || _NTIFS_)
 $if (_WDMDDK_ || _NTDDK_)
 #if (NTDDI_VERSION >= NTDDI_WS03)
-$endif
+$endif (_WDMDDK_ || _NTDDK_)
 $if (_WDMDDK_)
 NTKERNELAPI
 LOGICAL
@@ -685,7 +685,7 @@ MmCreateMirror(VOID);
 $endif (_NTDDK_)
 $if (_WDMDDK_ || _NTDDK_)
 #endif /* (NTDDI_VERSION >= NTDDI_WS03) */
-$endif
+$endif (_WDMDDK_ || _NTDDK_)
 $if (_WDMDDK_)
 #if (NTDDI_VERSION >= NTDDI_WS03SP1)
 NTKERNELAPI
@@ -699,7 +699,7 @@ MmAllocatePagesForMdlEx(
   IN MEMORY_CACHING_TYPE CacheType,
   IN ULONG Flags);
 #endif
-$endif
+$endif (_WDMDDK_)
 
 #if (NTDDI_VERSION >= NTDDI_VISTA)
 $if (_WDMDDK_)
diff --git a/reactos/include/xdk/ntifs.template.h b/reactos/include/xdk/ntifs.template.h
index c3d0c030cda..fd55c313560 100644
--- a/reactos/include/xdk/ntifs.template.h
+++ b/reactos/include/xdk/ntifs.template.h
@@ -62,19 +62,10 @@ typedef STRING LSA_STRING, *PLSA_STRING;
 typedef OBJECT_ATTRIBUTES LSA_OBJECT_ATTRIBUTES, *PLSA_OBJECT_ATTRIBUTES;
 
 $include (setypes.h)
+$include (obtypes.h)
 $include (rtltypes.h)
 $include (rtlfuncs.h)
 
-typedef enum _OBJECT_INFORMATION_CLASS {
-  ObjectBasicInformation = 0,
-  ObjectNameInformation = 1, /* FIXME, not in WDK */
-  ObjectTypeInformation = 2,
-  ObjectTypesInformation = 3, /* FIXME, not in WDK */
-  ObjectHandleFlagInformation = 4, /* FIXME, not in WDK */
-  ObjectSessionInformation = 5, /* FIXME, not in WDK */
-  MaxObjectInfoClass /* FIXME, not in WDK */
-} OBJECT_INFORMATION_CLASS;
-
 NTSYSCALLAPI
 NTSTATUS
 NTAPI
@@ -1031,38 +1022,10 @@ typedef struct _PUBLIC_OBJECT_TYPE_INFORMATION {
   ULONG Reserved [22];
 } PUBLIC_OBJECT_TYPE_INFORMATION, *PPUBLIC_OBJECT_TYPE_INFORMATION;
 
-typedef struct _SECURITY_CLIENT_CONTEXT {
-  SECURITY_QUALITY_OF_SERVICE SecurityQos;
-  PACCESS_TOKEN ClientToken;
-  BOOLEAN DirectlyAccessClientToken;
-  BOOLEAN DirectAccessEffectiveOnly;
-  BOOLEAN ServerIsRemote;
-  TOKEN_CONTROL ClientTokenControl;
-} SECURITY_CLIENT_CONTEXT, *PSECURITY_CLIENT_CONTEXT;
-
 #define SYSTEM_PAGE_PRIORITY_BITS       3
 #define SYSTEM_PAGE_PRIORITY_LEVELS     (1 << SYSTEM_PAGE_PRIORITY_BITS)
 
-typedef struct _KAPC_STATE {
-  LIST_ENTRY ApcListHead[MaximumMode];
-  PKPROCESS Process;
-  BOOLEAN KernelApcInProgress;
-  BOOLEAN KernelApcPending;
-  BOOLEAN UserApcPending;
-} KAPC_STATE, *PKAPC_STATE, *RESTRICTED_POINTER PRKAPC_STATE;
-
-#define KAPC_STATE_ACTUAL_LENGTH (FIELD_OFFSET(KAPC_STATE, UserApcPending) + sizeof(BOOLEAN))
-
-#define ASSERT_QUEUE(Q) ASSERT(((Q)->Header.Type & KOBJECT_TYPE_MASK) == QueueObject);
-
-typedef struct _KQUEUE {
-  DISPATCHER_HEADER Header;
-  LIST_ENTRY EntryListHead;
-  volatile ULONG CurrentCount;
-  ULONG MaximumCount;
-  LIST_ENTRY ThreadListHead;
-} KQUEUE, *PKQUEUE, *RESTRICTED_POINTER PRKQUEUE;
-
+$include (ketypes.h)
 $include (kefuncs.h)
 $include (extypes.h)
 $include (exfuncs.h)
@@ -1269,6 +1232,9 @@ typedef struct _QUERY_PATH_RESPONSE {
 
 #include "csq.h"
 
+extern PACL                         SePublicDefaultDacl;
+extern PACL                         SeSystemDefaultDacl;
+
 #define FS_LFN_APIS                             0x00004000
 
 #define FILE_STORAGE_TYPE_SPECIFIED             0x00000041  /* FILE_DIRECTORY_FILE | FILE_NON_DIRECTORY_FILE */
diff --git a/reactos/include/xdk/nttmapi.h b/reactos/include/xdk/nttmapi.h
index 721005fdd88..9aaaf4446cb 100644
--- a/reactos/include/xdk/nttmapi.h
+++ b/reactos/include/xdk/nttmapi.h
@@ -1,4 +1,3 @@
-$if (_WDMDDK_)
 #ifndef _NTTMAPI_
 #define _NTTMAPI_
 
@@ -649,4 +648,3 @@ NtPropagationFailed(
 #endif /* NTDDI_VERSION >= NTDDI_VISTA */
 
 #endif /* !_NTTMAPI_ */
-$endif
diff --git a/reactos/include/xdk/obtypes.h b/reactos/include/xdk/obtypes.h
index 4efaed8fe36..3b28c0c94f5 100644
--- a/reactos/include/xdk/obtypes.h
+++ b/reactos/include/xdk/obtypes.h
@@ -2,6 +2,7 @@
  *                            Object Manager Types                            *
  ******************************************************************************/
 
+$if (_WDMDDK_)
 #define MAXIMUM_FILENAME_LENGTH           256
 #define OBJ_NAME_PATH_SEPARATOR           ((WCHAR)L'\\')
 
@@ -132,3 +133,22 @@ extern POBJECT_TYPE NTSYSAPI PsThreadType;
 extern POBJECT_TYPE NTSYSAPI SeTokenObjectType;
 extern POBJECT_TYPE NTSYSAPI PsProcessType;
 
+$endif (_WDMDDK_)
+$if (_NTIFS_)
+typedef enum _OBJECT_INFORMATION_CLASS {
+  ObjectBasicInformation = 0,
+  ObjectTypeInformation = 2,
+$endif (_NTIFS_)
+$if (_PRIVATE_)
+  /* Not for public use */
+  ObjectNameInformation = 1,
+  ObjectTypesInformation = 3,
+  ObjectHandleFlagInformation = 4,
+  ObjectSessionInformation = 5,
+  MaxObjectInfoClass
+$endif (_PRIVATE_)
+$if (_NTIFS_)
+} OBJECT_INFORMATION_CLASS;
+
+$endif (_NTIFS_)
+
diff --git a/reactos/include/xdk/psfuncs.h b/reactos/include/xdk/psfuncs.h
index 8564bd92693..f76d96ff58c 100644
--- a/reactos/include/xdk/psfuncs.h
+++ b/reactos/include/xdk/psfuncs.h
@@ -211,7 +211,7 @@ $endif (_NTIFS_)
 #endif /* (NTDDI_VERSION >= NTDDI_WIN2K) */
 $if (_NTDDK_ || _NTIFS_)
 #if (NTDDI_VERSION >= NTDDI_WINXP)
-$endif
+$endif (_NTDDK_ || _NTIFS_)
 
 $if (_NTDDK_)
 NTKERNELAPI
@@ -274,7 +274,7 @@ PsIsSystemThread(
 $endif (_NTIFS_)
 $if (_NTDDK_ || _NTIFS_)
 #endif /* (NTDDI_VERSION >= NTDDI_WINXP) */
-$endif
+$endif (_NTDDK_ || _NTIFS_)
 
 $if (_NTDDK_)
 #if (NTDDI_VERSION >= NTDDI_WS03)
diff --git a/reactos/include/xdk/pstypes.h b/reactos/include/xdk/pstypes.h
index 3cd35ff9821..c3f630ca7c9 100644
--- a/reactos/include/xdk/pstypes.h
+++ b/reactos/include/xdk/pstypes.h
@@ -38,7 +38,7 @@ $if (_WDMDDK_)
 #define HIGH_PRIORITY                     31
 #define MAXIMUM_PRIORITY                  32
 
-$endif /* _WDMDDK_ */
+$endif (_WDMDDK_)
 $if (_NTDDK_)
 
 #define QUOTA_LIMITS_HARDWS_MIN_ENABLE  0x00000001
@@ -447,5 +447,5 @@ typedef struct _PROCESS_HANDLE_TRACING_QUERY {
 
 extern NTKERNELAPI PEPROCESS PsInitialSystemProcess;
 
-$endif /* _NTDDK_ */
+$endif (_NTDDK_)
 
diff --git a/reactos/include/xdk/rtltypes.h b/reactos/include/xdk/rtltypes.h
index abe3d1235e0..24f829ad929 100644
--- a/reactos/include/xdk/rtltypes.h
+++ b/reactos/include/xdk/rtltypes.h
@@ -553,4 +553,4 @@ typedef struct _COMPRESSED_DATA_INFO {
   ULONG CompressedChunkSizes[ANYSIZE_ARRAY];
 } COMPRESSED_DATA_INFO, *PCOMPRESSED_DATA_INFO;
 #endif
-$endif
+$endif (_NTIFS_)
diff --git a/reactos/include/xdk/sefuncs.h b/reactos/include/xdk/sefuncs.h
index 8a8e805eac4..ffb4facf0b4 100644
--- a/reactos/include/xdk/sefuncs.h
+++ b/reactos/include/xdk/sefuncs.h
@@ -378,7 +378,7 @@ $endif (_WDMDDK_)
 
 $if (_WDMDDK_ || _NTIFS_)
 #if (NTDDI_VERSION >= NTDDI_VISTA)
-$endif
+$endif (_WDMDDK_ || _NTIFS_)
 $if (_WDMDDK_)
 NTKERNELAPI
 ULONG
@@ -481,7 +481,7 @@ SeAuditTransactionStateChange(
 $endif (_NTIFS_)
 $if (_WDMDDK_ || _NTIFS_)
 #endif /* (NTDDI_VERSION >= NTDDI_VISTA) */
-$endif
+$endif (_WDMDDK_ || _NTIFS_)
 $if (_NTIFS_)
 
 #if (NTDDI_VERSION >= NTDDI_VISTA || (NTDDI_VERSION >= NTDDI_WINXPSP2 && NTDDI_VERSION < NTDDI_WS03))
diff --git a/reactos/include/xdk/setypes.h b/reactos/include/xdk/setypes.h
index 68e51c4a3cf..2cf1ccfccd6 100644
--- a/reactos/include/xdk/setypes.h
+++ b/reactos/include/xdk/setypes.h
@@ -303,7 +303,7 @@ typedef struct _SE_ADT_PARAMETER_ARRAY {
 
 #endif /* !_NTLSA_AUDIT_ */
 #endif /* !_NTLSA_IFS_ */
-$endif
+$endif (_WDMDDK_)
 $if (_NTDDK_)
 #define SE_UNSOLICITED_INPUT_PRIVILEGE    6
 
@@ -392,7 +392,7 @@ typedef enum _WELL_KNOWN_SID_TYPE {
   WinConsoleLogonSid = 81,
   WinThisOrganizationCertificateSid = 82,
 } WELL_KNOWN_SID_TYPE;
-$endif
+$endif (_NTDDK_)
 $if (_NTIFS_)
 #ifndef SID_IDENTIFIER_AUTHORITY_DEFINED
 #define SID_IDENTIFIER_AUTHORITY_DEFINED
@@ -1131,4 +1131,14 @@ typedef struct _SE_EXPORTS {
 typedef NTSTATUS
 (NTAPI *PSE_LOGON_SESSION_TERMINATED_ROUTINE)(
   IN PLUID LogonId);
+
+typedef struct _SECURITY_CLIENT_CONTEXT {
+  SECURITY_QUALITY_OF_SERVICE SecurityQos;
+  PACCESS_TOKEN ClientToken;
+  BOOLEAN DirectlyAccessClientToken;
+  BOOLEAN DirectAccessEffectiveOnly;
+  BOOLEAN ServerIsRemote;
+  TOKEN_CONTROL ClientTokenControl;
+} SECURITY_CLIENT_CONTEXT, *PSECURITY_CLIENT_CONTEXT;
+
 $endif (_NTIFS_)
diff --git a/reactos/include/xdk/zwfuncs.h b/reactos/include/xdk/zwfuncs.h
index f8e5c49694c..8fa911e6289 100644
--- a/reactos/include/xdk/zwfuncs.h
+++ b/reactos/include/xdk/zwfuncs.h
@@ -642,7 +642,7 @@ $endif (_WDMDDK_)
 
 $if (_WDMDDK_ || _NTIFS_)
 #if (NTDDI_VERSION >= NTDDI_VISTA)
-$endif
+$endif (_WDMDDK_ || _NTIFS_)
 $if (_WDMDDK_)
 
 NTSYSAPI
@@ -1025,7 +1025,7 @@ ZwFlushBuffersFile(
 $endif (_NTIFS_)
 $if (_WDMDDK_ || _NTIFS_)
 #endif /* (NTDDI_VERSION >= NTDDI_VISTA) */
-$endif
+$endif (_WDMDDK_ || _NTIFS_)
 #if (NTDDI_VERSION >= NTDDI_WIN7)
 $if (_WDMDDK_)