diff --git a/reactos/include/ddk/bdasup.h b/reactos/include/ddk/bdasup.h
index 0bdd590d337..b74e8ab7e4f 100644
--- a/reactos/include/ddk/bdasup.h
+++ b/reactos/include/ddk/bdasup.h
@@ -2,7 +2,7 @@
 extern "C" {
 #endif
 
-/* Helper macro to enable gcc's extension.  */
+/* Helper macro to enable gcc's extension. */
 #ifndef __GNU_EXTENSION
 #ifdef __GNUC__
 #define __GNU_EXTENSION __extension__
@@ -12,39 +12,42 @@ extern "C" {
 #endif
 
 #define STDMETHODCALLTYPE __stdcall
+
+#ifndef _WDMDDK_
 typedef GUID *PGUID;
+#endif
 
 /* Types */
 
 typedef struct _BDA_PIN_PAIRING
 {
-    ULONG ulInputPin;
-    ULONG ulOutputPin;
-    ULONG ulcMaxInputsPerOutput;
-    ULONG ulcMinInputsPerOutput;
-    ULONG ulcMaxOutputsPerInput;
-    ULONG ulcMinOutputsPerInput;
-    ULONG ulcTopologyJoints;
-    const ULONG *pTopologyJoints;
+  ULONG ulInputPin;
+  ULONG ulOutputPin;
+  ULONG ulcMaxInputsPerOutput;
+  ULONG ulcMinInputsPerOutput;
+  ULONG ulcMaxOutputsPerInput;
+  ULONG ulcMinOutputsPerInput;
+  ULONG ulcTopologyJoints;
+  const ULONG *pTopologyJoints;
 } BDA_PIN_PAIRING, *PBDA_PIN_PAIRING;
 
 typedef struct _BDA_FILTER_TEMPLATE
 {
-    const KSFILTER_DESCRIPTOR *pFilterDescriptor;
-    ULONG ulcPinPairs;
-    const BDA_PIN_PAIRING *pPinPairs;
+  const KSFILTER_DESCRIPTOR *pFilterDescriptor;
+  ULONG ulcPinPairs;
+  const BDA_PIN_PAIRING *pPinPairs;
 } BDA_FILTER_TEMPLATE, *PBDA_FILTER_TEMPLATE;
 
 
 typedef struct _KSM_PIN
 {
-    KSMETHOD    Method;
+  KSMETHOD Method;
     __GNU_EXTENSION union
     {
-        ULONG       PinId;
-        ULONG       PinType;
-    };
-    ULONG       Reserved;
+    ULONG PinId;
+    ULONG PinType;
+  };
+  ULONG Reserved;
 } KSM_PIN, * PKSM_PIN;
 
 /* Functions */
@@ -53,108 +56,108 @@ STDMETHODIMP_(NTSTATUS) BdaCheckChanges(IN PIRP  Irp);
 STDMETHODIMP_(NTSTATUS) BdaCommitChanges(IN PIRP  Irp);
 
 STDMETHODIMP_(NTSTATUS) BdaCreateFilterFactory(
-    IN PKSDEVICE  pKSDevice,
-    IN const KSFILTER_DESCRIPTOR *pFilterDescriptor,
-    IN const BDA_FILTER_TEMPLATE *pBdaFilterTemplate);
+  IN PKSDEVICE pKSDevice,
+  IN const KSFILTER_DESCRIPTOR *pFilterDescriptor,
+  IN const BDA_FILTER_TEMPLATE *pBdaFilterTemplate);
 
 STDMETHODIMP_(NTSTATUS) BdaCreateFilterFactoryEx(
-    IN  PKSDEVICE pKSDevice,
-    IN  const KSFILTER_DESCRIPTOR *pFilterDescriptor,
-    IN  const BDA_FILTER_TEMPLATE *pBdaFilterTemplate,
-    OUT PKSFILTERFACTORY  *ppKSFilterFactory);
+  IN PKSDEVICE pKSDevice,
+  IN const KSFILTER_DESCRIPTOR *pFilterDescriptor,
+  IN const BDA_FILTER_TEMPLATE *pBdaFilterTemplate,
+  OUT PKSFILTERFACTORY  *ppKSFilterFactory);
 
 STDMETHODIMP_(NTSTATUS) BdaCreatePin(
-    IN PKSFILTER pKSFilter,
-    IN ULONG ulPinType,
-    OUT ULONG *pulPinId);
+  IN PKSFILTER pKSFilter,
+  IN ULONG ulPinType,
+  OUT ULONG *pulPinId);
 
 STDMETHODIMP_(NTSTATUS) BdaCreateTopology(
-    IN PKSFILTER pKSFilter,
-    IN ULONG InputPinId,
-    IN ULONG OutputPinId);
+  IN PKSFILTER pKSFilter,
+  IN ULONG InputPinId,
+  IN ULONG OutputPinId);
 
 STDMETHODIMP_(NTSTATUS) BdaDeletePin(
-    IN PKSFILTER pKSFilter,
-    IN ULONG *pulPinId);
+  IN PKSFILTER pKSFilter,
+  IN ULONG *pulPinId);
 
 STDMETHODIMP_(NTSTATUS) BdaFilterFactoryUpdateCacheData(
-    IN PKSFILTERFACTORY pFilterFactory,
-    IN const KSFILTER_DESCRIPTOR *pFilterDescriptor OPTIONAL);
+  IN PKSFILTERFACTORY pFilterFactory,
+  IN const KSFILTER_DESCRIPTOR *pFilterDescriptor OPTIONAL);
 
 STDMETHODIMP_(NTSTATUS) BdaGetChangeState(
-    IN PIRP Irp,
-    OUT BDA_CHANGE_STATE *pChangeState);
+  IN PIRP Irp,
+  OUT BDA_CHANGE_STATE *pChangeState);
 
 STDMETHODIMP_(NTSTATUS) BdaInitFilter(
-    IN PKSFILTER pKSFilter,
-    IN const BDA_FILTER_TEMPLATE *pBdaFilterTemplate);
+  IN PKSFILTER pKSFilter,
+  IN const BDA_FILTER_TEMPLATE *pBdaFilterTemplate);
 
 STDMETHODIMP_(NTSTATUS) BdaMethodCreatePin(
-    IN PIRP Irp,
-    IN KSMETHOD *pKSMethod,
-    OUT ULONG *pulPinFactoryID);
+  IN PIRP Irp,
+  IN KSMETHOD *pKSMethod,
+  OUT ULONG *pulPinFactoryID);
 
 STDMETHODIMP_(NTSTATUS) BdaMethodCreateTopology(
-    IN PIRP Irp,
-    IN KSMETHOD *pKSMethod,
-    OPTIONAL PVOID pvIgnored);
+  IN PIRP Irp,
+  IN KSMETHOD *pKSMethod,
+  OPTIONAL PVOID pvIgnored);
 
 STDMETHODIMP_(NTSTATUS) BdaMethodDeletePin(
-    IN PIRP Irp,
-    IN KSMETHOD *pKSMethod,
-    OPTIONAL PVOID pvIgnored);
+  IN PIRP Irp,
+  IN KSMETHOD *pKSMethod,
+  OPTIONAL PVOID pvIgnored);
 
 STDMETHODIMP_(NTSTATUS) BdaPropertyGetControllingPinId(
-    IN PIRP Irp,
-    IN KSP_BDA_NODE_PIN *pProperty,
-    OUT ULONG *pulControllingPinId);
+  IN PIRP Irp,
+  IN KSP_BDA_NODE_PIN *pProperty,
+  OUT ULONG *pulControllingPinId);
 
 STDMETHODIMP_(NTSTATUS) BdaPropertyGetPinControl(
-    IN PIRP Irp,
-    IN KSPROPERTY *pKSProperty,
-    OUT ULONG *pulProperty);
+  IN PIRP Irp,
+  IN KSPROPERTY *pKSProperty,
+  OUT ULONG *pulProperty);
 
 STDMETHODIMP_(NTSTATUS) BdaPropertyNodeDescriptors(
-    IN PIRP Irp,
-    IN KSPROPERTY *pKSProperty,
-    OUT BDANODE_DESCRIPTOR *pNodeDescriptorProperty);
+  IN PIRP Irp,
+  IN KSPROPERTY *pKSProperty,
+  OUT BDANODE_DESCRIPTOR *pNodeDescriptorProperty);
 
 STDMETHODIMP_(NTSTATUS) BdaPropertyNodeEvents(
-    IN PIRP Irp,
-    IN KSP_NODE *pKSProperty,
-    OUT GUID *pguidProperty);
+  IN PIRP Irp,
+  IN KSP_NODE *pKSProperty,
+  OUT GUID *pguidProperty);
 
 STDMETHODIMP_(NTSTATUS) BdaPropertyNodeMethods(
-    IN PIRP Irp,
-    IN KSP_NODE *pKSProperty,
-    OUT GUID *pguidProperty);
+  IN PIRP Irp,
+  IN KSP_NODE *pKSProperty,
+  OUT GUID *pguidProperty);
 
 STDMETHODIMP_(NTSTATUS) BdaPropertyNodeProperties(
-    IN PIRP Irp,
-    IN KSP_NODE *pKSProperty,
-    OUT GUID *pguidProperty);
+  IN PIRP Irp,
+  IN KSP_NODE *pKSProperty,
+  OUT GUID *pguidProperty);
 
 STDMETHODIMP_(NTSTATUS) BdaPropertyNodeTypes(
-    IN PIRP Irp,
-    IN KSPROPERTY *pKSProperty,
-    OUT ULONG *pulProperty);
+  IN PIRP Irp,
+  IN KSPROPERTY *pKSProperty,
+  OUT ULONG *pulProperty);
 
 STDMETHODIMP_(NTSTATUS) BdaPropertyPinTypes(
-    IN PIRP Irp,
-    IN KSPROPERTY *pKSProperty,
-    OUT ULONG *pulProperty);
+  IN PIRP Irp,
+  IN KSPROPERTY *pKSProperty,
+  OUT ULONG *pulProperty);
 
 STDMETHODIMP_(NTSTATUS) BdaPropertyTemplateConnections(
-    IN PIRP Irp,
-    IN KSPROPERTY *pKSProperty,
-    OUT KSTOPOLOGY_CONNECTION *pConnectionProperty);
+  IN PIRP Irp,
+  IN KSPROPERTY *pKSProperty,
+  OUT KSTOPOLOGY_CONNECTION *pConnectionProperty);
 
 STDMETHODIMP_(NTSTATUS) BdaStartChanges(IN PIRP Irp);
 STDMETHODIMP_(NTSTATUS) BdaUninitFilter(IN PKSFILTER pKSFilter);
 
 STDMETHODIMP_(NTSTATUS) BdaValidateNodeProperty(
-    IN PIRP Irp,
-    IN KSPROPERTY *pKSProperty);
+  IN PIRP Irp,
+  IN KSPROPERTY *pKSProperty);
 
 #if defined(__cplusplus)
 }
diff --git a/reactos/include/ddk/wdm.h b/reactos/include/ddk/wdm.h
index 74dbadfd52f..526069d8bee 100644
--- a/reactos/include/ddk/wdm.h
+++ b/reactos/include/ddk/wdm.h
@@ -43,6 +43,10 @@
 #include <guiddef.h>
 #endif /* GUID_DEFINED */
 
+#ifndef _KTMTYPES_
+typedef GUID UOW, *PUOW;
+#endif
+
 #if (NTDDI_VERSION >= NTDDI_WINXP)
 #include <dpfilter.h>
 #endif
diff --git a/reactos/include/psdk/ktmtypes.h b/reactos/include/psdk/ktmtypes.h
index 77cf5782858..90b042f3f0b 100644
--- a/reactos/include/psdk/ktmtypes.h
+++ b/reactos/include/psdk/ktmtypes.h
@@ -72,7 +72,10 @@
 #define MAX_TRANSACTION_DESCRIPTION_LENGTH  64
 #define MAX_RESOURCEMANAGER_DESCRIPTION_LENGTH  64
 
+#ifndef _WDMDDK_
 typedef GUID UOW, *PUOW;
+#endif
+
 typedef GUID CRM_PROTOCOL_ID, *PCRM_PROTOCOL_ID;
 typedef ULONG NOTIFICATION_MASK;
 typedef ULONG SAVEPOINT_ID, *PSAVEPOINT_ID;