diff --git a/src/kits/translation/Jamfile b/src/kits/translation/Jamfile
index 9c5526d464..eb56879604 100644
--- a/src/kits/translation/Jamfile
+++ b/src/kits/translation/Jamfile
@@ -7,7 +7,7 @@ if $(TARGET_PLATFORM) != haiku {
 	UsePublicHeaders translation ;
 }
 
-UsePrivateHeaders translation textencoding ;
+UsePrivateHeaders kernel translation textencoding ;
 
 SharedLibrary libtranslation.so :
 	BitmapStream.cpp
diff --git a/src/kits/translation/TranslatorRoster.cpp b/src/kits/translation/TranslatorRoster.cpp
index 3736a89a4b..e1e875bd13 100644
--- a/src/kits/translation/TranslatorRoster.cpp
+++ b/src/kits/translation/TranslatorRoster.cpp
@@ -17,12 +17,13 @@
 #include "FuncTranslator.h"
 #include "TranslatorRosterPrivate.h"
 
+#include <image.h>
+#include <safemode.h>
+
 #include <Application.h>
 #include <Autolock.h>
 #include <Directory.h>
 #include <FindDirectory.h>
-#include <driver_settings.h>
-#include <image.h>
 #include <NodeMonitor.h>
 #include <Path.h>
 #include <String.h>
@@ -152,6 +153,18 @@ BTranslatorRoster::Private::Private()
 			|| !strcasecmp(parameter, "enable") || !strcmp(parameter, "1"))
 			fSafeMode = true;
 	}
+	
+#ifdef HAIKU_TARGET_PLATFORM_HAIKU
+	if (_kern_get_safemode_option(B_SAFEMODE_DISABLE_USER_ADD_ONS, parameter, &parameterLength) == B_OK)
+#else
+	if (_kget_safemode_option_(B_SAFEMODE_DISABLE_USER_ADD_ONS, parameter, &parameterLength) == B_OK)
+#endif
+	{
+		if (!strcasecmp(parameter, "enabled") || !strcasecmp(parameter, "on")
+			|| !strcasecmp(parameter, "true") || !strcasecmp(parameter, "yes")
+			|| !strcasecmp(parameter, "enable") || !strcmp(parameter, "1"))
+			fSafeMode = true;
+	}
 
 	// we're sneaking us into the BApplication
 	if (be_app != NULL && be_app->Lock()) {