diff --git a/dbms/src/Databases/IDatabase.h b/dbms/src/Databases/IDatabase.h
index b4985dc066b..65bcc62bfdb 100644
--- a/dbms/src/Databases/IDatabase.h
+++ b/dbms/src/Databases/IDatabase.h
@@ -3,7 +3,7 @@
 #include <Core/Types.h>
 #include <Parsers/IAST_fwd.h>
 #include <Storages/IStorage_fwd.h>
-#include <Dictionaries/IDictionary_fwd.h>
+#include <Dictionaries/IDictionary.h>
 #include <Common/Exception.h>
 
 #include <ctime>
diff --git a/dbms/src/Dictionaries/IDictionary.h b/dbms/src/Dictionaries/IDictionary.h
index def5d58e243..9ce7c569f75 100644
--- a/dbms/src/Dictionaries/IDictionary.h
+++ b/dbms/src/Dictionaries/IDictionary.h
@@ -16,7 +16,7 @@ namespace DB
 {
 
 struct IDictionaryBase;
-using DictionaryPtr = std::shared_ptr<IDictionaryBase>;
+using DictionaryPtr = std::unique_ptr<IDictionaryBase>;
 
 struct DictionaryStructure;
 class ColumnString;
@@ -57,7 +57,7 @@ struct IDictionaryBase : public IExternalLoadable
 
     virtual std::exception_ptr getLastException() const { return {}; }
 
-    DictionaryPtr shared_from_this()
+    std::shared_ptr<IDictionaryBase> shared_from_this()
     {
         return std::static_pointer_cast<IDictionaryBase>(IExternalLoadable::shared_from_this());
     }
diff --git a/dbms/src/Dictionaries/IDictionary_fwd.h b/dbms/src/Dictionaries/IDictionary_fwd.h
deleted file mode 100644
index 864dad217b6..00000000000
--- a/dbms/src/Dictionaries/IDictionary_fwd.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include <Core/Types.h>
-
-#include <set>
-#include <memory>
-
-namespace DB
-{
-
-struct IDictionaryBase;
-using DictionaryPtr = std::shared_ptr<IDictionaryBase>;
-
-}
diff --git a/dbms/src/Interpreters/ExternalLoader.cpp b/dbms/src/Interpreters/ExternalLoader.cpp
index 5c5e0d44d47..5f0ccc9ae90 100644
--- a/dbms/src/Interpreters/ExternalLoader.cpp
+++ b/dbms/src/Interpreters/ExternalLoader.cpp
@@ -761,7 +761,6 @@ private:
         else
         {
             /// Perform the loading immediately.
-            /// Deadlock when we try to load dictionary from dictionary on localhost
             doLoading(name, loading_id, false);
         }
     }
diff --git a/dbms/src/Interpreters/IExternalLoaderConfigRepository.h b/dbms/src/Interpreters/IExternalLoaderConfigRepository.h
index efb91815555..93cefe0a0d4 100644
--- a/dbms/src/Interpreters/IExternalLoaderConfigRepository.h
+++ b/dbms/src/Interpreters/IExternalLoaderConfigRepository.h
@@ -13,7 +13,6 @@ namespace DB
 
 using LoadablesConfigurationPtr = Poco::AutoPtr<Poco::Util::AbstractConfiguration>;
 
-
 /// Base interface for configurations source for Loadble objects, which can be
 /// loaded with ExternalLoader. Configurations may came from filesystem (XML-files),
 /// server memory (from database), etc. It's important that main result of this class
diff --git a/dbms/src/Interpreters/InterpreterCreateQuery.cpp b/dbms/src/Interpreters/InterpreterCreateQuery.cpp
index 61a2f18d8e1..68701e22e8b 100644
--- a/dbms/src/Interpreters/InterpreterCreateQuery.cpp
+++ b/dbms/src/Interpreters/InterpreterCreateQuery.cpp
@@ -43,8 +43,6 @@
 #include <Databases/DatabaseFactory.h>
 #include <Databases/IDatabase.h>
 
-#include <Dictionaries/DictionaryFactory.h>
-
 #include <Compression/CompressionFactory.h>
 
 #include <Interpreters/InterpreterDropQuery.h>