diff --git a/runtime/queries/cpp/highlights.scm b/runtime/queries/cpp/highlights.scm
index 16025c862..da45ddab7 100644
--- a/runtime/queries/cpp/highlights.scm
+++ b/runtime/queries/cpp/highlights.scm
@@ -214,11 +214,21 @@
   "using"
   "requires"
   "constexpr"
-  "import"
-  "export"
-  "module"
 ] @keyword
 
+(module_declaration
+  "module" @keyword)
+
+(module_declaration
+  "export" @keyword
+  "module" @keyword)
+
+(import_declaration
+  "import" @keyword)
+
+(export_declaration
+  "export" @keyword)
+
 [
   "class"
   "namespace"