diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h
index 949fd3a0637..1122e7fcc48 100644
--- a/include/ddk/ntifs.h
+++ b/include/ddk/ntifs.h
@@ -719,8 +719,6 @@ typedef enum _OBJECT_INFORMATION_CLASS {
   MaxObjectInfoClass /* FIXME, not in WDK */
 } OBJECT_INFORMATION_CLASS;
 
-#if (NTDDI_VERSION >= NTDDI_NT4)
-
 NTSYSCALLAPI
 NTSTATUS
 NTAPI
@@ -731,8 +729,6 @@ NtQueryObject(
   IN ULONG ObjectInformationLength,
   OUT PULONG ReturnLength OPTIONAL);
 
-#endif
-
 #if (NTDDI_VERSION >= NTDDI_WIN2K)
 
 NTSYSCALLAPI
diff --git a/include/xdk/iotypes.h b/include/xdk/iotypes.h
index 7263c67badd..aac22cb3668 100644
--- a/include/xdk/iotypes.h
+++ b/include/xdk/iotypes.h
@@ -2574,7 +2574,7 @@ typedef NTSTATUS
   ULONG GpeNumber,
   KINTERRUPT_MODE Mode,
   BOOLEAN Shareable,
-  PGPE_SERVICE_ROUTINE2 ServiceRoutine,
+  PGPE_SERVICE_ROUTINE ServiceRoutine,
   PVOID ServiceContext,
   PVOID *ObjectContext);
 
diff --git a/include/xdk/zwfuncs.h b/include/xdk/zwfuncs.h
index d604777d184..3299df523ee 100644
--- a/include/xdk/zwfuncs.h
+++ b/include/xdk/zwfuncs.h
@@ -399,7 +399,7 @@ $endif
 
 $if (_WDMDDK_)
 
-#if (NTDDI_VERSION >= NTDDI_WIN2003)
+#if (NTDDI_VERSION >= NTDDI_WS03)
 NTSYSCALLAPI
 NTSTATUS
 NTAPI