3 files changed, 3 insertions, 41 deletions
diff --git a/src/include/parser/gramparse.h b/src/include/parser/gramparse.h
index c3ec1992c65..6d8e4937ee0 100644
--- a/src/include/parser/gramparse.h
+++ b/src/include/parser/gramparse.h
@@ -4,8 +4,8 @@
  *		Shared definitions for the "raw" parser (flex and bison phases only)
  *
  * NOTE: this file is only meant to be included in the core parsing files,
- * ie, parser.c, gram.y, scan.l, and keywords.c.  Definitions that are needed
- * outside the core parser should be in parser.h.
+ * ie, parser.c, gram.y, scan.l, and src/common/keywords.c.
+ * Definitions that are needed outside the core parser should be in parser.h.
  *
  *
  * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
diff --git a/src/include/parser/keywords.h b/src/include/parser/keywords.h
deleted file mode 100644
index 4ac861646d6..00000000000
--- a/src/include/parser/keywords.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * keywords.h
- *	  lexical token lookup for key words in PostgreSQL
- *
- *
- * Portions Copyright (c) 1996-2016, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * src/include/parser/keywords.h
- *
- *-------------------------------------------------------------------------
- */
-#ifndef KEYWORDS_H
-#define KEYWORDS_H
-
-/* Keyword categories --- should match lists in gram.y */
-#define UNRESERVED_KEYWORD		0
-#define COL_NAME_KEYWORD		1
-#define TYPE_FUNC_NAME_KEYWORD	2
-#define RESERVED_KEYWORD		3
-
-
-typedef struct ScanKeyword
-{
-	const char *name;			/* in lower case */
-	int16		value;			/* grammar's token code */
-	int16		category;		/* see codes above */
-} ScanKeyword;
-
-extern PGDLLIMPORT const ScanKeyword ScanKeywords[];
-extern PGDLLIMPORT const int NumScanKeywords;
-
-extern const ScanKeyword *ScanKeywordLookup(const char *text,
-				  const ScanKeyword *keywords,
-				  int num_keywords);
-
-#endif   /* KEYWORDS_H */
diff --git a/src/include/parser/scanner.h b/src/include/parser/scanner.h
index 0060501937f..b885e67a83b 100644
--- a/src/include/parser/scanner.h
+++ b/src/include/parser/scanner.h
@@ -19,7 +19,7 @@
 #ifndef SCANNER_H
 #define SCANNER_H
 
-#include "parser/keywords.h"
+#include "common/keywords.h"
 
 /*
  * The scanner returns extra data about scanned tokens in this union type.