Changed the header includes around to reflect the new source layout.

8 files changed, 16 insertions, 13 deletions

diff --git a/src/acl.c b/src/acl.c
index 3815775..3ba1772 100644
--- a/src/acl.c
+++ b/src/acl.c
@@ -1,4 +1,4 @@
-/* $Id: acl.c,v 1.14 2002-04-18 17:59:21 rjkaes Exp $
+/* $Id: acl.c,v 1.15 2002-05-23 18:20:27 rjkaes Exp $
  *
  * This system handles Access Control for use of this daemon. A list of
  * domains, or IP addresses (including IP blocks) are stored in a list
@@ -20,9 +20,9 @@
 #include "tinyproxy.h"
 
 #include "acl.h"
+#include "heap.h"
 #include "log.h"
 #include "sock.h"
-#include "utils.h"
 
 struct acl_s {
 	acl_access_t acl_access;
diff --git a/src/anonymous.c b/src/anonymous.c
index 3f6f1b0..3a95130 100644
--- a/src/anonymous.c
+++ b/src/anonymous.c
@@ -1,4 +1,4 @@
-/* $Id: anonymous.c,v 1.13 2002-04-25 18:52:09 rjkaes Exp $
+/* $Id: anonymous.c,v 1.14 2002-05-23 18:20:27 rjkaes Exp $
  *
  * Handles insertion and searches for headers which should be let through when
  * the anonymous feature is turned on.
@@ -20,8 +20,8 @@
 
 #include "anonymous.h"
 #include "hashmap.h"
+#include "heap.h"
 #include "log.h"
-#include "utils.h"
 
 static hashmap_t anonymous_map = NULL;
 
diff --git a/src/filter.c b/src/filter.c
index 51bba80..bc1d679 100644
--- a/src/filter.c
+++ b/src/filter.c
@@ -1,4 +1,4 @@
-/* $Id: filter.c,v 1.9 2002-04-18 17:59:21 rjkaes Exp $
+/* $Id: filter.c,v 1.10 2002-05-23 18:20:27 rjkaes Exp $
  *
  * Copyright (c) 1999  George Talusan (gstalusan@uwaterloo.ca)
  *
@@ -19,8 +19,8 @@
 #include "tinyproxy.h"
 
 #include "filter.h"
+#include "heap.h"
 #include "regexp.h"
-#include "utils.h"
 
 static int err;
 
diff --git a/src/hashmap.c b/src/hashmap.c
index 18006c6..ba700a0 100644
--- a/src/hashmap.c
+++ b/src/hashmap.c
@@ -1,4 +1,4 @@
-/* $Id: hashmap.c,v 1.9 2002-05-13 20:02:23 rjkaes Exp $
+/* $Id: hashmap.c,v 1.10 2002-05-23 18:20:27 rjkaes Exp $
  *
  * A hashmap implementation.  The keys are case-insensitive NULL terminated
  * strings, and the data is arbitrary lumps of data.  Copies of both the
@@ -28,7 +28,7 @@
 #include "tinyproxy.h"
 
 #include "hashmap.h"
-#include "utils.h"
+#include "heap.h"
 
 /*
  * These structures are the storage for the hashmap.  Entries are stored in
diff --git a/src/log.c b/src/log.c
index 9577e5f..584fee5 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1,4 +1,4 @@
-/* $Id: log.c,v 1.19 2002-04-26 16:50:55 rjkaes Exp $
+/* $Id: log.c,v 1.20 2002-05-23 18:20:27 rjkaes Exp $
  *
  * Logs the various messages which tinyproxy produces to either a log file or
  * the syslog daemon. Not much to it...
@@ -20,6 +20,7 @@
 #include "tinyproxy.h"
 
 #include "hashmap.h"
+#include "heap.h"
 #include "log.h"
 
 static char *syslog_level[] = {
diff --git a/src/stats.c b/src/stats.c
index d41604a..c239d94 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -1,4 +1,4 @@
-/* $Id: stats.c,v 1.7 2001-11-22 00:31:10 rjkaes Exp $
+/* $Id: stats.c,v 1.8 2002-05-23 18:20:27 rjkaes Exp $
  *
  * This module handles the statistics for tinyproxy. There are only two
  * public API functions. The reason for the functions, rather than just a
@@ -24,6 +24,7 @@
 #include "tinyproxy.h"
 
 #include "log.h"
+#include "heap.h"
 #include "stats.h"
 #include "utils.h"
 
diff --git a/src/thread.c b/src/thread.c
index 76ea216..9313380 100644
--- a/src/thread.c
+++ b/src/thread.c
@@ -1,4 +1,4 @@
-/* $Id: thread.c,v 1.29 2002-04-28 18:32:16 rjkaes Exp $
+/* $Id: thread.c,v 1.30 2002-05-23 18:20:27 rjkaes Exp $
  *
  * Handles the creation/destruction of the various threads required for
  * processing incoming connections.
@@ -18,6 +18,7 @@
 
 #include "tinyproxy.h"
 
+#include "heap.h"
 #include "log.h"
 #include "reqs.h"
 #include "sock.h"
diff --git a/src/vector.c b/src/vector.c
index f448eb1..0a657f5 100644
--- a/src/vector.c
+++ b/src/vector.c
@@ -1,4 +1,4 @@
-/* $Id: vector.c,v 1.4 2002-05-13 23:32:16 rjkaes Exp $
+/* $Id: vector.c,v 1.5 2002-05-23 18:20:27 rjkaes Exp $
  *
  * A vector implementation.  The vector can be of an arbritrary length, and
  * the data for each entry is an lump of data (the size is stored in the
@@ -23,8 +23,8 @@
 
 #include "tinyproxy.h"
 
+#include "heap.h"
 #include "vector.h"
-#include "utils.h"
 
 /*
  * These structures are the storage for the "vector".  Entries are