From 1b56c9340343dac2f59d8d39cee11c70cb4c7f7c Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Sat, 7 May 2016 18:20:50 -0400
Subject: be a bit more explicit about dependencies between modules

---
 src/config.c      | 2 ++
 src/display.c     | 1 +
 src/loop.c        | 1 +
 src/pty-unix.c    | 2 ++
 src/runes.c       | 2 ++
 src/runes.h       | 9 ---------
 src/runesd.c      | 1 +
 src/socket.c      | 1 +
 src/term.h        | 5 +++++
 src/util.c        | 1 +
 src/window-xlib.c | 2 ++
 11 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/config.c b/src/config.c
index ca9abc6..7b0cd6b 100644
--- a/src/config.c
+++ b/src/config.c
@@ -1,7 +1,9 @@
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "runes.h"
+#include "config.h"
 
 static void runes_config_set_defaults(RunesTerm *t);
 static FILE *runes_config_get_config_file();
diff --git a/src/display.c b/src/display.c
index f8b6157..49c9d27 100644
--- a/src/display.c
+++ b/src/display.c
@@ -2,6 +2,7 @@
 #include <stdlib.h>
 
 #include "runes.h"
+#include "display.h"
 
 static void runes_display_recalculate_font_metrics(RunesTerm *t);
 static int runes_display_draw_cell(RunesTerm *t, int row, int col);
diff --git a/src/loop.c b/src/loop.c
index 0a45439..2290680 100644
--- a/src/loop.c
+++ b/src/loop.c
@@ -1,6 +1,7 @@
 #include <stdlib.h>
 
 #include "runes.h"
+#include "loop.h"
 
 struct runes_loop_data {
     uv_work_t req;
diff --git a/src/pty-unix.c b/src/pty-unix.c
index 6cd7715..1351b90 100644
--- a/src/pty-unix.c
+++ b/src/pty-unix.c
@@ -8,6 +8,8 @@
 #include <unistd.h>
 
 #include "runes.h"
+#include "pty-unix.h"
+#include "loop.h"
 
 static void runes_pty_backend_read(RunesTerm *t);
 static int runes_pty_backend_got_data(RunesTerm *t);
diff --git a/src/runes.c b/src/runes.c
index 393fda1..5d0d2b7 100644
--- a/src/runes.c
+++ b/src/runes.c
@@ -1,6 +1,8 @@
 #include <locale.h>
 
 #include "runes.h"
+#include "loop.h"
+#include "term.h"
 
 int main (int argc, char *argv[])
 {
diff --git a/src/runes.h b/src/runes.h
index c006c7c..5be7e78 100644
--- a/src/runes.h
+++ b/src/runes.h
@@ -18,15 +18,6 @@ typedef struct runes_loop RunesLoop;
 typedef struct runes_socket RunesSocket;
 
 #include "util.h"
-
-#include "loop.h"
-
-#include "window-xlib.h"
-#include "pty-unix.h"
-
-#include "config.h"
-#include "display.h"
-
 #include "term.h"
 
 #endif
diff --git a/src/runesd.c b/src/runesd.c
index 0e1cff6..48a9e57 100644
--- a/src/runesd.c
+++ b/src/runesd.c
@@ -1,6 +1,7 @@
 #include <locale.h>
 
 #include "runes.h"
+#include "loop.h"
 #include "socket.h"
 
 int main (int argc, char *argv[])
diff --git a/src/socket.c b/src/socket.c
index 8e3d37a..af7d52f 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -8,6 +8,7 @@
 
 #include "runes.h"
 #include "socket.h"
+#include "loop.h"
 
 static int runes_socket_open(RunesSocket *sock);
 static void runes_socket_close(RunesSocket *sock);
diff --git a/src/term.h b/src/term.h
index f7a2023..2e43c6a 100644
--- a/src/term.h
+++ b/src/term.h
@@ -3,6 +3,11 @@
 
 #include <vt100.h>
 
+#include "config.h"
+#include "display.h"
+#include "pty-unix.h"
+#include "window-xlib.h"
+
 struct runes_term {
     RunesWindowBackend w;
     RunesPtyBackend pty;
diff --git a/src/util.c b/src/util.c
index cd0d1d0..39b08a6 100644
--- a/src/util.c
+++ b/src/util.c
@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
 
 #include "runes.h"
 
diff --git a/src/window-xlib.c b/src/window-xlib.c
index a6c4f66..ffda703 100644
--- a/src/window-xlib.c
+++ b/src/window-xlib.c
@@ -8,6 +8,8 @@
 #include <X11/Xutil.h>
 
 #include "runes.h"
+#include "window-xlib.h"
+#include "loop.h"
 
 static char *atom_names[RUNES_NUM_ATOMS] = {
     "WM_DELETE_WINDOW",
-- 
cgit v1.2.3-54-g00ecf