diff --git a/headers/private/media/ServerInterface.h b/headers/private/media/ServerInterface.h
index ba29321b2d..ba73e316e9 100644
--- a/headers/private/media/ServerInterface.h
+++ b/headers/private/media/ServerInterface.h
@@ -7,6 +7,8 @@
 #define _SERVER_INTERFACE_H_
 
 
+#include <string.h>
+
 #include <Buffer.h>
 #include <Entry.h>
 #include <MediaAddOn.h>
diff --git a/src/kits/media/BufferConsumer.cpp b/src/kits/media/BufferConsumer.cpp
index 8713b39958..4067d3b501 100644
--- a/src/kits/media/BufferConsumer.cpp
+++ b/src/kits/media/BufferConsumer.cpp
@@ -31,6 +31,7 @@
 #include <BufferConsumer.h>
 
 #include <stdlib.h>
+#include <string.h>
 
 #include <BufferProducer.h>
 #include <BufferGroup.h>
diff --git a/src/kits/media/FileInterface.cpp b/src/kits/media/FileInterface.cpp
index 4b30fb0db0..891169f7bb 100644
--- a/src/kits/media/FileInterface.cpp
+++ b/src/kits/media/FileInterface.cpp
@@ -1,7 +1,7 @@
 /***********************************************************************
  * AUTHOR: Marcus Overhagen
  *   FILE: FileInterface.cpp
- *  DESCR: 
+ *  DESCR:
  ***********************************************************************/
 /*
  * Copyright 2008 Maurice Kalinowski, haiku@kaldience.com
@@ -12,6 +12,7 @@
 
 #include "debug.h"
 #include "DataExchange.h"
+#include <string.h>
 #include <FileInterface.h>
 #include <MimeType.h>
 
@@ -55,7 +56,7 @@ BFileInterface::HandleMessage(int32 message,
 	switch(message) {
 		case FILEINTERFACE_SET_REF:
 		{
-			const fileinterface_set_ref_request *request = 
+			const fileinterface_set_ref_request *request =
 					(const fileinterface_set_ref_request*) data;
 			fileinterface_set_ref_reply reply;
 			entry_ref ref(request->device, request->directory,
@@ -69,7 +70,7 @@ BFileInterface::HandleMessage(int32 message,
 		}
 		case FILEINTERFACE_GET_REF:
 		{
-			const fileinterface_get_ref_request *request = 
+			const fileinterface_get_ref_request *request =
 					(const fileinterface_get_ref_request*) data;
 			fileinterface_get_ref_reply reply;
 			entry_ref resultRef;
@@ -84,7 +85,7 @@ BFileInterface::HandleMessage(int32 message,
 		}
 		case FILEINTERFACE_SNIFF_REF:
 		{
-			const fileinterface_sniff_ref_request *request = 
+			const fileinterface_sniff_ref_request *request =
 					(const fileinterface_sniff_ref_request*) data;
 			fileinterface_sniff_ref_reply reply;