diff --git a/dbms/src/Access/AccessControlManager.h b/dbms/src/Access/AccessControlManager.h
index 1eb71547a69..22c3bafd25c 100644
--- a/dbms/src/Access/AccessControlManager.h
+++ b/dbms/src/Access/AccessControlManager.h
@@ -24,7 +24,7 @@ using AccessRightsContextPtr = std::shared_ptr<const AccessRightsContext>;
 class AccessRightsContextFactory;
 struct User;
 using UserPtr = std::shared_ptr<const User>;
-struct RoleContext;
+class RoleContext;
 using RoleContextPtr = std::shared_ptr<const RoleContext>;
 class RoleContextFactory;
 class RowPolicyContext;
diff --git a/dbms/src/Access/AccessRightsContext.h b/dbms/src/Access/AccessRightsContext.h
index 6d53568d8a9..f129d70162d 100644
--- a/dbms/src/Access/AccessRightsContext.h
+++ b/dbms/src/Access/AccessRightsContext.h
@@ -20,9 +20,9 @@ struct CurrentRolesInfo;
 using CurrentRolesInfoPtr = std::shared_ptr<const CurrentRolesInfo>;
 class RoleContext;
 using RoleContextPtr = std::shared_ptr<const RoleContext>;
-struct RowPolicyContext;
+class RowPolicyContext;
 using RowPolicyContextPtr = std::shared_ptr<const RowPolicyContext>;
-struct QuotaContext;
+class QuotaContext;
 using QuotaContextPtr = std::shared_ptr<const QuotaContext>;
 struct Settings;
 class AccessControlManager;
diff --git a/dbms/src/Access/RoleContext.h b/dbms/src/Access/RoleContext.h
index 9b54a0e624e..5f19adc56de 100644
--- a/dbms/src/Access/RoleContext.h
+++ b/dbms/src/Access/RoleContext.h
@@ -13,7 +13,7 @@ namespace DB
 {
 struct Role;
 using RolePtr = std::shared_ptr<const Role>;
-class CurrentRolesInfo;
+struct CurrentRolesInfo;
 using CurrentRolesInfoPtr = std::shared_ptr<const CurrentRolesInfo>;
 class AccessControlManager;
 
diff --git a/dbms/src/Interpreters/InterpreterCreateUserQuery.h b/dbms/src/Interpreters/InterpreterCreateUserQuery.h
index c2a6fc46f68..f2b0b825fd9 100644
--- a/dbms/src/Interpreters/InterpreterCreateUserQuery.h
+++ b/dbms/src/Interpreters/InterpreterCreateUserQuery.h
@@ -7,7 +7,7 @@
 namespace DB
 {
 class ASTCreateUserQuery;
-class GenericRoleSet;
+struct GenericRoleSet;
 struct User;