diff --git a/src/apps/bemail/Mail.cpp b/src/apps/bemail/Mail.cpp
index 0297c1aaf9..cf66b037f9 100644
--- a/src/apps/bemail/Mail.cpp
+++ b/src/apps/bemail/Mail.cpp
@@ -70,8 +70,8 @@ All rights reserved.
 
 using namespace BPrivate ;
 
-#ifndef BONE
-#	include <netdb.h>
+#ifdef HAIKU_TARGET_PLATFORM_BEOS
+	#include <netdb.h>
 #endif
 
 #include "Mail.h"
diff --git a/src/kits/mail/Jamfile b/src/kits/mail/Jamfile
index 582bb69fcf..44e0b22dfd 100644
--- a/src/kits/mail/Jamfile
+++ b/src/kits/mail/Jamfile
@@ -12,12 +12,6 @@ if $(CHECK_MALLOC) {
 	SubDirC++Flags -D_NO_INLINE_ASM -fcheck-memory-usage ;
 }
 
-if $(BONE_COMPATIBLE) {
-	SubDirC++Flags -DBONE ;
-} else {
-	SubDirC++Flags -DBUILDING_R5_LIBNET ;
-}
-
 SubDirC++Flags -D_BUILDING_mail=1 -DUSE_NASTY_SYNC_THREAD_HACK=1 ;
 
 UsePrivateHeaders textencoding ;
diff --git a/src/kits/mail/MailMessage.cpp b/src/kits/mail/MailMessage.cpp
index cba74fcdba..a1f5a829e7 100644
--- a/src/kits/mail/MailMessage.cpp
+++ b/src/kits/mail/MailMessage.cpp
@@ -24,7 +24,7 @@
 #include <ctype.h>
 #include <parsedate.h>
 
-#ifdef BONE
+#ifndef HAIKU_TARGET_PLATFORM_BEOS
 	#include <sys/socket.h>
 	#define BONE_SERIAL_PPP_GET_STATUS 0xbe230501
 	#define BSPPP_CONNECTED 4
@@ -897,7 +897,7 @@ BEmailMessage::Send(bool send_now)
 	if (status >= B_OK && send_now) {
 		BMailSettings settings_file;
 		if (settings_file.SendOnlyIfPPPUp()) {
-#ifdef BONE
+#ifndef HAIKU_TARGET_PLATFORM_BEOS
 			int s = socket(AF_INET, SOCK_DGRAM, 0);
 			bsppp_status_t ppp_status;