diff --git a/src/build/libbe/storage/mime/database_support.cpp b/src/build/libbe/storage/mime/database_support.cpp
index cbfe084b89..220e4c38d7 100644
--- a/src/build/libbe/storage/mime/database_support.cpp
+++ b/src/build/libbe/storage/mime/database_support.cpp
@@ -29,11 +29,13 @@
 #define DBG(x)
 #define OUT printf
 
+#ifndef HAIKU_HOST_PLATFORM_HAIKU
 // icon types (which really ought to be publicly or semi-publicly declared somewhere...)
 enum {
 	B_MINI_ICON_TYPE	= 'MICN',
 	B_LARGE_ICON_TYPE	= 'ICON',
 };
+#endif
 
 namespace BPrivate {
 namespace Storage {
diff --git a/src/tools/fs_shell/command_cp.cpp b/src/tools/fs_shell/command_cp.cpp
index 4d82b6b51c..c585f66031 100644
--- a/src/tools/fs_shell/command_cp.cpp
+++ b/src/tools/fs_shell/command_cp.cpp
@@ -9,6 +9,7 @@
 
 #include <fcntl.h>
 #include <stdio.h>
+#include <string.h>
 #include <unistd.h>
 
 #include <AutoDeleter.h>