From 4b01408715cd10e3bf02eb1e87531917a09c2645 Mon Sep 17 00:00:00 2001
From: "Thomas E. Dickey" <dickey@invisible-island.net>
Date: Tue, 5 Mar 2024 03:43:57 -0500
Subject: include "gram.h" only from "parse.h"

all of the users of (generated) gram.h rely upon (custom) parse.h,
and the order of those headers affects portability.

Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
---
 src/events.c | 1 -
 src/icons.c  | 1 -
 src/lex.l    | 1 -
 src/list.c   | 2 +-
 src/menus.c  | 1 -
 src/parse.c  | 1 -
 src/parse.h  | 1 +
 src/twm.c    | 1 -
 src/util.c   | 2 +-
 9 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/events.c b/src/events.c
index 585ae16..4b3f1c6 100644
--- a/src/events.c
+++ b/src/events.c
@@ -66,7 +66,6 @@ in this Software without prior written authorization from The Open Group.
 #include "events.h"
 #include "resize.h"
 #include "parse.h"
-#include "gram.h"
 #include "util.h"
 #include "screen.h"
 #include "icons.h"
diff --git a/src/icons.c b/src/icons.c
index 3ebb4b2..4957e51 100644
--- a/src/icons.c
+++ b/src/icons.c
@@ -35,7 +35,6 @@ in this Software without prior written authorization from The Open Group.
 #include "twm.h"
 #include "screen.h"
 #include "icons.h"
-#include "gram.h"
 #include "parse.h"
 #include "util.h"
 
diff --git a/src/lex.l b/src/lex.l
index 13b85e6..8bb5d19 100644
--- a/src/lex.l
+++ b/src/lex.l
@@ -66,7 +66,6 @@ in this Software without prior written authorization from The Open Group.
 
 /* #include <stdio.h> */ /* lex already includes stdio.h */
 #include "twm.h"
-#include "gram.h"
 #include "list.h"
 #include "parse.h"
 
diff --git a/src/list.c b/src/list.c
index cceba24..3ddf078 100644
--- a/src/list.c
+++ b/src/list.c
@@ -61,7 +61,7 @@ in this Software without prior written authorization from The Open Group.
 #include <stdio.h>
 #include "twm.h"
 #include "screen.h"
-#include "gram.h"
+#include "parse.h"
 #include "util.h"
 
 struct name_list_struct {
diff --git a/src/menus.c b/src/menus.c
index 44e0904..ed06453 100644
--- a/src/menus.c
+++ b/src/menus.c
@@ -70,7 +70,6 @@ in this Software without prior written authorization from The Open Group.
 #include "events.h"
 #include "util.h"
 #include "parse.h"
-#include "gram.h"
 #include "screen.h"
 #include "menus.h"
 #include "iconmgr.h"
diff --git a/src/parse.c b/src/parse.c
index 4ffc4aa..c659e53 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -66,7 +66,6 @@ in this Software without prior written authorization from The Open Group.
 #include "screen.h"
 #include "menus.h"
 #include "util.h"
-#include "gram.h"
 #include "parse.h"
 
 #include <X11/Xatom.h>
diff --git a/src/parse.h b/src/parse.h
index a208cc8..2327ab1 100644
--- a/src/parse.h
+++ b/src/parse.h
@@ -61,6 +61,7 @@ in this Software without prior written authorization from The Open Group.
 #define PARSE_H
 
 #include "list.h"
+#include "gram.h"
 
 extern void assign_var_savecolor(void);
 extern int do_single_keyword(int keyword);
diff --git a/src/twm.c b/src/twm.c
index 78a425c..a5e93bc 100644
--- a/src/twm.c
+++ b/src/twm.c
@@ -72,7 +72,6 @@ in this Software without prior written authorization from The Open Group.
 #include "menus.h"
 #include "events.h"
 #include "util.h"
-#include "gram.h"
 #include "screen.h"
 #include "parse.h"
 #include "session.h"
diff --git a/src/util.c b/src/util.c
index 5671fad..9a04ac1 100644
--- a/src/util.c
+++ b/src/util.c
@@ -59,7 +59,7 @@ in this Software without prior written authorization from The Open Group.
 
 #include "twm.h"
 #include "util.h"
-#include "gram.h"
+#include "parse.h"
 #include "screen.h"
 #include <X11/Xos.h>
 #include <X11/Xatom.h>
-- 
cgit v1.2.3