diff --git a/dlls/commdlg/printdlg.c b/dlls/commdlg/printdlg.c
index 3a6c98a99f2..666f7edbd28 100644
--- a/dlls/commdlg/printdlg.c
+++ b/dlls/commdlg/printdlg.c
@@ -31,16 +31,16 @@
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
-#include "wine/wingdi16.h"
 #include "winuser.h"
-#include "wine/winuser16.h"
-#include "commdlg.h"
-#include "dlgs.h"
-#include "wine/debug.h"
-#include "cderr.h"
 #include "winspool.h"
 #include "winerror.h"
 
+#include "wine/debug.h"
+
+#include "commdlg.h"
+#include "dlgs.h"
+#include "cderr.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
 
 #include "cdlg.h"
diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index 4c4f4eaa326..7d84bf699f6 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(setupapi);
 BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(
       HDEVINFO DeviceInfoSet,
       PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData,
-      PSP_DEVICE_INTERFACE_DETAIL_DATAA DeviceInterfaceDetailData,
+      PSP_DEVICE_INTERFACE_DETAIL_DATA_A DeviceInterfaceDetailData,
       DWORD DeviceInterfaceDetailDataSize,
       PDWORD RequiredSize,
       PSP_DEVINFO_DATA DeviceInfoData )
@@ -53,7 +53,7 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailA(
 BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(
       HDEVINFO DeviceInfoSet,
       PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData,
-      PSP_DEVICE_INTERFACE_DETAIL_DATAW DeviceInterfaceDetailData,
+      PSP_DEVICE_INTERFACE_DETAIL_DATA_W DeviceInterfaceDetailData,
       DWORD DeviceInterfaceDetailDataSize,
       PDWORD RequiredSize,
       PSP_DEVINFO_DATA DeviceInfoData )
diff --git a/dlls/winmm/joystick.c b/dlls/winmm/joystick.c
index e493e104436..e21831dc0ca 100644
--- a/dlls/winmm/joystick.c
+++ b/dlls/winmm/joystick.c
@@ -42,7 +42,7 @@
 #include "winuser.h"
 #include "winnls.h"
 
-#include "winemm.h"
+#include "mmddk.h"
 
 #include "wine/debug.h"
 
diff --git a/include/setupapi.h b/include/setupapi.h
index bccee22a381..790d34670d3 100644
--- a/include/setupapi.h
+++ b/include/setupapi.h
@@ -138,20 +138,22 @@ typedef struct _SP_DEVICE_INTERFACE_DATA
    ULONG_PTR  Reserved;
 } SP_DEVICE_INTERFACE_DATA, *PSP_DEVICE_INTERFACE_DATA;
 
-typedef struct _SP_DEVICE_INTERFACE_DETAIL_DATAA
+typedef struct _SP_DEVICE_INTERFACE_DETAIL_DATA_A
 {
    DWORD      cbSize;
    CHAR       DevicePath[ANYSIZE_ARRAY];
-} SP_DEVICE_INTERFACE_DETAIL_DATAA, *PSP_DEVICE_INTERFACE_DETAIL_DATAA;
+} SP_DEVICE_INTERFACE_DETAIL_DATA_A, *PSP_DEVICE_INTERFACE_DETAIL_DATA_A;
 
-typedef struct _SP_DEVICE_INTERFACE_DETAIL_DATAW
+typedef struct _SP_DEVICE_INTERFACE_DETAIL_DATA_W
 {
    DWORD      cbSize;
    WCHAR      DevicePath[ANYSIZE_ARRAY];
-} SP_DEVICE_INTERFACE_DETAIL_DATAW, *PSP_DEVICE_INTERFACE_DETAIL_DATAW;
+} SP_DEVICE_INTERFACE_DETAIL_DATA_W, *PSP_DEVICE_INTERFACE_DETAIL_DATA_W;
 
-DECL_WINELIB_TYPE_AW(SP_DEVICE_INTERFACE_DETAIL_DATA)
-DECL_WINELIB_TYPE_AW(PSP_DEVICE_INTERFACE_DETAIL_DATA)
+#ifndef __WINESRC__
+typedef WINELIB_NAME_AW(SP_DEVICE_INTERFACE_DETAIL_DATA_) SP_DEVICE_INTERFACE_DETAIL_DATA;
+typedef WINELIB_NAME_AW(PSP_DEVICE_INTERFACE_DETAIL_DATA_) PSP_DEVICE_INTERFACE_DETAIL_DATA;
+#endif
 
 typedef struct _FILE_IN_CABINET_INFOA {
   LPCSTR NameInCabinet;