diff --git a/src/kits/app/r5_message.cpp b/src/kits/app/r5_message.cpp
index 53fd8e7aef..eb36710345 100644
--- a/src/kits/app/r5_message.cpp
+++ b/src/kits/app/r5_message.cpp
@@ -6,11 +6,12 @@
  *		Michael Lotz <mmlr@mlotz.ch>
  */
 
+#include "r5_message.h"
+
 #include <DataIO.h>
 #include <MessagePrivate.h>
 #include <MessageUtils.h>
 #include <TokenSpace.h>
-#include "r5_message.h"
 
 #define R5_MESSAGE_FLAG_VALID			0x01
 #define R5_MESSAGE_FLAG_INCLUDE_TARGET	0x02
@@ -298,9 +299,6 @@ unflatten_r5_message(uint32 format, BMessage *message, BDataIO *stream)
 	reader(((uint8 *)&r5header) + sizeof(uint32),
 		sizeof(r5header) - sizeof(uint32));
 
-	messagePrivate.Clear();
-	messagePrivate.InitHeader();
-
 	header->what = message->what = r5header.what;
 	if (r5header.flags & R5_MESSAGE_FLAG_INCLUDE_TARGET)
 		reader(header->target);
diff --git a/src/kits/app/r5_message.h b/src/kits/app/r5_message.h
index cac7fb896c..677484cb2e 100644
--- a/src/kits/app/r5_message.h
+++ b/src/kits/app/r5_message.h
@@ -9,7 +9,7 @@
 #define _R5_MESSAGE_H_
 
 
-#include <sys/types.h>
+#include <SupportDefs.h>
 
 class BMessage;
 class BDataIO;