diff --git a/headers/build/os/support/ByteOrder.h b/headers/build/os/support/ByteOrder.h
index 8969c70f6c..28c9ecf89d 100644
--- a/headers/build/os/support/ByteOrder.h
+++ b/headers/build/os/support/ByteOrder.h
@@ -4,11 +4,16 @@
 #ifndef _sk_byte_order_h_
 #define _sk_byte_order_h_
 
+
 #include <BeBuild.h>
-#include <endian.h>
 #include <SupportDefs.h>
 #include <TypeConstants.h>	/* For convenience */
 
+#ifndef HAIKU_HOST_PLATFORM_FREEBSD
+#	include <endian.h>
+#endif
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif 
diff --git a/src/build/libbe/storage/File.cpp b/src/build/libbe/storage/File.cpp
index 09f323060b..c4b2bba3f0 100644
--- a/src/build/libbe/storage/File.cpp
+++ b/src/build/libbe/storage/File.cpp
@@ -8,6 +8,7 @@
 */
 
 #include <fcntl.h>
+#include <unistd.h>
 
 #include <Directory.h>
 #include <Entry.h>