diff --git a/src/interfaces/ecpg/preproc/ecpg.header b/src/interfaces/ecpg/preproc/ecpg.header
index 9c5018c2490b8c45761fa022fdeb1c8ea8bdbe9a..a2be29c4348ae1de094affc4bf619221f63ffafd 100644
--- a/src/interfaces/ecpg/preproc/ecpg.header
+++ b/src/interfaces/ecpg/preproc/ecpg.header
@@ -59,7 +59,7 @@ static char *forward_name = NULL;
 struct ECPGtype ecpg_no_indicator = {ECPGt_NO_INDICATOR, NULL, NULL, NULL, {NULL}, 0};
 struct variable no_indicator = {"no_indicator", &ecpg_no_indicator, 0, NULL};
 
-struct ECPGtype ecpg_query = {ECPGt_char_variable, NULL, NULL, NULL, {NULL}, 0};
+static struct ECPGtype ecpg_query = {ECPGt_char_variable, NULL, NULL, NULL, {NULL}, 0};
 
 /*
  * Handle parsing errors and warnings
diff --git a/src/interfaces/ecpg/preproc/ecpg_keywords.c b/src/interfaces/ecpg/preproc/ecpg_keywords.c
index fb54d7b5c6d75c1165e7a2d8010390c042e89643..7f7041ffd8db2a740b7df458d2db475319bbd14a 100644
--- a/src/interfaces/ecpg/preproc/ecpg_keywords.c
+++ b/src/interfaces/ecpg/preproc/ecpg_keywords.c
@@ -16,10 +16,6 @@
 #include "extern.h"
 #include "preproc.h"
 
-/* Globals from keywords.c */
-extern const ScanKeyword SQLScanKeywords[];
-extern const int NumSQLScanKeywords;
-
 /*
  * List of (keyword-name, keyword-token-value) pairs.
  *
diff --git a/src/interfaces/ecpg/preproc/extern.h b/src/interfaces/ecpg/preproc/extern.h
index efe74c718eef32b2cb4e4dce4ad948f3036cb684..dfc75bceec2e93abeb184dc4b392803b258294fd 100644
--- a/src/interfaces/ecpg/preproc/extern.h
+++ b/src/interfaces/ecpg/preproc/extern.h
@@ -58,6 +58,10 @@ extern struct when when_error,
 			when_warn;
 extern struct ECPGstruct_member *struct_member_list[STRUCT_DEPTH];
 
+/* Globals from keywords.c */
+extern const ScanKeyword SQLScanKeywords[];
+extern const int NumSQLScanKeywords;
+
 /* functions */
 
 extern const char *get_dtype(enum ECPGdtype);
diff --git a/src/interfaces/ecpg/preproc/keywords.c b/src/interfaces/ecpg/preproc/keywords.c
index 178a70427f38f9b7b181bb9c6cc375255be36b26..73d31c7471908d79fde40cec6210cd94848d9b66 100644
--- a/src/interfaces/ecpg/preproc/keywords.c
+++ b/src/interfaces/ecpg/preproc/keywords.c
@@ -17,6 +17,7 @@
 
 #include "parser/keywords.h"
 #include "type.h"
+#include "extern.h"
 #include "preproc.h"
 
 #define PG_KEYWORD(a,b,c) {a,b,c},