diff --git a/src/system/libroot/posix/crypt/crypt_util.c b/src/system/libroot/posix/crypt/crypt_util.c
index 0dedf5427f..c72a55fcc2 100644
--- a/src/system/libroot/posix/crypt/crypt_util.c
+++ b/src/system/libroot/posix/crypt/crypt_util.c
@@ -23,6 +23,8 @@
  *
  */
 
+#include <string.h>
+
 #ifdef DEBUG
 #include <stdio.h>
 #endif
diff --git a/src/system/libroot/posix/crypt/ufc-crypt.h b/src/system/libroot/posix/crypt/ufc-crypt.h
index 13da8b4737..aa77ae7d65 100644
--- a/src/system/libroot/posix/crypt/ufc-crypt.h
+++ b/src/system/libroot/posix/crypt/ufc-crypt.h
@@ -23,6 +23,8 @@
  * 
  */
 
+#include <SupportDefs.h>
+
 /* 
  * Requirements for datatypes:
  * 
@@ -99,10 +101,15 @@ typedef long long     long64;
 
 #ifndef _UFC_64_
 #ifndef _UFC_32_
+#if B_HAIKU_64_BIT
+#define _UFC_64_
+typedef unsigned long long64;
+#else
 #define _UFC_32_
-typedef unsigned long ufc_long;
 typedef unsigned long long32;
 #endif
+typedef unsigned long ufc_long;
+#endif
 #endif