diff --git a/src/servers/registrar/MIMEManager.cpp b/src/servers/registrar/MIMEManager.cpp
index 9ceec911b5..8160ab55f6 100644
--- a/src/servers/registrar/MIMEManager.cpp
+++ b/src/servers/registrar/MIMEManager.cpp
@@ -6,6 +6,7 @@
 #include <Messenger.h>
 #include <mime/UpdateMimeInfoThread.h>
 #include <mime/CreateAppMetaMimeThread.h>
+#include <Path.h>
 #include <RegistrarDefs.h>
 #include <String.h>
 #include <TypeConstants.h>
@@ -233,8 +234,9 @@ MIMEManager::MessageReceived(BMessage *message)
 			// Launch the thread
 			if (!err) {
 				err = fThreadManager.LaunchThread(thread);
-				if (!err)
+				if (!err) {
 					stillOwnThread = false;
+				}
 			}
 				
 			// If something went wrong, we need to notify the sender regardless. However,
diff --git a/src/servers/registrar/MIMEManager.h b/src/servers/registrar/MIMEManager.h
index 879bc8b8d8..e04db42871 100644
--- a/src/servers/registrar/MIMEManager.h
+++ b/src/servers/registrar/MIMEManager.h
@@ -5,7 +5,7 @@
 
 #include <Looper.h>
 #include <mime/Database.h>
-#include <ThreadManager.h>
+#include <RegistrarThreadManager.h>
 
 class MIMEManager : public BLooper {
 public:
@@ -18,7 +18,7 @@ private:
 	void HandleDeleteParam(BMessage *message);
 	
 	BPrivate::Storage::Mime::Database fDatabase;
-	ThreadManager fThreadManager;
+	RegistrarThreadManager fThreadManager;
 	BMessenger fManagerMessenger;
 };