diff --git a/src/kits/app/Jamfile b/src/kits/app/Jamfile
index 27860a977c..7aef610ef1 100644
--- a/src/kits/app/Jamfile
+++ b/src/kits/app/Jamfile
@@ -49,8 +49,6 @@ MergeObject <libbe>app_kit.o :
 	PropertyInfo.cpp
 	PortLink.cpp
 	RegistrarDefs.cpp
-	RegistrarThread.cpp
-	RegistrarThreadManager.cpp
 	Roster.cpp
 	RosterPrivate.cpp
 	Server.cpp
diff --git a/src/servers/registrar/Jamfile b/src/servers/registrar/Jamfile
index 6531173243..a686fccda6 100644
--- a/src/servers/registrar/Jamfile
+++ b/src/servers/registrar/Jamfile
@@ -44,6 +44,8 @@ Server registrar
 	MimeSnifferAddon.cpp
 	MimeSnifferAddonManager.cpp
 	MimeUpdateThread.cpp
+	RegistrarThread.cpp
+	RegistrarThreadManager.cpp
 	SnifferRules.cpp
 	Supertype.cpp
 	SupportingApps.cpp
diff --git a/src/servers/registrar/MIMEManager.h b/src/servers/registrar/MIMEManager.h
index 7eda3ab9b7..05317b75ca 100644
--- a/src/servers/registrar/MIMEManager.h
+++ b/src/servers/registrar/MIMEManager.h
@@ -4,9 +4,9 @@
 #define MIME_MANAGER_H
 
 #include <Looper.h>
-#include <RegistrarThreadManager.h>
 
 #include "Database.h"
+#include "RegistrarThreadManager.h"
 
 class MIMEManager : public BLooper {
 public:
diff --git a/src/servers/registrar/mime/MimeUpdateThread.h b/src/servers/registrar/mime/MimeUpdateThread.h
index 924d2b9e0a..adca70a977 100644
--- a/src/servers/registrar/mime/MimeUpdateThread.h
+++ b/src/servers/registrar/mime/MimeUpdateThread.h
@@ -11,12 +11,13 @@
 #define _MIME_UPDATE_THREAD_H
 
 #include <Entry.h>
-#include <RegistrarThread.h>
 #include <SupportDefs.h>
 
 #include <list>
 #include <utility>
 
+#include "RegistrarThread.h"
+
 struct entry_ref;
 class BMessage;
 
diff --git a/src/kits/app/RegistrarThread.cpp b/src/servers/registrar/mime/RegistrarThread.cpp
similarity index 100%
rename from src/kits/app/RegistrarThread.cpp
rename to src/servers/registrar/mime/RegistrarThread.cpp
diff --git a/headers/private/app/RegistrarThread.h b/src/servers/registrar/mime/RegistrarThread.h
similarity index 100%
rename from headers/private/app/RegistrarThread.h
rename to src/servers/registrar/mime/RegistrarThread.h
diff --git a/src/kits/app/RegistrarThreadManager.cpp b/src/servers/registrar/mime/RegistrarThreadManager.cpp
similarity index 99%
rename from src/kits/app/RegistrarThreadManager.cpp
rename to src/servers/registrar/mime/RegistrarThreadManager.cpp
index 8d2772c570..187aaac0f5 100644
--- a/src/kits/app/RegistrarThreadManager.cpp
+++ b/src/servers/registrar/mime/RegistrarThreadManager.cpp
@@ -10,10 +10,12 @@
 #include "RegistrarThreadManager.h"
 
 #include <RegistrarDefs.h>
-#include <RegistrarThread.h>
 
 #include <stdio.h>
 
+#include "RegistrarThread.h"
+
+
 //#define DBG(x) x
 #define DBG(x)
 #define OUT printf
diff --git a/headers/private/app/RegistrarThreadManager.h b/src/servers/registrar/mime/RegistrarThreadManager.h
similarity index 100%
rename from headers/private/app/RegistrarThreadManager.h
rename to src/servers/registrar/mime/RegistrarThreadManager.h