diff --git a/src/completion.hh b/src/completion.hh
index bd89ea4c..44726dd3 100644
--- a/src/completion.hh
+++ b/src/completion.hh
@@ -9,7 +9,7 @@
 namespace Kakoune
 {
 
-struct Context;
+class Context;
 
 typedef std::vector<String> CandidateList;
 
diff --git a/src/context.hh b/src/context.hh
index d65e9d4e..e1715b4a 100644
--- a/src/context.hh
+++ b/src/context.hh
@@ -20,8 +20,9 @@ class KeymapManager;
 // The Context object links an Client, an Editor (which may be a Window),
 // and a UserInterface. It may represent an interactive user window, or
 // a hook execution or a macro replay.
-struct Context
+class Context
 {
+public:
     Context();
     explicit Context(Editor& editor);
     Context(Client& client, Editor& editor);
diff --git a/src/hook_manager.hh b/src/hook_manager.hh
index c5b0e152..ac2ce8f5 100644
--- a/src/hook_manager.hh
+++ b/src/hook_manager.hh
@@ -9,7 +9,7 @@
 namespace Kakoune
 {
 
-struct Context;
+class Context;
 typedef std::function<void (const String&, Context&)> HookFunc;
 
 class HookManager
diff --git a/src/register.hh b/src/register.hh
index 74e34365..ff8d5519 100644
--- a/src/register.hh
+++ b/src/register.hh
@@ -7,7 +7,7 @@
 namespace Kakoune
 {
 
-struct Context;
+class Context;
 
 class Register
 {