diff --git a/rosapps/tests/multithrdwin/multithrdwin.rbuild b/rosapps/tests/multithrdwin/multithrdwin.rbuild
index b1fe5ca02c4..d404e70f89d 100644
--- a/rosapps/tests/multithrdwin/multithrdwin.rbuild
+++ b/rosapps/tests/multithrdwin/multithrdwin.rbuild
@@ -3,7 +3,9 @@
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>gdi32</library>
-	<library>ntdll</library>
+      <library>ntdll</library>
+
 	<file>multithrdwin.c</file>
 </module>
diff --git a/rosapps/tests/multiwin/multiwin.rbuild b/rosapps/tests/multiwin/multiwin.rbuild
index a738f3b6dba..3b1f2c320ee 100644
--- a/rosapps/tests/multiwin/multiwin.rbuild
+++ b/rosapps/tests/multiwin/multiwin.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>multiwin.c</file>
 </module>
diff --git a/rosapps/tests/noexecute/noexecute.rbuild b/rosapps/tests/noexecute/noexecute.rbuild
index 7adc14ac0ab..afed6b3e6dc 100644
--- a/rosapps/tests/noexecute/noexecute.rbuild
+++ b/rosapps/tests/noexecute/noexecute.rbuild
@@ -2,7 +2,9 @@
 	<define name="_WIN32_IE">0x0501</define>
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
-	<library>kernel32</library>
 	<library>pseh</library>
+	<library>kernel32</library>
+      <library>user32</library>
+
 	<file>noexecute.c</file>
 </module>
diff --git a/rosapps/tests/palbitblt/palbitblt.rbuild b/rosapps/tests/palbitblt/palbitblt.rbuild
index f5e84fb206e..dc7b902008e 100644
--- a/rosapps/tests/palbitblt/palbitblt.rbuild
+++ b/rosapps/tests/palbitblt/palbitblt.rbuild
@@ -1,8 +1,9 @@
-<module name="palbitblt" type="win32gui" installbase="bin" installname="palbitblt.exe" allowwarnings="true">
+<module name="palbitblt" type="win32gui" installbase="bin" installname="palbitblt.exe" allowwarnings="true" 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>pal.c</file>
 </module>
diff --git a/rosapps/tests/patblt/patblt.rbuild b/rosapps/tests/patblt/patblt.rbuild
index 318c535fa10..56631d4c290 100644
--- a/rosapps/tests/patblt/patblt.rbuild
+++ b/rosapps/tests/patblt/patblt.rbuild
@@ -1,8 +1,9 @@
-<module name="patblt" type="win32gui" installbase="bin" installname="patblt.exe" allowwarnings="true">
+<module name="patblt" type="win32gui" installbase="bin" installname="patblt.exe" allowwarnings="true" 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>patblt.cpp</file>
 </module>
diff --git a/rosapps/tests/popupmenu/popupmenu.rbuild b/rosapps/tests/popupmenu/popupmenu.rbuild
index f627033e873..d0c527c195e 100644
--- a/rosapps/tests/popupmenu/popupmenu.rbuild
+++ b/rosapps/tests/popupmenu/popupmenu.rbuild
@@ -4,6 +4,7 @@
 	<define name="__USE_W32API" />
 	<include base="popupmenu">.</include>
 	<library>kernel32</library>
+	<library>user32</library>
 	<library>gdi32</library>
 	<file>popupmenu.c</file>
 	<file>popupmenu.rc</file>
diff --git a/rosapps/tests/primitives/primitives.rbuild b/rosapps/tests/primitives/primitives.rbuild
index 549e90e8c44..482e9d47eb7 100644
--- a/rosapps/tests/primitives/primitives.rbuild
+++ b/rosapps/tests/primitives/primitives.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>primitives.cpp</file>
 	<file>mk_font.cpp</file>
diff --git a/rosapps/tests/regqueryvalue/regqueryvalue.rbuild b/rosapps/tests/regqueryvalue/regqueryvalue.rbuild
index c1d7c4fbb31..0c345e6052c 100644
--- a/rosapps/tests/regqueryvalue/regqueryvalue.rbuild
+++ b/rosapps/tests/regqueryvalue/regqueryvalue.rbuild
@@ -3,6 +3,8 @@
 	<define name="_WIN32_WINNT">0x0501</define>
 	<define name="__USE_W32API" />
 	<library>kernel32</library>
+	<library>user32</library>
+	<library>advapi32</library>
 	<library>gdi32</library>
 	<file>regqueryvalue.c</file>
 </module>
diff --git a/rosapps/tests/shaptest/shaptest.rbuild b/rosapps/tests/shaptest/shaptest.rbuild
index 35317cd57a3..0bcdafe8ab0 100644
--- a/rosapps/tests/shaptest/shaptest.rbuild
+++ b/rosapps/tests/shaptest/shaptest.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>shaptest.c</file>
 </module>
diff --git a/rosapps/tests/statst/statst.rbuild b/rosapps/tests/statst/statst.rbuild
index 790a1828056..5dd54df4c78 100644
--- a/rosapps/tests/statst/statst.rbuild
+++ b/rosapps/tests/statst/statst.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>statst.c</file>
 </module>
diff --git a/rosapps/tests/statst2/statst2.rbuild b/rosapps/tests/statst2/statst2.rbuild
index 5cfb8fdd932..a8489f4785c 100644
--- a/rosapps/tests/statst2/statst2.rbuild
+++ b/rosapps/tests/statst2/statst2.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>statst2.c</file>
 </module>
diff --git a/rosapps/tests/stretchblt/stretchblt.rbuild b/rosapps/tests/stretchblt/stretchblt.rbuild
index ad8de6ee3cf..76a319dea9b 100644
--- a/rosapps/tests/stretchblt/stretchblt.rbuild
+++ b/rosapps/tests/stretchblt/stretchblt.rbuild
@@ -1,8 +1,9 @@
-<module name="stretchblt" type="win32gui" installbase="bin" installname="stretchblt.exe">
+<module name="stretchblt" type="win32gui" installbase="bin" installname="stretchblt.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>stretchblt.cpp</file>
 </module>
diff --git a/rosapps/tests/subclass/subclass.rbuild b/rosapps/tests/subclass/subclass.rbuild
index cb58165f94a..8eb191482ec 100644
--- a/rosapps/tests/subclass/subclass.rbuild
+++ b/rosapps/tests/subclass/subclass.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>subclass.c</file>
 </module>
diff --git a/rosapps/tests/thread_msg/thread_msg.rbuild b/rosapps/tests/thread_msg/thread_msg.rbuild
index bb63b8bb66c..f8ed4f07b82 100644
--- a/rosapps/tests/thread_msg/thread_msg.rbuild
+++ b/rosapps/tests/thread_msg/thread_msg.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>thread_msg.c</file>
 </module>
diff --git a/rosapps/tests/txtscale/txtscale.rbuild b/rosapps/tests/txtscale/txtscale.rbuild
index 2b4ac4c0fdf..2faacefd36a 100644
--- a/rosapps/tests/txtscale/txtscale.rbuild
+++ b/rosapps/tests/txtscale/txtscale.rbuild
@@ -1,8 +1,9 @@
-<module name="txtscale" type="win32gui" installbase="bin" installname="txtscale.exe" allowwarnings ="true">
+<module name="txtscale" type="win32gui" installbase="bin" installname="txtscale.exe" allowwarnings ="true" 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>
 	<library>comctl32</library>
 	<file>txtscale.cpp</file>
diff --git a/rosapps/tests/wclickat/wclickat.rbuild b/rosapps/tests/wclickat/wclickat.rbuild
index 5c3d0cb3b16..2a354eecef3 100644
--- a/rosapps/tests/wclickat/wclickat.rbuild
+++ b/rosapps/tests/wclickat/wclickat.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>wclickat.c</file>
 </module>
diff --git a/rosapps/tests/winhello/winhello.rbuild b/rosapps/tests/winhello/winhello.rbuild
index 57689a5cacd..2217e6d6b0d 100644
--- a/rosapps/tests/winhello/winhello.rbuild
+++ b/rosapps/tests/winhello/winhello.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>winhello.c</file>
 </module>
diff --git a/rosapps/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild b/rosapps/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild
index 71c5ea213b2..5f0f800d4f7 100644
--- a/rosapps/tests/wm_erasebkgnd/wm_erasebkgnd.rbuild
+++ b/rosapps/tests/wm_erasebkgnd/wm_erasebkgnd.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>wm_erasebkgnd.cpp</file>
 </module>
diff --git a/rosapps/tests/wm_paint/wm_paint.rbuild b/rosapps/tests/wm_paint/wm_paint.rbuild
index 3e5e2732d46..5bcfc22d64f 100644
--- a/rosapps/tests/wm_paint/wm_paint.rbuild
+++ b/rosapps/tests/wm_paint/wm_paint.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>wm_paint.c</file>
 </module>