diff --git a/src/apps/bemail/BmapButton.cpp b/src/apps/bemail/BmapButton.cpp
index f01962227a..1ddb278207 100644
--- a/src/apps/bemail/BmapButton.cpp
+++ b/src/apps/bemail/BmapButton.cpp
@@ -44,7 +44,7 @@ All rights reserved.
 #include <stdlib.h>
 
 
-#if defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE)
+#if !defined(HAIKU_TARGET_PLATFORM_DANO)
 static rgb_color
 mix_color(rgb_color color1, rgb_color color2, float portion)
 {
diff --git a/src/kits/mail/MailAttachment.cpp b/src/kits/mail/MailAttachment.cpp
index e428a75e8c..a2cde9067d 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 defined(HAIKU_TARGET_PLATFORM_DANO) || defined(HAIKU_TARGET_PLATFORM_HAIKU)
+#if defined(HAIKU_TARGET_PLATFORM_DANO)
 	const
 #endif
 	char *name;
diff --git a/src/kits/mail/MailComponent.cpp b/src/kits/mail/MailComponent.cpp
index a7d62ffb21..ca09b11f37 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,
-		#if defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE)
+		#if !defined(HAIKU_TARGET_PLATFORM_DANO)
 			(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 !(defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE))
+#if defined(HAIKU_TARGET_PLATFORM_DANO)
 	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,
-#if defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE)
-	(const char**)
+#if !defined(HAIKU_TARGET_PLATFORM_DANO)
+			(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 25446441ad..30605fedd6 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)
 {
-	#if !(defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE))
+	#if defined(HAIKU_TARGET_PLATFORM_DANO)
 	const
 	#endif
 	char *name;