diff --git a/mozilla/modules/libreg/xpcom/nsRegistry.cpp b/mozilla/modules/libreg/xpcom/nsRegistry.cpp
index 5c93f3eda39..68b1fc98c3b 100644
--- a/mozilla/modules/libreg/xpcom/nsRegistry.cpp
+++ b/mozilla/modules/libreg/xpcom/nsRegistry.cpp
@@ -39,6 +39,11 @@
 
 #include "nsComponentManager.h"
 
+#ifdef XP_BEOS
+#include <FindDirectory.h>
+#include <Path.h>
+#endif
+
 /* extra locking for the paranoid */
 /* #define EXTRA_THREADSAFE */
 #ifndef EXTRA_THREADSAFE
diff --git a/mozilla/xpcom/components/nsRegistry.cpp b/mozilla/xpcom/components/nsRegistry.cpp
index 5c93f3eda39..68b1fc98c3b 100644
--- a/mozilla/xpcom/components/nsRegistry.cpp
+++ b/mozilla/xpcom/components/nsRegistry.cpp
@@ -39,6 +39,11 @@
 
 #include "nsComponentManager.h"
 
+#ifdef XP_BEOS
+#include <FindDirectory.h>
+#include <Path.h>
+#endif
+
 /* extra locking for the paranoid */
 /* #define EXTRA_THREADSAFE */
 #ifndef EXTRA_THREADSAFE
diff --git a/mozilla/xpcom/io/nsDirectoryService.cpp b/mozilla/xpcom/io/nsDirectoryService.cpp
index d1214976c8a..cd17a373449 100644
--- a/mozilla/xpcom/io/nsDirectoryService.cpp
+++ b/mozilla/xpcom/io/nsDirectoryService.cpp
@@ -84,10 +84,12 @@
 #define HOME_DIR NS_MAC_HOME_DIR
 #elif defined (XP_UNIX)
 #define HOME_DIR NS_UNIX_HOME_DIR
+#elif defined (XP_BEOS)
+#define HOME_DIR NS_BEOS_HOME_DIR
 #endif
 
 // define default product directory
-#if defined(XP_PC) || defined(XP_MAC)
+#if defined(XP_PC) || defined(XP_MAC) || defined(XP_BEOS)
 #define DEFAULT_PRODUCT_DIR "Mozilla"
 #elif defined (XP_UNIX)
 #define DEFAULT_PRODUCT_DIR ".mozilla"