diff --git a/Source/LogUploader.cpp b/Source/LogUploader.cpp
index b6859cea..203b88a9 100644
--- a/Source/LogUploader.cpp
+++ b/Source/LogUploader.cpp
@@ -26,8 +26,6 @@
 
 #include <memory>
 
-using namespace std;
-
 namespace
 {
     struct HTTPHandleDeleter
@@ -35,7 +33,7 @@ namespace
         void operator()(HINTERNET h) { WinHttpCloseHandle(h); }
     };
 
-    struct HTTPHandle : unique_ptr<void, HTTPHandleDeleter>
+    struct HTTPHandle : std::unique_ptr<void, HTTPHandleDeleter>
     {
         explicit HTTPHandle(HINTERNET h=nullptr) : unique_ptr(h) {}
         operator HINTERNET() { return get(); }
diff --git a/Source/SettingsPublish.cpp b/Source/SettingsPublish.cpp
index 00a942e5..d6cebcab 100644
--- a/Source/SettingsPublish.cpp
+++ b/Source/SettingsPublish.cpp
@@ -398,8 +398,6 @@ namespace
 
 void SettingsPublish::OptimizeSettings()
 {
-    using namespace std;
-
     auto refresh_on_exit = onScopeExit([&] { SetWarningInfo(); });
     XConfig serverData;
     if (!serverData.Open(L"services.xconfig"))
@@ -430,7 +428,7 @@ void SettingsPublish::OptimizeSettings()
     if (!r)
         return;
 
-    typedef vector<function<void()>> optimizers_t;
+    using optimizers_t = std::vector<std::function<void()>>;
     optimizers_t optimizers;
 
     String changes = Str("Settings.Publish.Optimize.Optimizations");