diff --git a/reactos/include/objsel.h b/reactos/include/objsel.h
index 2d21a901afa..315227077b4 100644
--- a/reactos/include/objsel.h
+++ b/reactos/include/objsel.h
@@ -21,6 +21,9 @@
 extern "C" {
 #endif
 
+#include <objidl.h>
+#include <oaidl.h>
+
 /* the PSDK headers defines it as EXTERN_C const GUID CLSID_DsObjectPicker = {...},
  * but that's not a good idea when EXTERN_C is extern... */
 #ifndef DEFINE_GUID
@@ -164,7 +167,7 @@ DECLARE_INTERFACE_(IDsObjectPicker,IUnknown)
     STDMETHOD_(ULONG,Release)(THIS) PURE;
     /*** IDsObjectPicker methods ***/
     STDMETHOD_(HRESULT,Initialize)(THIS_ PDSOP_INIT_INFO pInitInfo) PURE;
-    STDMETHOD_(HRESULT,InvokeDialog)(THIS_ HWND hwndParent, IDataObject** ppdoSelections) PURE;
+    STDMETHOD_(HRESULT,InvokeDialog)(THIS_ HWND hwndParent, IDataObject ** ppdoSelections) PURE;
 };
 #undef INTERFACE
 
diff --git a/reactos/include/reactos/wine/msacm.h b/reactos/include/reactos/wine/msacm.h
index 3323c2601c0..4e06e5954b9 100644
--- a/reactos/include/reactos/wine/msacm.h
+++ b/reactos/include/reactos/wine/msacm.h
@@ -318,9 +318,15 @@ typedef struct _ACMDRIVERDETAILSW
   WCHAR    szFeatures[ACMDRIVERDETAILS_FEATURES_CHARS];
 } ACMDRIVERDETAILSW, *PACMDRIVERDETAILSW, *LPACMDRIVERDETAILSW;
 
-DECL_WINELIB_TYPE_AW(ACMDRIVERDETAILS)
-DECL_WINELIB_TYPE_AW(PACMDRIVERDETAILS)
-DECL_WINELIB_TYPE_AW(LPACMDRIVERDETAILS)
+#if defined(UNICODE) || defined (_UNICODE)
+typedef struct ACMDRIVERDETAILSW ACMDRIVERDETAILS;
+typedef PACMDRIVERDETAILSW PACMDRIVERDETAILS;
+typedef LPACMDRIVERDETAILSW LPACMDRIVERDETAILS;
+#else
+typedef struct ACMDRIVERDETAILSA ACMDRIVERDETAILS;
+typedef PACMDRIVERDETAILSA PACMDRIVERDETAILS;
+typedef LPACMDRIVERDETAILSA LPACMDRIVERDETAILS;
+#endif
 
 typedef struct _ACMFILTERCHOOSEA
 {
@@ -374,9 +380,15 @@ typedef struct _ACMFILTERCHOOSEW
   ACMFILTERCHOOSEHOOKPROCW pfnHook;
 } ACMFILTERCHOOSEW, *PACMFILTERCHOOSEW, *LPACMFILTERCHOOSEW;
 
-DECL_WINELIB_TYPE_AW(ACMFILTERCHOOSE)
-DECL_WINELIB_TYPE_AW(PACMFILTERCHOOSE)
-DECL_WINELIB_TYPE_AW(LPACMFILTERCHOOSE)
+#if defined(UNICODE) || defined (_UNICODE)
+typedef struct ACMFILTERCHOOSEW ACMFILTERCHOOSE;
+typedef PACMFILTERCHOOSEW PACMFILTERCHOOSE;
+typedef LPACMFILTERCHOOSEW LPACMFILTERCHOOSE;
+#else
+typedef struct ACMFILTERCHOOSEA ACMFILTERCHOOSE;
+typedef PACMFILTERCHOOSEA PACMFILTERCHOOSE;
+typedef LPACMFILTERCHOOSEA LPACMFILTERCHOOSE;
+#endif
 
 typedef struct _ACMFILTERDETAILSA
 {
@@ -400,9 +412,15 @@ typedef struct _ACMFILTERDETAILSW
   WCHAR          szFilter[ACMFILTERDETAILS_FILTER_CHARS];
 } ACMFILTERDETAILSW, *PACMFILTERDETAILSW, *LPACMFILTERDETAILSW;
 
-DECL_WINELIB_TYPE_AW(ACMFILTERDETAILS)
-DECL_WINELIB_TYPE_AW(PACMFILTERDETAILS)
-DECL_WINELIB_TYPE_AW(LPACMFILTERDETAILS)
+#if defined(UNICODE) || defined (_UNICODE)
+typedef struct ACMFILTERDETAILSW ACMFILTERDETAILS;
+typedef PACMFILTERDETAILSW PACMFILTERDETAILS;
+typedef LPACMFILTERDETAILSW LPACMFILTERDETAILS;
+#else
+typedef struct ACMFILTERDETAILSA ACMFILTERDETAILS;
+typedef PACMFILTERDETAILSA PACMFILTERDETAILS;
+typedef LPACMFILTERDETAILSA LPACMFILTERDETAILS;
+#endif
 
 typedef struct _ACMFILTERTAGDETAILSA
 {
@@ -426,9 +444,15 @@ typedef struct _ACMFILTERTAGDETAILSW
   WCHAR szFilterTag[ACMFILTERTAGDETAILS_FILTERTAG_CHARS];
 } ACMFILTERTAGDETAILSW, *PACMFILTERTAGDETAILSW, *LPACMFILTERTAGDETAILSW;
 
-DECL_WINELIB_TYPE_AW(ACMFILTERTAGDETAILS)
-DECL_WINELIB_TYPE_AW(PACMFILTERTAGDETAILS)
-DECL_WINELIB_TYPE_AW(LPACMFILTERTAGDETAILS)
+#if defined(UNICODE) || defined (_UNICODE)
+typedef struct ACMFILTERTAGDETAILSW ACMFILTERTAGDETAILS;
+typedef PACMFILTERTAGDETAILSW PACMFILTERTAGDETAILS;
+typedef LPACMFILTERTAGDETAILSW LPACMFILTERTAGDETAILS;
+#else
+typedef struct ACMFILTERTAGDETAILSA ACMFILTERTAGDETAILS;
+typedef PACMFILTERTAGDETAILSA PACMFILTERTAGDETAILS;
+typedef LPACMFILTERTAGDETAILSA LPACMFILTERTAGDETAILS;
+#endif
 
 typedef struct _ACMFORMATCHOOSEA
 {
@@ -482,9 +506,15 @@ typedef struct _ACMFORMATCHOOSEW
   ACMFORMATCHOOSEHOOKPROCW pfnHook;
 } ACMFORMATCHOOSEW, *PACMFORMATCHOOSEW, *LPACMFORMATCHOOSEW;
 
-DECL_WINELIB_TYPE_AW(ACMFORMATCHOOSE)
-DECL_WINELIB_TYPE_AW(PACMFORMATCHOOSE)
-DECL_WINELIB_TYPE_AW(LPACMFORMATCHOOSE)
+#if defined(UNICODE) || defined (_UNICODE)
+typedef struct ACMFORMATCHOOSEW ACMFORMATCHOOSE;
+typedef PACMFORMATCHOOSEW PACMFORMATCHOOSE;
+typedef LPACMFORMATCHOOSEW LPACMFORMATCHOOSE;
+#else
+typedef struct ACMFORMATCHOOSEA ACMFORMATCHOOSE;
+typedef PACMFORMATCHOOSEA PACMFORMATCHOOSE;
+typedef LPACMFORMATCHOOSEA LPACMFORMATCHOOSE;
+#endif
 
 typedef struct _ACMFORMATDETAILSA
 {
@@ -508,9 +538,15 @@ typedef struct _ACMFORMATDETAILSW
     WCHAR           szFormat[ACMFORMATDETAILS_FORMAT_CHARS];
 } ACMFORMATDETAILSW, *PACMFORMATDETAILSW, *LPACMFORMATDETAILSW;
 
-DECL_WINELIB_TYPE_AW(ACMFORMATDETAILS)
-DECL_WINELIB_TYPE_AW(PACMFORMATDETAILS)
-DECL_WINELIB_TYPE_AW(LPACMFORMATDETAILS)
+#if defined(UNICODE) || defined (_UNICODE)
+typedef struct ACMFORMATDETAILSW ACMFORMATDETAILS;
+typedef PACMFORMATDETAILSW PACMFORMATDETAILS;
+typedef LPACMFORMATDETAILSW LPACMFORMATDETAILS;
+#else
+typedef struct ACMFORMATDETAILSA ACMFORMATDETAILS;
+typedef PACMFORMATDETAILSA PACMFORMATDETAILS;
+typedef LPACMFORMATDETAILSA LPACMFORMATDETAILS;
+#endif
 
 typedef struct _ACMFORMATTAGDETAILSA
 {
@@ -534,9 +570,15 @@ typedef struct _ACMFORMATTAGDETAILSW
   WCHAR szFormatTag[ACMFORMATTAGDETAILS_FORMATTAG_CHARS];
 } ACMFORMATTAGDETAILSW, *PACMFORMATTAGDETAILSW, *LPACMFORMATTAGDETAILSW;
 
-DECL_WINELIB_TYPE_AW(ACMFORMATTAGDETAILS)
-DECL_WINELIB_TYPE_AW(PACMFORMATTAGDETAILS)
-DECL_WINELIB_TYPE_AW(LPACMFORMATTAGDETAILS)
+#if defined(UNICODE) || defined (_UNICODE)
+typedef struct ACMFORMATTAGDETAILSW ACMFORMATTAGDETAILS;
+typedef PACMFORMATTAGDETAILSW PACMFORMATTAGDETAILS;
+typedef LPACMFORMATTAGDETAILSW LPACMFORMATTAGDETAILS;
+#else
+typedef struct ACMFORMATTAGDETAILSA ACMFORMATTAGDETAILS;
+typedef PACMFORMATTAGDETAILSA PACMFORMATTAGDETAILS;
+typedef LPACMFORMATTAGDETAILSA LPACMFORMATTAGDETAILS;
+#endif
 
 typedef struct _ACMSTREAMHEADER
 {