diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h
index 7b1365b9225..9b60665559d 100644
--- a/include/ddk/wdm.h
+++ b/include/ddk/wdm.h
@@ -1794,6 +1794,7 @@ typedef struct _MDL {
     ULONG ByteCount;
     ULONG ByteOffset;
 } MDL, *PMDL;
+typedef MDL *PMDLX;
 
 typedef enum _MEMORY_CACHING_TYPE_ORIG {
   MmFrameBufferCached = 2
@@ -1997,8 +1998,9 @@ NTKERNELAPI
 VOID
 NTAPI
 MmBuildMdlForNonPagedPool(
-  IN OUT PMDL  MemoryDescriptorList);
+  IN OUT PMDLX  MemoryDescriptorList);
 
+//DECLSPEC_DEPRECATED_DDK
 NTKERNELAPI
 PMDL
 NTAPI
@@ -2123,6 +2125,15 @@ MmUnmapIoSpace(
   IN PVOID  BaseAddress,
   IN SIZE_T  NumberOfBytes);
 
+NTKERNELAPI
+VOID
+NTAPI
+MmProbeAndLockProcessPages(
+  IN OUT PMDL  MemoryDescriptorList,
+  IN PEPROCESS  Process,
+  IN KPROCESSOR_MODE  AccessMode,
+  IN LOCK_OPERATION  Operation);
+
 NTKERNELAPI
 VOID
 NTAPI
@@ -2170,15 +2181,6 @@ MmMapLockedPagesWithReservedMapping(
   IN PMDL  MemoryDescriptorList,
   IN MEMORY_CACHING_TYPE  CacheType);
 
-NTKERNELAPI
-VOID
-NTAPI
-MmProbeAndLockProcessPages(
-  IN OUT PMDL  MemoryDescriptorList,
-  IN PEPROCESS  Process,
-  IN KPROCESSOR_MODE  AccessMode,
-  IN LOCK_OPERATION  Operation);
-
 NTKERNELAPI
 NTSTATUS
 NTAPI
@@ -2793,7 +2795,12 @@ typedef struct _CM_PARTIAL_RESOURCE_DESCRIPTOR {
       ULONG Length;
     } Port;
     struct {
+#if defined(NT_PROCESSOR_GROUPS)
+      USHORT Level;
+      USHORT Group;
+#else
       ULONG Level;
+#endif
       ULONG Vector;
       KAFFINITY Affinity;
     } Interrupt;
@@ -2801,17 +2808,26 @@ typedef struct _CM_PARTIAL_RESOURCE_DESCRIPTOR {
     struct {
       __GNU_EXTENSION union {
         struct {
+#if defined(NT_PROCESSOR_GROUPS)
+          USHORT Group;
+#else
           USHORT Reserved;
+#endif
           USHORT MessageCount;
           ULONG Vector;
           KAFFINITY Affinity;
         } Raw;
         struct {
+#if defined(NT_PROCESSOR_GROUPS)
+          USHORT Level;
+          USHORT Group;
+#else
           ULONG Level;
+#endif
           ULONG Vector;
           KAFFINITY Affinity;
         } Translated;
-      };
+      } DUMMYUNIONNAME;
     } MessageInterrupt;
 #endif
     struct {
diff --git a/include/ddk/winddk.h b/include/ddk/winddk.h
index b7a45a859c3..aef23200d55 100644
--- a/include/ddk/winddk.h
+++ b/include/ddk/winddk.h
@@ -3650,6 +3650,7 @@ RtlLargeIntegerDivide(
   IN OUT PLARGE_INTEGER  Remainder);
 #endif
 
+#ifndef _X86_
 NTKERNELAPI
 INTERLOCKED_RESULT
 NTAPI
@@ -3671,6 +3672,7 @@ NTAPI
 ExInterlockedIncrementLong(
   IN PLONG  Addend,
   IN PKSPIN_LOCK  Lock);
+#endif
 
 NTHALAPI
 VOID