diff --git a/src/add-ons/mail_daemon/inbound_filters/match_header/Jamfile b/src/add-ons/mail_daemon/inbound_filters/match_header/Jamfile
index 4c3ad7b00a..2e4b8dc77e 100644
--- a/src/add-ons/mail_daemon/inbound_filters/match_header/Jamfile
+++ b/src/add-ons/mail_daemon/inbound_filters/match_header/Jamfile
@@ -2,6 +2,11 @@ SubDir HAIKU_TOP src add-ons mail_daemon inbound_filters match_header ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+if $(TARGET_PLATFORM) != haiku {
+	UsePublicHeaders mail ;
+	UsePublicHeaders [ FDirName add-ons mail_daemon ] ;
+}
+
 UsePrivateHeaders mail ;
 SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ;
 
diff --git a/src/add-ons/mail_daemon/inbound_filters/r5_filter/Jamfile b/src/add-ons/mail_daemon/inbound_filters/r5_filter/Jamfile
index 9a13ca9c75..5278713f1f 100644
--- a/src/add-ons/mail_daemon/inbound_filters/r5_filter/Jamfile
+++ b/src/add-ons/mail_daemon/inbound_filters/r5_filter/Jamfile
@@ -2,6 +2,11 @@ SubDir HAIKU_TOP src add-ons mail_daemon inbound_filters r5_filter ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+if $(TARGET_PLATFORM) != haiku {
+	UsePublicHeaders mail ;
+	UsePublicHeaders [ FDirName add-ons mail_daemon ] ;
+}
+
 UsePrivateHeaders mail ;
 SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ;
 
diff --git a/src/add-ons/mail_daemon/inbound_filters/spam_filter/Jamfile b/src/add-ons/mail_daemon/inbound_filters/spam_filter/Jamfile
index c6e1df88e9..9bc015a755 100644
--- a/src/add-ons/mail_daemon/inbound_filters/spam_filter/Jamfile
+++ b/src/add-ons/mail_daemon/inbound_filters/spam_filter/Jamfile
@@ -2,6 +2,11 @@ SubDir HAIKU_TOP src add-ons mail_daemon inbound_filters spam_filter ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+if $(TARGET_PLATFORM) != haiku {
+	UsePublicHeaders mail ;
+	UsePublicHeaders [ FDirName add-ons mail_daemon ] ;
+}
+
 UsePrivateHeaders mail ;
 SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ;
 
diff --git a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile
index d6e77e8e37..1002b5d9e0 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile
+++ b/src/add-ons/mail_daemon/inbound_protocols/imap/Jamfile
@@ -2,6 +2,11 @@ SubDir HAIKU_TOP src add-ons mail_daemon inbound_protocols imap ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+if $(TARGET_PLATFORM) != haiku {
+	UsePublicHeaders mail ;
+	UsePublicHeaders [ FDirName add-ons mail_daemon ] ;
+}
+
 UsePrivateHeaders mail ;
 
 SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ;
diff --git a/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile b/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile
index e5cef4b85a..186fc245e9 100644
--- a/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile
+++ b/src/add-ons/mail_daemon/inbound_protocols/pop3/Jamfile
@@ -2,6 +2,11 @@ SubDir HAIKU_TOP src add-ons mail_daemon inbound_protocols pop3 ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+if $(TARGET_PLATFORM) != haiku {
+	UsePublicHeaders mail ;
+	UsePublicHeaders [ FDirName add-ons mail_daemon ] ;
+}
+
 UsePrivateHeaders mail ;
 SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ;
 
diff --git a/src/add-ons/mail_daemon/outbound_filters/fortune/Jamfile b/src/add-ons/mail_daemon/outbound_filters/fortune/Jamfile
index fffc6653d1..51b865bdea 100644
--- a/src/add-ons/mail_daemon/outbound_filters/fortune/Jamfile
+++ b/src/add-ons/mail_daemon/outbound_filters/fortune/Jamfile
@@ -2,6 +2,11 @@ SubDir HAIKU_TOP src add-ons mail_daemon outbound_filters fortune ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+if $(TARGET_PLATFORM) != haiku {
+	UsePublicHeaders mail ;
+	UsePublicHeaders [ FDirName add-ons mail_daemon ] ;
+}
+
 UsePrivateHeaders mail ;
 SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ;
 
diff --git a/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile b/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile
index 487d1a13f1..514f14dc25 100644
--- a/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile
+++ b/src/add-ons/mail_daemon/outbound_protocols/smtp/Jamfile
@@ -2,6 +2,11 @@ SubDir HAIKU_TOP src add-ons mail_daemon outbound_protocols smtp ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+if $(TARGET_PLATFORM) != haiku {
+	UsePublicHeaders mail ;
+	UsePublicHeaders [ FDirName add-ons mail_daemon ] ;
+}
+
 UsePrivateHeaders mail ;
 SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ;
 
diff --git a/src/add-ons/mail_daemon/system_filters/inbox/Jamfile b/src/add-ons/mail_daemon/system_filters/inbox/Jamfile
index 8eb04d1a45..088da8f9bf 100644
--- a/src/add-ons/mail_daemon/system_filters/inbox/Jamfile
+++ b/src/add-ons/mail_daemon/system_filters/inbox/Jamfile
@@ -2,6 +2,11 @@ SubDir HAIKU_TOP src add-ons mail_daemon system_filters inbox ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+if $(TARGET_PLATFORM) != haiku {
+	UsePublicHeaders mail ;
+	UsePublicHeaders [ FDirName add-ons mail_daemon ] ;
+}
+
 UsePrivateHeaders mail ;
 SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ;
 
diff --git a/src/add-ons/mail_daemon/system_filters/notifier/Jamfile b/src/add-ons/mail_daemon/system_filters/notifier/Jamfile
index 08e11351ea..9f07c6f1ad 100644
--- a/src/add-ons/mail_daemon/system_filters/notifier/Jamfile
+++ b/src/add-ons/mail_daemon/system_filters/notifier/Jamfile
@@ -2,6 +2,11 @@ SubDir HAIKU_TOP src add-ons mail_daemon system_filters notifier ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+if $(TARGET_PLATFORM) != haiku {
+	UsePublicHeaders mail ;
+	UsePublicHeaders [ FDirName add-ons mail_daemon ] ;
+}
+
 UsePrivateHeaders mail ;
 SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ;
 
diff --git a/src/add-ons/mail_daemon/system_filters/outbox/Jamfile b/src/add-ons/mail_daemon/system_filters/outbox/Jamfile
index 775baa6beb..8ea9e4c2cd 100644
--- a/src/add-ons/mail_daemon/system_filters/outbox/Jamfile
+++ b/src/add-ons/mail_daemon/system_filters/outbox/Jamfile
@@ -2,6 +2,11 @@ SubDir HAIKU_TOP src add-ons mail_daemon system_filters outbox ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+if $(TARGET_PLATFORM) != haiku {
+	UsePublicHeaders mail ;
+	UsePublicHeaders [ FDirName add-ons mail_daemon ] ;
+}
+
 UsePrivateHeaders mail ;
 SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ;
 
diff --git a/src/add-ons/mail_daemon/system_filters/parser/Jamfile b/src/add-ons/mail_daemon/system_filters/parser/Jamfile
index 46e33861c5..133565a1c7 100644
--- a/src/add-ons/mail_daemon/system_filters/parser/Jamfile
+++ b/src/add-ons/mail_daemon/system_filters/parser/Jamfile
@@ -2,6 +2,11 @@ SubDir HAIKU_TOP src add-ons mail_daemon system_filters parser ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+if $(TARGET_PLATFORM) != haiku {
+	UsePublicHeaders mail ;
+	UsePublicHeaders [ FDirName add-ons mail_daemon ] ;
+}
+
 UsePrivateHeaders mail ;
 SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ;
 
diff --git a/src/apps/bemail/Jamfile b/src/apps/bemail/Jamfile
index a3af51fadb..a8c5b96977 100644
--- a/src/apps/bemail/Jamfile
+++ b/src/apps/bemail/Jamfile
@@ -2,6 +2,10 @@ SubDir HAIKU_TOP src apps bemail ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+if $(TARGET_PLATFORM) != haiku {
+	UsePublicHeaders mail ;
+}
+
 UsePrivateHeaders mail ;
 UsePrivateHeaders textencoding ;
 UsePrivateHeaders shared ;
diff --git a/src/bin/bemail_utils/Jamfile b/src/bin/bemail_utils/Jamfile
index 95f49fd752..57dea1b84b 100644
--- a/src/bin/bemail_utils/Jamfile
+++ b/src/bin/bemail_utils/Jamfile
@@ -2,6 +2,10 @@ SubDir HAIKU_TOP src bin bemail_utils ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+if $(TARGET_PLATFORM) != haiku {
+	UsePublicHeaders mail ;
+}
+
 UsePrivateHeaders mail ;
 
 StdBinCommands
diff --git a/src/preferences/mail/Jamfile b/src/preferences/mail/Jamfile
index 4c4cff11ee..bc98aaca2f 100644
--- a/src/preferences/mail/Jamfile
+++ b/src/preferences/mail/Jamfile
@@ -2,6 +2,10 @@ SubDir HAIKU_TOP src preferences mail ;
 
 SetSubDirSupportedPlatformsBeOSCompatible ;
 
+if $(TARGET_PLATFORM) != haiku {
+	UsePublicHeaders mail ;
+}
+
 UsePrivateHeaders mail ;
 SubDirHdrs [ FDirName $(HAIKU_TOP) headers os add-ons mail_daemon ] ;
 
@@ -11,7 +15,7 @@ Preference E-mail :
 	ConfigViews.cpp
 	ConfigWindow.cpp
 	main.cpp 
-	: libbe.so libmail.so
+	: be libmail.so
 	: e-mail.rdef
 	;