diff --git a/headers/private/mail/NodeMessage.h b/headers/private/mail/NodeMessage.h
index 50a4011a9a..302d5cf00a 100644
--- a/headers/private/mail/NodeMessage.h
+++ b/headers/private/mail/NodeMessage.h
@@ -23,7 +23,7 @@
 #include <Node.h>
 #include <Message.h>
 
-#ifdef B_BEOS_VERSION_DANO
+#if defined(HAIKU_TARGET_PLATFORM_DANO) || defined(HAIKU_TARGET_PLATFORM_HAIKU)
 #define _IMPEXP_MAIL
 #endif
 
diff --git a/src/apps/bemail/BmapButton.cpp b/src/apps/bemail/BmapButton.cpp
index 33bb505006..f01962227a 100644
--- a/src/apps/bemail/BmapButton.cpp
+++ b/src/apps/bemail/BmapButton.cpp
@@ -44,7 +44,7 @@ All rights reserved.
 #include <stdlib.h>
 
 
-#ifndef B_BEOS_VERSION_DANO
+#if defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE)
 static rgb_color
 mix_color(rgb_color color1, rgb_color color2, float portion)
 {
@@ -61,7 +61,7 @@ disable_color(rgb_color color, rgb_color background)
 {
 	return mix_color(color, background, .5);
 }
-#endif // #ifndef B_BEOS_VERSION_DANO
+#endif // #if older versions of BeOS, like R5.
 
 BList BmapButton::fBitmapCache;
 BLocker BmapButton::fBmCacheLock;
diff --git a/src/kits/mail/MailAttachment.cpp b/src/kits/mail/MailAttachment.cpp
index e02b071279..e428a75e8c 100644
--- a/src/kits/mail/MailAttachment.cpp
+++ b/src/kits/mail/MailAttachment.cpp
@@ -619,7 +619,7 @@ status_t BAttributedMailAttachment::SetToRFC822(BPositionIO *data, size_t length
 
 status_t BAttributedMailAttachment::RenderToRFC822(BPositionIO *render_to) {
 	BMallocIO *io = new BMallocIO;
-#if B_BEOS_VERSION_DANO
+#if defined(HAIKU_TARGET_PLATFORM_DANO) || defined(HAIKU_TARGET_PLATFORM_HAIKU)
 	const
 #endif
 	char *name;
diff --git a/src/kits/mail/MailComponent.cpp b/src/kits/mail/MailComponent.cpp
index 4363b8d343..a7d62ffb21 100644
--- a/src/kits/mail/MailComponent.cpp
+++ b/src/kits/mail/MailComponent.cpp
@@ -141,7 +141,7 @@ void BMailComponent::SetHeaderField(const char *key, BMessage *structure, bool r
 	const char *name, *sub_val;
 	type_code type;
 	for (int32 i = 0; structure->GetInfo(B_STRING_TYPE,i,
-		#ifndef B_BEOS_VERSION_DANO
+		#if defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE)
 			(char**)
 		#endif
 		&name,&type) == B_OK; i++)
@@ -236,7 +236,7 @@ status_t BMailComponent::RemoveHeader(const char *key) {
 }
 
 const char *BMailComponent::HeaderAt(int32 index) {
-#if B_BEOS_VERSION_DANO
+#if !(defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE))
 	const
 #endif
 	char *name = NULL;
@@ -276,8 +276,8 @@ BMailComponent::RenderToRFC822(BPositionIO *render_to) {
 		headers.FindInt8 (kHeaderEncodingString, &encoding);
 
 	for (int32 index = 0; headers.GetInfo(B_STRING_TYPE,index,
-#ifndef B_BEOS_VERSION_DANO
-	(char**)
+#if defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE)
+	(const char**)
 #endif
 			&key,&stupidity_personified,&count) == B_OK; index++) {
 		for (int32 g = 0; g < count; g++) {
diff --git a/src/kits/mail/NodeMessage.cpp b/src/kits/mail/NodeMessage.cpp
index c95bb1e0ba..25446441ad 100644
--- a/src/kits/mail/NodeMessage.cpp
+++ b/src/kits/mail/NodeMessage.cpp
@@ -19,7 +19,7 @@
 */
 _EXPORT BNode& operator<<(BNode& n, const BMessage& m)
 {
-	#ifdef B_BEOS_VERSION_DANO
+	#if !(defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE))
 	const
 	#endif
 	char *name;
diff --git a/src/servers/mail/NavMenu.h b/src/servers/mail/NavMenu.h
index d9aeb2f4d8..8ba3ca2006 100644
--- a/src/servers/mail/NavMenu.h
+++ b/src/servers/mail/NavMenu.h
@@ -142,7 +142,7 @@ protected:
 
 //	Spring Loaded Folder convenience routines
 //		used in both Tracker and Deskbar
-#if B_BEOS_VERSION_DANO
+#if !(defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE))
 #define _IMPEXP_TRACKER
 #endif
 _IMPEXP_TRACKER bool SpringLoadedFolderCompareMessages(const BMessage *incoming,
@@ -153,7 +153,7 @@ _IMPEXP_TRACKER void SpringLoadedFolderAddUniqueTypeToList(entry_ref *ref,
 	BObjectList<BString> *typeslist);
 _IMPEXP_TRACKER void SpringLoadedFolderCacheDragData(const BMessage *incoming,
 	BMessage **, BObjectList<BString> **typeslist);
-#if B_BEOS_VERSION_DANO
+#if !(defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE))
 #undef _IMPEXP_TRACKER
 #endif