diff --git a/src/starter/ipsec-parser.h b/src/starter/ipsec-parser.h
index 1c6cf20ef..fb64bfa2a 100644
--- a/src/starter/ipsec-parser.h
+++ b/src/starter/ipsec-parser.h
@@ -17,13 +17,6 @@
 
 #include "keywords.h"
 
-typedef struct kw_entry kw_entry_t;
-
-struct kw_entry {
-	char *name;
-	kw_token_t token;
-};
-
 typedef struct kw_list kw_list_t;
 
 struct kw_list {
diff --git a/src/starter/keywords.h b/src/starter/keywords.h
index 5b6b28bf8..94af493f8 100644
--- a/src/starter/keywords.h
+++ b/src/starter/keywords.h
@@ -16,7 +16,10 @@
 #ifndef _KEYWORDS_H_
 #define _KEYWORDS_H_
 
-typedef enum {
+typedef enum kw_token_t kw_token_t;
+typedef struct kw_entry_t kw_entry_t;
+
+enum kw_token_t {
 	/* config setup keywords */
 	KW_CHARONDEBUG,
 	KW_UNIQUEIDS,
@@ -185,6 +188,11 @@ typedef enum {
 	KW_ALSO,
 	KW_AUTO,
 
-} kw_token_t;
+};
+
+struct kw_entry_t {
+	char *name;
+	kw_token_t token;
+};
 
 #endif /* _KEYWORDS_H_ */