diff --git a/reactos/include/psdk/ks.h b/reactos/include/psdk/ks.h
index cb241fca682..6619bde2c96 100644
--- a/reactos/include/psdk/ks.h
+++ b/reactos/include/psdk/ks.h
@@ -1196,6 +1196,18 @@ typedef struct
 #define KSPROPERTY_MEMBER_VALUES        0x00000003
 #define KSPROPERTY_MEMBER_FLAG_DEFAULT  KSPROPERTY_MEMBER_RANGES
 
+typedef struct
+{
+} KSPROPERTY_POSITIONS, *PKSPROPERTY_POSITIONS;
+
+typedef struct
+{
+} KSPROPERTY_SERIAL, *PKSPROPERTY_SERIAL;
+
+typedef struct
+{
+} KSPROPERTY_SERIALHDR, *PKSPROPERTY_SERIALHDR;
+
 typedef struct
 {
 } KSPROPERTY_BOUNDS_LONG, *PKSPROPERTY_BOUNDS_LONG;
@@ -1208,6 +1220,10 @@ typedef struct
 {
 } KSPROPERTY_DESCRIPTION, *PKSPROPERTY_DESCRIPTION;
 
+typedef struct
+{
+} KSPROPERTY_MEDIAAVAILABLE, *PKSPROPERTY_MEDIAAVAILABLE;
+
 
 typedef struct
 {
@@ -1228,6 +1244,7 @@ typedef struct {
     const KSPROPERTY_MEMBERSLIST*   MembersList;
 } KSPROPERTY_VALUES, *PKSPROPERTY_VALUES;
 
+#if defined(_NTDDK_)
 typedef NTSTATUS (*PFNKSHANDLER)(
     IN  PIRP Irp,
     IN  PKSIDENTIFIER Request,
@@ -1254,23 +1271,6 @@ typedef struct
     ULONG SerializedSize;
 } KSPROPERTY_ITEM, *PKSPROPERTY_ITEM;
 
-typedef struct
-{
-} KSPROPERTY_MEDIAAVAILABLE, *PKSPROPERTY_MEDIAAVAILABLE;
-
-
-
-typedef struct
-{
-} KSPROPERTY_POSITIONS, *PKSPROPERTY_POSITIONS;
-
-typedef struct
-{
-} KSPROPERTY_SERIAL, *PKSPROPERTY_SERIAL;
-
-typedef struct
-{
-} KSPROPERTY_SERIALHDR, *PKSPROPERTY_SERIALHDR;
 
 typedef
 BOOLEAN
@@ -1305,6 +1305,8 @@ typedef struct
     const KSFASTPROPERTY_ITEM* FastIoTable;
 } KSPROPERTY_SET, *PKSPROPERTY_SET;
 
+#endif
+
 typedef struct
 {
 } KSPROPERTY_STEPPING_LONG, *PKSPROPERTY_STEPPING_LONG;
@@ -1531,6 +1533,8 @@ typedef struct
 {
 } KSPIN_DISPATCH, *PKSPIN_DISPATCH;
 
+#if defined(_NTDDK_)
+
 typedef struct
 {
     ULONG PropertySetsCount;
@@ -1547,8 +1551,27 @@ typedef struct
 #endif
 } KSAUTOMATION_TABLE, *PKSAUTOMATION_TABLE;
 
+
+
 typedef struct
 {
+    ULONG                   InterfacesCount;
+    const KSPIN_INTERFACE*  Interfaces;
+    ULONG                   MediumsCount;
+    const KSPIN_MEDIUM*     Mediums;
+    ULONG                   DataRangesCount;
+    const PKSDATARANGE*     DataRanges;
+    KSPIN_DATAFLOW          DataFlow;
+    KSPIN_COMMUNICATION     Communication;
+    const GUID*             Category;
+    const GUID*             Name;
+    union {
+        LONGLONG            Reserved;
+        struct {
+            ULONG           ConstrainedDataRangesCount;
+            PKSDATARANGE*   ConstrainedDataRanges;
+        };
+    };
 } KSPIN_DESCRIPTOR, *PKSPIN_DESCRIPTOR;
 
 /* TODO */
@@ -1611,16 +1634,6 @@ typedef struct
     KSSTATE ClientState;
 } KSPIN, *PKSPIN;
 
-typedef struct
-{
-    KSPIN_INTERFACE Interface;
-    KSPIN_MEDIUM Medium;
-    ULONG PinId;
-    HANDLE PinToHandle;
-    KSPRIORITY Priority;
-} KSPIN_CONNECT, *PKSPIN_CONNECT;
-
-
 #define DEFINE_KSPROPERTY_ITEM_PIN_CINSTANCES(Handler)\
     DEFINE_KSPROPERTY_ITEM(\
         KSPROPERTY_PIN_CINSTANCES,\
@@ -1785,6 +1798,17 @@ void
 #define DEFINE_KSPROPERTY_TABLE(tablename)\
     const KSPROPERTY_ITEM tablename[] =
 
+#endif
+
+typedef struct
+{
+    KSPIN_INTERFACE Interface;
+    KSPIN_MEDIUM Medium;
+    ULONG PinId;
+    HANDLE PinToHandle;
+    KSPRIORITY Priority;
+} KSPIN_CONNECT, *PKSPIN_CONNECT;
+
 /* ===============================================================
     Topology
 */