diff --git a/reactos/dll/directx/dinput/dinput.rbuild b/reactos/dll/directx/dinput/dinput.rbuild
index cb8b9afd244..127853bc2b4 100644
--- a/reactos/dll/directx/dinput/dinput.rbuild
+++ b/reactos/dll/directx/dinput/dinput.rbuild
@@ -4,7 +4,6 @@
0x600
-
.
include/reactos/wine
wine
diff --git a/reactos/dll/directx/dplayx/dplayx.rbuild b/reactos/dll/directx/dplayx/dplayx.rbuild
index 17dfda01ce1..2a6037b37b9 100644
--- a/reactos/dll/directx/dplayx/dplayx.rbuild
+++ b/reactos/dll/directx/dplayx/dplayx.rbuild
@@ -3,7 +3,6 @@
-
.
include/reactos/wine
wine
diff --git a/reactos/dll/directx/wine/d3d8/d3d8.rbuild b/reactos/dll/directx/wine/d3d8/d3d8.rbuild
index c791d4a6d5f..13ccdacc539 100644
--- a/reactos/dll/directx/wine/d3d8/d3d8.rbuild
+++ b/reactos/dll/directx/wine/d3d8/d3d8.rbuild
@@ -6,7 +6,7 @@
include/reactos/wine
-
+
uuid
wine
user32
diff --git a/reactos/include/psdk/winuser.h b/reactos/include/psdk/winuser.h
index 78377718725..7e9cd301754 100644
--- a/reactos/include/psdk/winuser.h
+++ b/reactos/include/psdk/winuser.h
@@ -3115,6 +3115,11 @@ typedef struct tagICONMETRICSW {
int iTitleWrap;
LOGFONTW lfFont;
} ICONMETRICSW,*LPICONMETRICSW;
+#ifdef UNICODE
+typedef ICONMETRICSW ICONMETRICS,*LPICONMETRICS;
+#else /* UNICODE */
+typedef ICONMETRICSA ICONMETRICS,*LPICONMETRICS;
+#endif /* UNICODE */
#endif /* NOGDI */
typedef struct tagMINIMIZEDMETRICS {
UINT cbSize;
@@ -3167,6 +3172,11 @@ typedef struct tagNONCLIENTMETRICSW {
LOGFONTW lfStatusFont;
LOGFONTW lfMessageFont;
} NONCLIENTMETRICSW,*LPNONCLIENTMETRICSW;
+#ifdef UNICODE
+typedef NONCLIENTMETRICSW NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
+#else /* UNICODE */
+typedef NONCLIENTMETRICSA NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
+#endif /* UNICODE */
#endif
typedef struct tagSERIALKEYSA {
UINT cbSize;
@@ -4485,8 +4495,6 @@ typedef MONITORINFOEXW MONITORINFOEX, *LPMONITORINFOEX;
#define wvsprintf wvsprintfW
#ifndef NOGDI
-typedef ICONMETRICSW ICONMETRICS,*LPICONMETRICS;
-typedef NONCLIENTMETRICSW NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
#define ChangeDisplaySettings ChangeDisplaySettingsW
#define ChangeDisplaySettingsEx ChangeDisplaySettingsExW
#define CreateDesktop CreateDesktopW
@@ -4653,8 +4661,6 @@ typedef MONITORINFOEXA MONITORINFOEX, *LPMONITORINFOEX;
#define wsprintf wsprintfA
#define wvsprintf wvsprintfA
#if defined(_WINGDI_) && !defined(NOGDI)
-typedef ICONMETRICSA ICONMETRICS,*LPICONMETRICS;
-typedef NONCLIENTMETRICSA NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
#define ChangeDisplaySettings ChangeDisplaySettingsA
#define ChangeDisplaySettingsEx ChangeDisplaySettingsExA
#define CreateDesktop CreateDesktopA