diff --git a/rosapps/tests/DxHalTest/DxHalTest.rbuild b/rosapps/tests/DxHalTest/DxHalTest.rbuild
index 6e8f6d436c8..ed3a146ce00 100644
--- a/rosapps/tests/DxHalTest/DxHalTest.rbuild
+++ b/rosapps/tests/DxHalTest/DxHalTest.rbuild
@@ -3,6 +3,7 @@
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>gdi32</library>
 	<file>main.c</file>
 </module>
diff --git a/rosapps/tests/accelerator/accelerator.rbuild b/rosapps/tests/accelerator/accelerator.rbuild
index 642694cb4b3..59b32676b1c 100644
--- a/rosapps/tests/accelerator/accelerator.rbuild
+++ b/rosapps/tests/accelerator/accelerator.rbuild
@@ -3,6 +3,7 @@
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>gdi32</library>
 	<file>accelerator.c</file>
 </module>
diff --git a/rosapps/tests/alive/alive.rbuild b/rosapps/tests/alive/alive.rbuild
index e5d39c0b320..369699809c1 100644
--- a/rosapps/tests/alive/alive.rbuild
+++ b/rosapps/tests/alive/alive.rbuild
@@ -3,6 +3,7 @@
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>gdi32</library>
 	<file>alive.c</file>
 </module>
diff --git a/rosapps/tests/alphablend/alphablend.rbuild b/rosapps/tests/alphablend/alphablend.rbuild
index 9e195012529..843a46ba97f 100644
--- a/rosapps/tests/alphablend/alphablend.rbuild
+++ b/rosapps/tests/alphablend/alphablend.rbuild
@@ -4,6 +4,7 @@
 	<define name="__USE_W32API" />
 	<include base="alphablend">.</include>
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>gdi32</library>
 	<file>alphablend.c</file>
 	<file>alphablend.rc</file>
diff --git a/rosapps/tests/bitblt/bitblt.rbuild b/rosapps/tests/bitblt/bitblt.rbuild
index 958d1ee5bef..f55909c5320 100644
--- a/rosapps/tests/bitblt/bitblt.rbuild
+++ b/rosapps/tests/bitblt/bitblt.rbuild
@@ -4,6 +4,7 @@
 	<define name="__USE_W32API" />
 	<include base="bitblt">.</include>
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>gdi32</library>
 	<file>bitblt.c</file>
 	<file>bitblt.rc</file>
diff --git a/rosapps/tests/button/button.rbuild b/rosapps/tests/button/button.rbuild
index 798c7b3654c..0f269c14046 100644
--- a/rosapps/tests/button/button.rbuild
+++ b/rosapps/tests/button/button.rbuild
@@ -3,6 +3,7 @@
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>gdi32</library>
 	<file>buttontst.c</file>
 </module>
diff --git a/rosapps/tests/button2/button2.rbuild b/rosapps/tests/button2/button2.rbuild
index e553737600a..98a94728bab 100644
--- a/rosapps/tests/button2/button2.rbuild
+++ b/rosapps/tests/button2/button2.rbuild
@@ -3,6 +3,7 @@
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>gdi32</library>
 	<file>buttontst2.c</file>
 </module>
diff --git a/rosapps/tests/capclock/capclock.rbuild b/rosapps/tests/capclock/capclock.rbuild
index 75cb985f251..78b5a645df8 100644
--- a/rosapps/tests/capclock/capclock.rbuild
+++ b/rosapps/tests/capclock/capclock.rbuild
@@ -4,6 +4,7 @@
 	<define name="__USE_W32API" />
 	<include base="capclock">.</include>
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>gdi32</library>
 	<file>capclock.c</file>
 	<file>capclock.rc</file>
diff --git a/rosapps/tests/carets/carets.rbuild b/rosapps/tests/carets/carets.rbuild
index 0e8394fe523..bbd3acfc54d 100644
--- a/rosapps/tests/carets/carets.rbuild
+++ b/rosapps/tests/carets/carets.rbuild
@@ -4,6 +4,7 @@
 	<define name="__USE_W32API" />
 	<include base="carets">.</include>
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>gdi32</library>
 	<library>ntdll</library>
 	<file>carets.c</file>
diff --git a/rosapps/tests/combotst/combotst.rbuild b/rosapps/tests/combotst/combotst.rbuild
index 5ca773623bd..873635bd93d 100644
--- a/rosapps/tests/combotst/combotst.rbuild
+++ b/rosapps/tests/combotst/combotst.rbuild
@@ -3,6 +3,7 @@
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>gdi32</library>
 	<file>combotst.c</file>
 	<file>utils.c</file>
diff --git a/rosapps/tests/dibtest/dibtest.rbuild b/rosapps/tests/dibtest/dibtest.rbuild
index 17910a2da74..4b44f5fad73 100644
--- a/rosapps/tests/dibtest/dibtest.rbuild
+++ b/rosapps/tests/dibtest/dibtest.rbuild
@@ -3,6 +3,7 @@
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>gdi32</library>
 	<file>dibtest.c</file>
 </module>
diff --git a/rosapps/tests/dirdlg/dirdlg.rbuild b/rosapps/tests/dirdlg/dirdlg.rbuild
index 9798f6ba3a8..361f4df1c51 100644
--- a/rosapps/tests/dirdlg/dirdlg.rbuild
+++ b/rosapps/tests/dirdlg/dirdlg.rbuild
@@ -4,6 +4,7 @@
 	<define name="__USE_W32API" />
 	<include base="dirdlg">.</include>
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>gdi32</library>
 	<file>dirdlg.c</file>
 	<file>dirdlg.rc</file>
diff --git a/rosapps/tests/edit/edit.rbuild b/rosapps/tests/edit/edit.rbuild
index 8f75ea66879..3f1180bec24 100644
--- a/rosapps/tests/edit/edit.rbuild
+++ b/rosapps/tests/edit/edit.rbuild
@@ -3,6 +3,7 @@
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>gdi32</library>
 	<file>edittest.c</file>
 	<file>utils.c</file>
diff --git a/rosapps/tests/enhmetafile/enhmetafile.rbuild b/rosapps/tests/enhmetafile/enhmetafile.rbuild
index 330b705aba1..f37c9049f51 100644
--- a/rosapps/tests/enhmetafile/enhmetafile.rbuild
+++ b/rosapps/tests/enhmetafile/enhmetafile.rbuild
@@ -3,6 +3,7 @@
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>gdi32</library>
 	<file>enhmetafile.c</file>
 </module>
diff --git a/rosapps/tests/enumfonts/enumfonts.rbuild b/rosapps/tests/enumfonts/enumfonts.rbuild
index cd36f503d97..64d96b3994c 100644
--- a/rosapps/tests/enumfonts/enumfonts.rbuild
+++ b/rosapps/tests/enumfonts/enumfonts.rbuild
@@ -1,8 +1,9 @@
-<module name="enumfonts" type="win32gui" installbase="bin" installname="enumfonts.exe">
+<module name="enumfonts" type="win32gui" installbase="bin" installname="enumfonts.exe" stdlib="host">
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>gdi32</library>
 	<file>enumfonts.cpp</file>
 </module>
diff --git a/rosapps/tests/enumwnd/enumwnd.rbuild b/rosapps/tests/enumwnd/enumwnd.rbuild
index 480183b56da..71adefa1a6e 100644
--- a/rosapps/tests/enumwnd/enumwnd.rbuild
+++ b/rosapps/tests/enumwnd/enumwnd.rbuild
@@ -3,6 +3,7 @@
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>gdi32</library>
 	<file>enumwnd.c</file>
 </module>
diff --git a/rosapps/tests/enumws/enumws.rbuild b/rosapps/tests/enumws/enumws.rbuild
index 18a93ffd1c8..336845c8c32 100644
--- a/rosapps/tests/enumws/enumws.rbuild
+++ b/rosapps/tests/enumws/enumws.rbuild
@@ -3,6 +3,7 @@
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>gdi32</library>
 	<file>enumws.c</file>
 </module>
diff --git a/rosapps/tests/gradient/gradient.rbuild b/rosapps/tests/gradient/gradient.rbuild
index 43ca3b692ae..c1abf616af6 100644
--- a/rosapps/tests/gradient/gradient.rbuild
+++ b/rosapps/tests/gradient/gradient.rbuild
@@ -4,6 +4,7 @@
 	<define name="WINVER">0x0501</define>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>gdi32</library>
 	<file>gradient.c</file>
 </module>
diff --git a/rosapps/tests/hello/hello.rbuild b/rosapps/tests/hello/hello.rbuild
index 49641eaa694..6fe80047e88 100644
--- a/rosapps/tests/hello/hello.rbuild
+++ b/rosapps/tests/hello/hello.rbuild
@@ -3,6 +3,7 @@
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>gdi32</library>
 	<file>hello.c</file>
 </module>
diff --git a/rosapps/tests/hivetest/hivetest.rbuild b/rosapps/tests/hivetest/hivetest.rbuild
index e7e21e9cb27..54784969a8e 100644
--- a/rosapps/tests/hivetest/hivetest.rbuild
+++ b/rosapps/tests/hivetest/hivetest.rbuild
@@ -3,6 +3,8 @@
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>ntdll</library>
+	<library>advapi32</library>
 	<file>hivetest.c</file>
 </module>
diff --git a/rosapps/tests/icontest/icontest.rbuild b/rosapps/tests/icontest/icontest.rbuild
index 9223a2b579b..e61c3df6324 100644
--- a/rosapps/tests/icontest/icontest.rbuild
+++ b/rosapps/tests/icontest/icontest.rbuild
@@ -4,6 +4,7 @@
 	<define name="__USE_W32API" />
 	<include base="icontest">.</include>
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>gdi32</library>
 	<library>ntdll</library>
 	<file>icontest.c</file>
diff --git a/rosapps/tests/lineclip/lineclip.rbuild b/rosapps/tests/lineclip/lineclip.rbuild
index fdeab748ddf..f18d31a9bdc 100644
--- a/rosapps/tests/lineclip/lineclip.rbuild
+++ b/rosapps/tests/lineclip/lineclip.rbuild
@@ -3,6 +3,7 @@
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>gdi32</library>
 	<file>lineclip.c</file>
 </module>
diff --git a/rosapps/tests/linetest/linetest.rbuild b/rosapps/tests/linetest/linetest.rbuild
index 88dff36d5a5..a2b203b4249 100644
--- a/rosapps/tests/linetest/linetest.rbuild
+++ b/rosapps/tests/linetest/linetest.rbuild
@@ -4,6 +4,7 @@
 	<define name="WINVER">0x0501</define>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>gdi32</library>
 	<file>linetest.c</file>
 </module>
diff --git a/rosapps/tests/mdi/mdi.rbuild b/rosapps/tests/mdi/mdi.rbuild
index 3a19e18badb..1198f68df42 100644
--- a/rosapps/tests/mdi/mdi.rbuild
+++ b/rosapps/tests/mdi/mdi.rbuild
@@ -4,6 +4,7 @@
 	<define name="__USE_W32API" />
 	<include base="mdi">.</include>
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>gdi32</library>
 	<library>comctl32</library>
 	<library>comdlg32</library>
diff --git a/rosapps/tests/miditest/miditest.rbuild b/rosapps/tests/miditest/miditest.rbuild
index 0496cc96947..7b58d7bd544 100644
--- a/rosapps/tests/miditest/miditest.rbuild
+++ b/rosapps/tests/miditest/miditest.rbuild
@@ -4,6 +4,7 @@
 	<define name="__USE_W32API" />
 	<include base="miditest">.</include>
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>winmm</library>
 	<file>miditest.c</file>
 </module>