diff --git a/rostests/regtests/crt/crt_regtest.rbuild b/rostests/regtests/crt/crt_regtest.rbuild
index d4956a26398..4b297d5b1b8 100644
--- a/rostests/regtests/crt/crt_regtest.rbuild
+++ b/rostests/regtests/crt/crt_regtest.rbuild
@@ -4,7 +4,6 @@
 <module name="crt_regtest" type="win32cui" installbase="bin" installname="crt_regtest.exe">
 	<include base="crt_regtest">.</include>
 	<library>wine</library>
-	<library>msvcrt</library>
 	<file>iofuncs.c</file>
 	<file>testlist.c</file>
 	<file>time.c</file>
diff --git a/rostests/tests/dirdlg/dirdlg.rbuild b/rostests/tests/dirdlg/dirdlg.rbuild
index fd90b46d498..4b53898af3a 100644
--- a/rostests/tests/dirdlg/dirdlg.rbuild
+++ b/rostests/tests/dirdlg/dirdlg.rbuild
@@ -1,5 +1,9 @@
 <module name="dirdlg" type="win32gui" installbase="bin" installname="dirdlg.exe">
 	<include base="dirdlg">.</include>
+
+	<!-- FIXME: workarounds until we have a proper oldnames library -->
+	<define name="chdir">_chdir</define>
+
 	<library>kernel32</library>
 	<library>user32</library>
 	<library>gdi32</library>
diff --git a/rostests/tests/tcpsvr/tcpsvr.c b/rostests/tests/tcpsvr/tcpsvr.c
index 8f1d6b8c13b..5915cf31126 100644
--- a/rostests/tests/tcpsvr/tcpsvr.c
+++ b/rostests/tests/tcpsvr/tcpsvr.c
@@ -130,7 +130,7 @@ int read_line(int newSd, char *line_to_return) {
 	return ERROR;
       } else if (n==0) {
 	printf(" connection closed by client\n");
-	close(newSd);
+	closesocket(newSd);
         WSACleanup();
 	return ERROR;
       }
diff --git a/rostests/winetests/msvcrt/msvcrt.rbuild b/rostests/winetests/msvcrt/msvcrt.rbuild
index 85befd9335e..fd9918c6224 100644
--- a/rostests/winetests/msvcrt/msvcrt.rbuild
+++ b/rostests/winetests/msvcrt/msvcrt.rbuild
@@ -6,8 +6,21 @@
 	<include base="msvcrt">include/reactos/wine/msvcrt</include>
 	<define name="__ROS_LONG64__" />
 	<define name="_CRT_NONSTDC_NO_DEPRECATE" />
+
+	<!-- FIXME: workarounds until we have a proper oldnames library -->
+	<define name="open">_open</define>
+	<define name="close">_close</define>
+	<define name="tell">_tell</define>
+	<define name="unlink">_unlink</define>
+	<define name="fdopen">_fdopen</define>
+	<define name="lseek">_lseek</define>
+	<define name="read">_read</define>
+	<define name="write">_write</define>
+	<define name="mkdir">_mkdir</define>
+	<define name="rmdir">_rmdir</define>
+	<define name="putenv">_putenv</define>
+
 	<library>kernel32</library>
-	<library>msvcrt</library>
 	<file>cpp.c</file>
 	<file>data.c</file>
 	<file>dir.c</file>