diff --git a/dbms/src/Databases/DatabasesCommon.h b/dbms/src/Databases/DatabasesCommon.h
index 734708e4c95..7b09669d2ff 100644
--- a/dbms/src/Databases/DatabasesCommon.h
+++ b/dbms/src/Databases/DatabasesCommon.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Core/Types.h>
+#include <Parsers/ASTFunction.h>
 #include <Parsers/IAST.h>
 #include <Storages/IStorage_fwd.h>
 #include <Databases/IDatabase.h>
diff --git a/dbms/src/Interpreters/InterpreterCreateQuery.cpp b/dbms/src/Interpreters/InterpreterCreateQuery.cpp
index 9d7e052c826..d187f68eda3 100644
--- a/dbms/src/Interpreters/InterpreterCreateQuery.cpp
+++ b/dbms/src/Interpreters/InterpreterCreateQuery.cpp
@@ -12,6 +12,7 @@
 #include <Parsers/ASTColumnDeclaration.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTIndexDeclaration.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTNameTypePair.h>
 #include <Parsers/ASTInsertQuery.h>
diff --git a/dbms/src/Interpreters/SystemLog.h b/dbms/src/Interpreters/SystemLog.h
index b00f77b7622..301bceba525 100644
--- a/dbms/src/Interpreters/SystemLog.h
+++ b/dbms/src/Interpreters/SystemLog.h
@@ -15,6 +15,7 @@
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/ASTRenameQuery.h>
 #include <Parsers/formatAST.h>
+#include <Parsers/ASTIndexDeclaration.h>
 #include <Parsers/ASTInsertQuery.h>
 #include <Interpreters/InterpreterCreateQuery.h>
 #include <Interpreters/InterpreterRenameQuery.h>
diff --git a/dbms/src/Parsers/ASTIndexDeclaration.h b/dbms/src/Parsers/ASTIndexDeclaration.h
index 48deffc2c3a..61e966b3d1b 100644
--- a/dbms/src/Parsers/ASTIndexDeclaration.h
+++ b/dbms/src/Parsers/ASTIndexDeclaration.h
@@ -2,7 +2,6 @@
 
 #include <Core/Field.h>
 #include <Core/Types.h>
-#include <Common/FieldVisitors.h>
 #include <IO/WriteHelpers.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
diff --git a/dbms/src/Storages/IndicesDescription.cpp b/dbms/src/Storages/IndicesDescription.cpp
index c2e461cee8a..a5772a835bf 100644
--- a/dbms/src/Storages/IndicesDescription.cpp
+++ b/dbms/src/Storages/IndicesDescription.cpp
@@ -1,13 +1,18 @@
 #include <Storages/IndicesDescription.h>
 
+#include <Parsers/ASTIndexDeclaration.h>
 #include <Parsers/formatAST.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/parseQuery.h>
 
-
 namespace DB
 {
 
+bool IndicesDescription::empty() const
+{
+    return indices.empty();
+}
+
 bool IndicesDescription::has(const String & name) const
 {
     return std::cend(indices) != std::find_if(
diff --git a/dbms/src/Storages/IndicesDescription.h b/dbms/src/Storages/IndicesDescription.h
index 06ce2d366b1..883caf6cdc2 100644
--- a/dbms/src/Storages/IndicesDescription.h
+++ b/dbms/src/Storages/IndicesDescription.h
@@ -1,11 +1,14 @@
 #pragma once
 
-#include <Parsers/ASTIndexDeclaration.h>
+#include <Core/Types.h>
 
+#include <memory>
+#include <vector>
 
 namespace DB
 {
 
+class ASTIndexDeclaration;
 using IndicesASTs = std::vector<std::shared_ptr<ASTIndexDeclaration>>;
 
 struct IndicesDescription
@@ -14,7 +17,7 @@ struct IndicesDescription
 
     IndicesDescription() = default;
 
-    bool empty() const { return indices.empty(); }
+    bool empty() const;
     bool has(const String & name) const;
 
     String toString() const;