diff --git a/sdk/include/psdk/ks.h b/sdk/include/psdk/ks.h
index 38aee9ec6ab..05a1dc9ed34 100644
--- a/sdk/include/psdk/ks.h
+++ b/sdk/include/psdk/ks.h
@@ -124,56 +124,26 @@ DEFINE_GUIDSTRUCT("e436eb8e-524f-11ce-9f53-0020af0ba770", KSDATAFORMAT_SUBTYPE_N
     I/O Control Codes
 */
 
-#define IOCTL_KS_DISABLE_EVENT \
-    CTL_CODE( \
-        FILE_DEVICE_KS, \
-        0x000, \
-        METHOD_NEITHER, \
-        FILE_ANY_ACCESS)
+#define IOCTL_KS_PROPERTY \
+    CTL_CODE(FILE_DEVICE_KS, 0x000, METHOD_NEITHER, FILE_ANY_ACCESS)
 
 #define IOCTL_KS_ENABLE_EVENT \
-    CTL_CODE( \
-        FILE_DEVICE_KS, \
-        0x001, \
-        METHOD_NEITHER, \
-        FILE_ANY_ACCESS)
+    CTL_CODE(FILE_DEVICE_KS, 0x001, METHOD_NEITHER, FILE_ANY_ACCESS)
+
+#define IOCTL_KS_DISABLE_EVENT \
+    CTL_CODE(FILE_DEVICE_KS, 0x002, METHOD_NEITHER, FILE_ANY_ACCESS)
 
-// WAS 2
 #define IOCTL_KS_METHOD \
-    CTL_CODE( \
-        FILE_DEVICE_KS, \
-        0x003, \
-        METHOD_NEITHER, \
-        FILE_ANY_ACCESS)
-
-// WAS 3
-#define IOCTL_KS_PROPERTY \
-    CTL_CODE( \
-        FILE_DEVICE_KS, \
-        0x000, \
-        METHOD_NEITHER, \
-        FILE_ANY_ACCESS)
+    CTL_CODE(FILE_DEVICE_KS, 0x003, METHOD_NEITHER, FILE_ANY_ACCESS)
 
 #define IOCTL_KS_WRITE_STREAM \
-    CTL_CODE( \
-        FILE_DEVICE_KS, \
-        0x004, \
-        METHOD_NEITHER, \
-        FILE_WRITE_ACCESS)
+    CTL_CODE(FILE_DEVICE_KS, 0x004, METHOD_NEITHER, FILE_WRITE_ACCESS)
 
 #define IOCTL_KS_READ_STREAM \
-    CTL_CODE( \
-        FILE_DEVICE_KS, \
-        0x005, \
-        METHOD_NEITHER, \
-        FILE_READ_ACCESS)
+    CTL_CODE(FILE_DEVICE_KS, 0x005, METHOD_NEITHER, FILE_READ_ACCESS)
 
 #define IOCTL_KS_RESET_STATE \
-    CTL_CODE( \
-        FILE_DEVICE_KS, \
-        0x006, \
-        METHOD_NEITHER, \
-        FILE_ANY_ACCESS)
+    CTL_CODE(FILE_DEVICE_KS, 0x006, METHOD_NEITHER, FILE_ANY_ACCESS)
 
 /* ===============================================================
     Categories
@@ -2189,7 +2159,8 @@ typedef struct _KSSTREAM_POINTER_OFFSET KSSTREAM_POINTER_OFFSET, *PKSSTREAM_POIN
 typedef struct _KSMAPPING KSMAPPING, *PKSMAPPING;
 typedef struct _KSPROCESSPIN KSPROCESSPIN, *PKSPROCESSPIN;
 
-#define IOCTL_KS_HANDSHAKE             CTL_CODE(FILE_DEVICE_KS, 0x007, METHOD_NEITHER, FILE_ANY_ACCESS)
+#define IOCTL_KS_HANDSHAKE \
+    CTL_CODE(FILE_DEVICE_KS, 0x007, METHOD_NEITHER, FILE_ANY_ACCESS)
 
 typedef struct {
   GUID ProtocolId;