diff --git a/src/servers/registrar/MIMEManager.cpp b/src/servers/registrar/MIMEManager.cpp
index 8160ab55f6..968af15b6e 100644
--- a/src/servers/registrar/MIMEManager.cpp
+++ b/src/servers/registrar/MIMEManager.cpp
@@ -14,6 +14,8 @@
 #include <stdio.h>
 #include <string>
 
+using namespace std;
+
 #include "MIMEManager.h"
 
 /*!
diff --git a/src/servers/registrar/MessageRunnerManager.cpp b/src/servers/registrar/MessageRunnerManager.cpp
index 4d60f7f274..f198315c4b 100644
--- a/src/servers/registrar/MessageRunnerManager.cpp
+++ b/src/servers/registrar/MessageRunnerManager.cpp
@@ -24,8 +24,8 @@
 //	Description:	Manages the registrar side "shadows" of BMessageRunners.
 //------------------------------------------------------------------------------
 
-#include <algobase.h>
-#include <new.h>
+#include <algorithm>
+#include <new>
 
 #include <Autolock.h>
 #include <Message.h>
diff --git a/src/servers/registrar/RecentEntries.cpp b/src/servers/registrar/RecentEntries.cpp
index 56d3066bfd..d5bc68fb20 100644
--- a/src/servers/registrar/RecentEntries.cpp
+++ b/src/servers/registrar/RecentEntries.cpp
@@ -42,6 +42,8 @@
 #include <new>
 #include <map>
 
+using namespace std;
+
 #define DBG(x) (x)
 //#define DBG(x)
 #define OUT printf
diff --git a/src/servers/registrar/RosterSettingsCharStream.cpp b/src/servers/registrar/RosterSettingsCharStream.cpp
index 0812c9fd6c..b3f8f9949c 100644
--- a/src/servers/registrar/RosterSettingsCharStream.cpp
+++ b/src/servers/registrar/RosterSettingsCharStream.cpp
@@ -5,6 +5,14 @@
 
 #include <stdio.h>
 
+const status_t RosterSettingsCharStream::kEndOfLine;
+const status_t RosterSettingsCharStream::kEndOfStream;
+const status_t RosterSettingsCharStream::kInvalidEscape;
+const status_t RosterSettingsCharStream::kUnterminatedQuotedString;
+const status_t RosterSettingsCharStream::kComment;
+const status_t RosterSettingsCharStream::kUnexpectedState;
+const status_t RosterSettingsCharStream::kStringTooLong;
+
 using namespace BPrivate::Storage::Sniffer;
 
 //------------------------------------------------------------------------------
diff --git a/src/servers/registrar/WatchingService.cpp b/src/servers/registrar/WatchingService.cpp
index 339995ac3c..46b1040b08 100644
--- a/src/servers/registrar/WatchingService.cpp
+++ b/src/servers/registrar/WatchingService.cpp
@@ -29,6 +29,8 @@
 #include "Watcher.h"
 #include "WatchingService.h"
 
+using namespace std;
+
 /*!	\class WatchingService
 	\brief Features everything needed to provide a watching service.
 
diff --git a/src/servers/registrar/WatchingService.h b/src/servers/registrar/WatchingService.h
index 1d1a9c1ea1..b81cc646df 100644
--- a/src/servers/registrar/WatchingService.h
+++ b/src/servers/registrar/WatchingService.h
@@ -47,7 +47,7 @@ public:
 	void NotifyWatchers(BMessage *message, WatcherFilter *filter = NULL);
 
 private:
-	typedef map<BMessenger,Watcher*> watcher_map;
+	typedef std::map<BMessenger,Watcher*> watcher_map;
 
 private:
 	watcher_map	fWatchers;