diff --git a/data/glr.c b/data/glr.c
index 935ee96a..6a12cfbd 100644
--- a/data/glr.c
+++ b/data/glr.c
@@ -214,13 +214,13 @@ b4_percent_code_get([[top]])[
 #define yynerrs ]b4_prefix[nerrs]b4_locations_if([[
 #define yylloc  ]b4_prefix[lloc]])])[
 
-/* Copy the first part of user declarations.  */
+/* First part of user declarations.  */
 ]b4_user_pre_prologue[
 
 ]b4_null_define[
 
 ]b4_defines_if([[#include "@basename(]b4_spec_defines_file[@)"]],
-              [b4_shared_declarations])[
+               [b4_shared_declarations])[
 
 /* Enabling verbose error messages.  */
 #ifdef YYERROR_VERBOSE
diff --git a/data/lalr1.cc b/data/lalr1.cc
index f71be3f2..3d6bdca9 100644
--- a/data/lalr1.cc
+++ b/data/lalr1.cc
@@ -358,17 +358,17 @@ m4_if(b4_prefix, [yy], [],
 // Take the name prefix into account.
 #define yylex   b4_prefix[]lex])[
 
-/* First part of user declarations.  */
+// First part of user declarations.
 ]b4_user_pre_prologue[
 
+]b4_null_define[
+
 #include "@basename(]b4_spec_defines_file[@)"
 
 /* User implementation prologue.  */
 ]b4_user_post_prologue[
 ]b4_percent_code_get[
 
-]b4_null_define[
-
 #ifndef YY_
 # if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS