diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile
index 1002b5d9e0..720f5b3082 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile
@@ -4,9 +4,9 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
 
 if $(TARGET_PLATFORM) != haiku {
 	UsePublicHeaders mail ;
-	UsePublicHeaders [ FDirName add-ons mail_daemon ] ;
 }
 
+UsePublicHeaders [ FDirName add-ons mail_daemon ] ;
 UsePrivateHeaders mail ;
 
 SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ;
@@ -16,12 +16,6 @@ if $(USESSL) {
 	SubDirHdrs [ FDirName / boot home config include ] ;
 }
 
-if $(BONE_COMPATIBLE) {
-	SubDirC++Flags -DBONE ;
-} else {
-	SubDirC++Flags -DBUILDING_R5_LIBNET ;
-}
-
 Addon IMAP : mail_daemon inbound_protocols :
 	imap_client.cpp
 	imap_config.cpp
diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_client.cpp b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_client.cpp
index 59f9ca7aa8..7828de0119 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/imap_client.cpp
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/imap_client.cpp
@@ -20,9 +20,11 @@
 #include <ctype.h>
 
 #include <sys/socket.h>
-#include <arpa/inet.h>
 #include <sys/time.h>
-#include <sys/select.h>
+#ifndef HAIKU_TARGET_PLATFORM_BEOS // These headers don't exist in BeOS R5.
+	#include <arpa/inet.h>
+	#include <sys/select.h>
+#endif
 
 #ifdef USESSL
 	#include <openssl/ssl.h>
@@ -160,7 +162,7 @@ IMAP4Client::IMAP4Client(BMessage *settings, BMailChainRunner *run) : BRemoteMai
 		return;
 	}
 	
-#ifdef BONE
+#ifndef HAIKU_TARGET_PLATFORM_BEOS
 	net = socket(AF_INET, SOCK_STREAM, 0);
 #else
 	net = socket(AF_INET, 2, 0);
@@ -173,7 +175,7 @@ IMAP4Client::IMAP4Client(BMessage *settings, BMailChainRunner *run) : BRemoteMai
 		saAddr.sin_addr.s_addr = hostIP;
 		int result = connect(net, (struct sockaddr *) &saAddr, sizeof(saAddr));
 		if (result < 0) {
-		#ifdef BONE
+		#ifndef HAIKU_TARGET_PLATFORM_BEOS
 			close(net);
 		#else
 			closesocket(net);
@@ -222,7 +224,7 @@ IMAP4Client::IMAP4Client(BMessage *settings, BMailChainRunner *run) : BRemoteMai
 			error << ". (SSL Connection Error)";
 			runner->ShowError(error.String());
 			SSL_CTX_free(ctx);
-			#ifdef BONE
+			#ifndef HAIKU_TARGET_PLATFORM_BEOS
 				close(net);
 			#else
 				closesocket(net);
@@ -293,7 +295,7 @@ IMAP4Client::~IMAP4Client() {
 		}
 	#endif
 		
-	#ifdef BONE
+	#ifndef HAIKU_TARGET_PLATFORM_BEOS
 		close(net);
 	#else
 		closesocket(net);
@@ -966,7 +968,7 @@ IMAP4Client::ReceiveLine(BString &out)
 						SSL_CTX_free(ctx);
 				}
 			#endif
-			#ifdef BONE
+			#ifndef HAIKU_TARGET_PLATFORM_BEOS
 				close(net);
 			#else
 				closesocket(net);
@@ -1050,7 +1052,7 @@ int IMAP4Client::GetResponse(BString &tag, NestedString *parsed_response, bool r
 						SSL_CTX_free(ctx);
 				}
 			#endif
-			#ifdef BONE
+			#ifndef HAIKU_TARGET_PLATFORM_BEOS
 				close(net);
 			#else
 				closesocket(net);
diff --git a/src/kits/mail/Jamfile b/src/kits/mail/Jamfile
index c02c81e236..582bb69fcf 100644
--- a/src/kits/mail/Jamfile
+++ b/src/kits/mail/Jamfile
@@ -2,9 +2,11 @@ SubDir HAIKU_TOP src kits mail ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+if $(TARGET_PLATFORM) != haiku {
+	UsePublicHeaders mail ;
+}
 UsePrivateHeaders mail ;
-
-SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ;
+UsePublicHeaders [ FDirName add-ons mail_daemon ] ;
 
 if $(CHECK_MALLOC) {
 	SubDirC++Flags -D_NO_INLINE_ASM -fcheck-memory-usage ;