libmdoc.h and libman.h were including mdoc.h and man.h, respectively.

Don't have them do that (includes in header files = faugh), and have
individual files directly include these files.

18 files changed, 16 insertions, 5 deletions

diff --git a/arch.c b/arch.c
index ebcb83d8..6e6d5dac 100644
--- a/arch.c
+++ b/arch.c
@@ -22,6 +22,7 @@
 #include <string.h>
 #include <time.h>
 
+#include "mdoc.h"
 #include "mandoc.h"
 #include "libmdoc.h"
 
diff --git a/att.c b/att.c
index 924a322b..6e5c9de5 100644
--- a/att.c
+++ b/att.c
@@ -22,6 +22,7 @@
 #include <string.h>
 #include <time.h>
 
+#include "mdoc.h"
 #include "mandoc.h"
 #include "libmdoc.h"
 
diff --git a/lib.c b/lib.c
index 1156834f..9bafccbf 100644
--- a/lib.c
+++ b/lib.c
@@ -22,6 +22,7 @@
 #include <string.h>
 #include <time.h>
 
+#include "mdoc.h"
 #include "mandoc.h"
 #include "libmdoc.h"
 
diff --git a/libman.h b/libman.h
index d9318a59..fbcb8a8e 100644
--- a/libman.h
+++ b/libman.h
@@ -17,8 +17,6 @@
 #ifndef LIBMAN_H
 #define LIBMAN_H
 
-#include "man.h"
-
 enum	man_next {
 	MAN_NEXT_SIBLING = 0,
 	MAN_NEXT_CHILD
diff --git a/libmdoc.h b/libmdoc.h
index 6ed88116..357d24a8 100644
--- a/libmdoc.h
+++ b/libmdoc.h
@@ -17,8 +17,6 @@
 #ifndef LIBMDOC_H
 #define LIBMDOC_H
 
-#include "mdoc.h"
-
 enum	mdoc_next {
 	MDOC_NEXT_SIBLING = 0,
 	MDOC_NEXT_CHILD
diff --git a/man.c b/man.c
index 5b302bc1..96237058 100644
--- a/man.c
+++ b/man.c
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "man.h"
 #include "mandoc.h"
 #include "libman.h"
 #include "libmandoc.h"
diff --git a/man_argv.c b/man_argv.c
index 6771e53c..2e22139e 100644
--- a/man_argv.c
+++ b/man_argv.c
@@ -22,11 +22,11 @@
 
 #include <assert.h>
 
+#include "man.h"
 #include "mandoc.h"
 #include "libman.h"
 #include "libmandoc.h"
 
-
 int
 man_args(struct man *m, int line, int *pos, char *buf, char **v)
 {
diff --git a/man_hash.c b/man_hash.c
index 43380425..10fa18c2 100644
--- a/man_hash.c
+++ b/man_hash.c
@@ -26,6 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "man.h"
 #include "mandoc.h"
 #include "libman.h"
 
diff --git a/man_macro.c b/man_macro.c
index c5149b81..f10a32ea 100644
--- a/man_macro.c
+++ b/man_macro.c
@@ -23,6 +23,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "man.h"
 #include "mandoc.h"
 #include "libmandoc.h"
 #include "libman.h"
diff --git a/man_validate.c b/man_validate.c
index ed8d2475..1325e776 100644
--- a/man_validate.c
+++ b/man_validate.c
@@ -30,6 +30,7 @@
 #include <string.h>
 #include <time.h>
 
+#include "man.h"
 #include "mandoc.h"
 #include "libman.h"
 #include "libmandoc.h"
diff --git a/mdoc.c b/mdoc.c
index 5e78b227..aeaaa76e 100644
--- a/mdoc.c
+++ b/mdoc.c
@@ -28,6 +28,7 @@
 #include <string.h>
 #include <time.h>
 
+#include "mdoc.h"
 #include "mandoc.h"
 #include "libmdoc.h"
 #include "libmandoc.h"
diff --git a/mdoc_argv.c b/mdoc_argv.c
index dad47cf7..5a02de31 100644
--- a/mdoc_argv.c
+++ b/mdoc_argv.c
@@ -26,6 +26,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "mdoc.h"
 #include "mandoc.h"
 #include "libmdoc.h"
 #include "libmandoc.h"
diff --git a/mdoc_hash.c b/mdoc_hash.c
index 5ab4aecb..88c10331 100644
--- a/mdoc_hash.c
+++ b/mdoc_hash.c
@@ -27,6 +27,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "mdoc.h"
 #include "mandoc.h"
 #include "libmdoc.h"
 
diff --git a/mdoc_macro.c b/mdoc_macro.c
index f012cfc7..a6c1d91d 100644
--- a/mdoc_macro.c
+++ b/mdoc_macro.c
@@ -26,6 +26,7 @@
 #include <string.h>
 #include <time.h>
 
+#include "mdoc.h"
 #include "mandoc.h"
 #include "libmdoc.h"
 #include "libmandoc.h"
diff --git a/mdoc_validate.c b/mdoc_validate.c
index 0ccc3758..d9819ecb 100644
--- a/mdoc_validate.c
+++ b/mdoc_validate.c
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <time.h>
 
+#include "mdoc.h"
 #include "mandoc.h"
 #include "libmdoc.h"
 #include "libmandoc.h"
diff --git a/msec.c b/msec.c
index 840bec27..906534be 100644
--- a/msec.c
+++ b/msec.c
@@ -21,6 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "mdoc.h"
 #include "mandoc.h"
 #include "libmdoc.h"
 
diff --git a/st.c b/st.c
index e33a782a..04631627 100644
--- a/st.c
+++ b/st.c
@@ -22,6 +22,7 @@
 #include <string.h>
 #include <time.h>
 
+#include "mdoc.h"
 #include "mandoc.h"
 #include "libmdoc.h"
 
diff --git a/vol.c b/vol.c
index d6e7767d..5de4c8c6 100644
--- a/vol.c
+++ b/vol.c
@@ -22,6 +22,7 @@
 #include <string.h>
 #include <time.h>
 
+#include "mdoc.h"
 #include "mandoc.h"
 #include "libmdoc.h"