Fix up includes.

diff --git a/Makefile.in b/Makefile.in
index 0a6beb5..27e971d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -123,10 +123,10 @@ am__v_at_0 = @
 acct.o: acct.c acct.h decode.h addr.h conv.h daylog.h graph_db.h err.h \
  cdefs.h hosts_db.h localip.h now.h opt.h
 addr.o: addr.c addr.h
-bsd.o: bsd.c bsd.h config.h
+bsd.o: bsd.c bsd.h config.h cdefs.h
 cap.o: cap.c cdefs.h cap.h config.h conv.h decode.h addr.h hosts_db.h \
  localip.h opt.h err.h
-conv.o: conv.c cdefs.h config.h conv.h err.h
+conv.o: conv.c conv.h err.h cdefs.h
 darkstat.o: darkstat.c acct.h cap.h cdefs.h config.h conv.h daylog.h \
  graph_db.h db.h dns.h err.h http.h hosts_db.h addr.h localip.h ncache.h \
  pidfile.h now.h
@@ -134,8 +134,8 @@ daylog.o: daylog.c err.h cdefs.h daylog.h graph_db.h str.h now.h
 db.o: db.c cdefs.h err.h hosts_db.h addr.h graph_db.h db.h
 decode.o: decode.c cdefs.h acct.h cap.h config.h decode.h addr.h err.h \
  opt.h
-dns.o: dns.c cdefs.h conv.h config.h decode.h addr.h dns.h err.h \
- hosts_db.h queue.h str.h tree.h bsd.h
+dns.o: dns.c cdefs.h conv.h decode.h addr.h dns.h err.h hosts_db.h \
+ queue.h str.h tree.h bsd.h config.h
 err.o: err.c cdefs.h err.h opt.h pidfile.h bsd.h config.h
 graph_db.o: graph_db.c cap.h conv.h db.h acct.h err.h cdefs.h str.h \
  html.h graph_db.h now.h opt.h

diff --git a/bsd.c b/bsd.c
index 71939fd..9a9f156 100644 (file)
--- a/bsd.c
+++ b/bsd.c
@@ -17,6 +17,10 @@
  */
 
 #include "bsd.h"
+#include "cdefs.h"
+#include "config.h"
+
+#include <string.h> /* for strlen */
 
 /* strlcpy() and strlcat() are derived from:
  *

diff --git a/conv.c b/conv.c
index 431744e..4ff95ae 100644 (file)
--- a/conv.c
+++ b/conv.c
@@ -16,8 +16,6 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include "cdefs.h"
-#include "config.h"
 #include "conv.h"
 
 #include <sys/wait.h>

diff --git a/dns.c b/dns.c
index d9e8247..7a0ac62 100644 (file)
--- a/dns.c
+++ b/dns.c
@@ -9,7 +9,6 @@
 
 #include "cdefs.h"
 #include "conv.h"
-#include "config.h"
 #include "decode.h"
 #include "dns.h"
 #include "err.h"