diff --git a/src/completion.hh b/src/completion.hh
index cf626ec5..45c25149 100644
--- a/src/completion.hh
+++ b/src/completion.hh
@@ -9,7 +9,7 @@
 namespace Kakoune
 {
 
-class Context;
+struct Context;
 
 typedef std::vector<String> CandidateList;
 
diff --git a/src/editor.hh b/src/editor.hh
index f51182a1..8df5f55a 100644
--- a/src/editor.hh
+++ b/src/editor.hh
@@ -87,7 +87,7 @@ public:
     bool is_editing() const { return m_edition_level!= 0; }
 
 private:
-    friend class scoped_edition;
+    friend struct scoped_edition;
     void begin_edition();
     void end_edition();
 
diff --git a/src/filter.hh b/src/filter.hh
index f1b11ca0..d95d5151 100644
--- a/src/filter.hh
+++ b/src/filter.hh
@@ -12,7 +12,7 @@ namespace Kakoune
 {
 
 class Buffer;
-class Selection;
+struct Selection;
 
 // A Filter is a function which is applied to a Buffer and a pending
 // Modification in order to mutate the Buffer or the Modification
diff --git a/src/hook_manager.hh b/src/hook_manager.hh
index cb8b60c1..3fcc0b74 100644
--- a/src/hook_manager.hh
+++ b/src/hook_manager.hh
@@ -8,7 +8,7 @@
 namespace Kakoune
 {
 
-class Context;
+struct Context;
 typedef std::function<void (const String&, Context&)> HookFunc;
 
 class HookManager
diff --git a/src/register.hh b/src/register.hh
index a38624d3..09ba360e 100644
--- a/src/register.hh
+++ b/src/register.hh
@@ -7,7 +7,7 @@
 namespace Kakoune
 {
 
-class Context;
+struct Context;
 
 class Register
 {
diff --git a/src/shell_manager.hh b/src/shell_manager.hh
index 615b19ec..523aec47 100644
--- a/src/shell_manager.hh
+++ b/src/shell_manager.hh
@@ -9,7 +9,7 @@
 namespace Kakoune
 {
 
-class Context;
+struct Context;
 typedef std::function<String (const String& name, const Context&)> EnvVarRetriever;
 typedef std::unordered_map<String, String>     EnvVarMap;
 
diff --git a/src/user_interface.hh b/src/user_interface.hh
index 4d20a3ac..9353fe7e 100644
--- a/src/user_interface.hh
+++ b/src/user_interface.hh
@@ -11,7 +11,7 @@ namespace Kakoune
 
 class String;
 class DisplayBuffer;
-class DisplayCoord;
+struct DisplayCoord;
 
 enum class MenuStyle
 {