diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/headers/shared/Compatibility.h b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/headers/shared/Compatibility.h
index 4059d0d356..1887a92034 100644
--- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/headers/shared/Compatibility.h
+++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/headers/shared/Compatibility.h
@@ -30,7 +30,7 @@
 
 #include <BeBuild.h>
 
-#if B_BEOS_VERSION <= B_BEOS_VERSION_5
+#ifdef HAIKU_TARGET_PLATFORM_BEOS
 //#	define B_BAD_DATA -2147483632L
 #else
 #	ifndef closesocket
diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/client/ServerManager.cpp b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/client/ServerManager.cpp
index 2e6dbceb82..fdd48d071e 100644
--- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/client/ServerManager.cpp
+++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/client/ServerManager.cpp
@@ -3,7 +3,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-#if B_BEOS_VERSION <= B_BEOS_VERSION_5
+#ifdef HAIKU_TARGET_PLATFORM_BEOS
 #	include <socket.h>
 #else
 #	include <netinet/in.h>
@@ -293,7 +293,7 @@ ServerManager::_BroadcastListener()
 		sockaddr_in addr;
 		addr.sin_family = AF_INET;
 		addr.sin_port = htons(kDefaultBroadcastPort);
-		addr.sin_addr.s_addr = INADDR_BROADCAST;
+		addr.sin_addr.s_addr = INADDR_ANY;
 		int addrSize = sizeof(addr);
 		BroadcastMessage message;
 //PRINT(("ServerManager::_BroadcastListener(): recvfrom()...\n"));
diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/headers/shared/InsecureConnection.h b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/headers/shared/InsecureConnection.h
index 8ffcddd0f3..b5ff9a02a4 100644
--- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/headers/shared/InsecureConnection.h
+++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/headers/shared/InsecureConnection.h
@@ -3,7 +3,7 @@
 #ifndef NET_FS_INSECURE_CONNECTION_H
 #define NET_FS_INSECURE_CONNECTION_H
 
-#if B_BEOS_VERSION <= B_BEOS_VERSION_5
+#ifdef HAIKU_TARGET_PLATFORM_BEOS
 #	include <socket.h>
 #else
 #	include <netinet/in.h>
diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/headers/shared/NetAddress.h b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/headers/shared/NetAddress.h
index 99e4013527..8097dc7cb4 100644
--- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/headers/shared/NetAddress.h
+++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/headers/shared/NetAddress.h
@@ -3,7 +3,7 @@
 #ifndef NET_FS_NET_ADDRESS_H
 #define NET_FS_NET_ADDRESS_H
 
-#if B_BEOS_VERSION <= B_BEOS_VERSION_5
+#ifdef HAIKU_TARGET_PLATFORM_BEOS
 #	include <socket.h>
 #else
 #	include <netinet/in.h>
diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/headers/shared/Utils.h b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/headers/shared/Utils.h
index 441aba7af4..562ad0c93c 100644
--- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/headers/shared/Utils.h
+++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/headers/shared/Utils.h
@@ -3,9 +3,10 @@
 #ifndef UTILS_H
 #define UTILS_H
 
-#if B_BEOS_VERSION <= B_BEOS_VERSION_5
+#ifdef HAIKU_TARGET_PLATFORM_BEOS
 #	include <socket.h>
 #else
+#	include <sys/socket.h>
 #	include <unistd.h>
 #endif
 
@@ -26,8 +27,12 @@ void
 safe_closesocket(vint32& socketVar)
 {
 	int32 socket = atomic_or(&socketVar, -1);
-	if (socket >= 0)
+	if (socket >= 0) {
+#ifndef HAIKU_TARGET_PLATFORM_BEOS
+		shutdown(socket, SHUTDOWN_BOTH);
+#endif
 		closesocket(socket);
+	}
 }
 
 #endif	// UTILS_H
diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/server/InsecureConnectionListener.h b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/server/InsecureConnectionListener.h
index 39111ca060..e4e4471b84 100644
--- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/server/InsecureConnectionListener.h
+++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/server/InsecureConnectionListener.h
@@ -3,7 +3,7 @@
 #ifndef NET_FS_INSECURE_CONNECTION_LISTENER_H
 #define NET_FS_INSECURE_CONNECTION_LISTENER_H
 
-#if B_BEOS_VERSION <= B_BEOS_VERSION_5
+#ifdef HAIKU_TARGET_PLATFORM_BEOS
 #	include <socket.h>
 #else
 #	include <netinet/in.h>
diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/server/NetFSServer.cpp b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/server/NetFSServer.cpp
index de76ea9e23..6efab3448f 100644
--- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/server/NetFSServer.cpp
+++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/server/NetFSServer.cpp
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#if B_BEOS_VERSION <= B_BEOS_VERSION_5
+#ifdef HAIKU_TARGET_PLATFORM_BEOS
 #	include <socket.h>
 #else
 #	include <unistd.h>
@@ -1172,7 +1172,7 @@ NetFSServer::_Broadcaster()
 	}
 
 	// set the socket broadcast option
-	#if B_BEOS_VERSION > B_BEOS_VERSION_5
+	#ifndef HAIKU_TARGET_PLATFORM_BEOS
 		int soBroadcastValue = 1;
 		if (setsockopt(fBroadcastingSocket, SOL_SOCKET, SO_BROADCAST,
 			&soBroadcastValue, sizeof(soBroadcastValue)) < 0) {
diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/server/SecurityContext.cpp b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/server/SecurityContext.cpp
index 28b40e4c91..ee3b03da8b 100644
--- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/server/SecurityContext.cpp
+++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/server/SecurityContext.cpp
@@ -423,10 +423,10 @@ SecurityContext::SecurityContext(BMessage* archive)
 	BMessage permissionsArchive;
 	if (archive->FindMessage("permissions", &permissionsArchive) != B_OK)
 		return;
-	#if B_BEOS_VERSION <= B_BEOS_VERSION_5
-		char* userName;
-	#else
+	#ifdef HAIKU_TARGET_PLATFORM_DANO
 		const char* userName;
+	#else
+		char* userName;
 	#endif
 	type_code type;
 	for (int32 userIndex = 0; 
@@ -442,10 +442,10 @@ SecurityContext::SecurityContext(BMessage* archive)
 			return;
 
 		// got a user: iterate through its permissions
-		#if B_BEOS_VERSION <= B_BEOS_VERSION_5
-			char* path;
-		#else
+		#ifdef HAIKU_TARGET_PLATFORM_DANO
 			const char* path;
+		#else
+			char* path;
 		#endif
 		for (int32 i = 0; 
 			 userArchive.GetInfo(B_INT32_TYPE, i, &path, &type) == B_OK;
diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/shared/InsecureChannel.cpp b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/shared/InsecureChannel.cpp
index 343ef29dd0..0ec1fbed79 100644
--- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/shared/InsecureChannel.cpp
+++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/shared/InsecureChannel.cpp
@@ -2,7 +2,7 @@
 
 #include <errno.h>
 
-#if B_BEOS_VERSION <= B_BEOS_VERSION_5
+#ifdef HAIKU_TARGET_PLATFORM_BEOS
 #	include <socket.h>
 #else
 #	include <unistd.h>
@@ -30,7 +30,7 @@ InsecureChannel::InsecureChannel(int socket)
 		int dontBlock = 0;
 		setsockopt(fSocket, SOL_SOCKET, SO_NONBLOCK, &dontBlock, sizeof(int));
 
-#if B_BEOS_VERSION > B_BEOS_VERSION_5
+#ifndef HAIKU_TARGET_PLATFORM_BEOS
 		int txLowWater = 1;
 		setsockopt(fSocket, SOL_SOCKET, SO_SNDLOWAT, &txLowWater, sizeof(int));
 		setsockopt(fSocket, SOL_SOCKET, SO_RCVLOWAT, &txLowWater, sizeof(int));
diff --git a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/shared/KMessage.cpp b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/shared/KMessage.cpp
index 0f93ba0c3e..54107bf8dd 100644
--- a/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/shared/KMessage.cpp
+++ b/src/tests/add-ons/kernel/file_systems/userlandfs/r5/src/test/netfs/shared/KMessage.cpp
@@ -21,9 +21,6 @@
 static const uint32 kMessageHeaderMagic = 'kMsG';
 static const int32 kMessageReallocChunkSize = 64;
 
-#if B_BEOS_VERSION <= B_BEOS_VERSION_5
-//#	define B_BAD_DATA -2147483632L
-#endif
 #ifndef B_BUFFER_OVERFLOW
 #	define B_BUFFER_OVERFLOW	EOVERFLOW
 #endif