diff --git a/src/servers/mail/Jamfile b/src/servers/mail/Jamfile
index 470a80efac..8f7593a44a 100644
--- a/src/servers/mail/Jamfile
+++ b/src/servers/mail/Jamfile
@@ -4,6 +4,12 @@ UsePrivateHeaders mail ;
 
 SubDirHdrs [ FDirName $(OBOS_TOP) headers os add-ons mail_daemon ] ;
 
+if $(TARGET_PLATFORM) = r5 {
+	SubDirC++Flags -DBUILDING_R5_LIBNET ;
+} else if $(TARGET_PLATFORM) = bone {
+	SubDirC++Flags -DBONE ;
+}
+
 AddResources mail_daemon : mail_daemon.rdef ;
 
 Server mail_daemon :
@@ -16,6 +22,7 @@ LinkSharedOSLibs mail_daemon :
 	be 
 	libmail.so
 	tracker
+	socket
 	stdc++.r4
 ;
 
diff --git a/src/servers/mail/main.cpp b/src/servers/mail/main.cpp
index 7480321fa3..8a4754e843 100644
--- a/src/servers/mail/main.cpp
+++ b/src/servers/mail/main.cpp
@@ -26,6 +26,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
+#include <sys/socket.h>
 #include <map>
 
 #include <E-mail.h>
@@ -40,8 +41,14 @@
 #include <MDRLanguage.h>
 
 #ifdef BONE
-	#include <sys/socket.h>
-	#include <bone_serial_ppp.h>
+	#define BONE_SERIAL_PPP_GET_STATUS 0xbe230501
+	#define BSPPP_CONNECTED 4
+	typedef struct {
+		char if_name[32];
+		int connection_status;
+		status_t last_error;
+		int connect_speed;
+	} bsppp_status_t;
 	#include <unistd.h>
 #endif