Prep for removing some headers included via protos.h

diff --git a/src/CpuAffinity.cc b/src/CpuAffinity.cc
index b944c912b5f3426f8c29f0bc76eb5ed75eeaed07..e6665682dbea98dba8d3aa2044250f793b40b8fd 100644 (file)
--- a/src/CpuAffinity.cc
+++ b/src/CpuAffinity.cc
@@ -1,8 +1,5 @@
 /*
- * $Id$
- *
  * DEBUG: section 54    Interprocess Communication
- *
  */
 
 #include "squid.h"
@@ -11,6 +8,7 @@
 #include "CpuAffinityMap.h"
 #include "CpuAffinitySet.h"
 #include "Debug.h"
+#include "globals.h"
 #include "protos.h"
 #include "structs.h"
 #include "tools.h"

diff --git a/src/DiskIO/AIO/AIODiskFile.cc b/src/DiskIO/AIO/AIODiskFile.cc
index 1d51d5bd352a373d460a2f1665aeae5cb73ed9d4..230b52d7f167b6f29a9c800bf413c10cc9cdfcad 100644 (file)
--- a/src/DiskIO/AIO/AIODiskFile.cc
+++ b/src/DiskIO/AIO/AIODiskFile.cc
@@ -1,5 +1,6 @@
 /*
- * $Id$
+ * AUTHOR: Adrian Chadd <adrian@squid-cache.org>
+ * DEBUG: section 79   Disk IO Routines
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------
@@ -31,7 +32,6 @@
  */
 
 /**
- * Author: Adrian Chadd <adrian@squid-cache.org>
  *
  \par
  * These routines are simple plugin replacements for the file_* routines
@@ -51,6 +51,7 @@
 #include "DiskIO/ReadRequest.h"
 #include "DiskIO/WriteRequest.h"
 #include "disk.h"
+#include "globals.h"
 #include "protos.h"
 
 #if HAVE_ERRNO_H

diff --git a/src/DiskIO/AIO/AIODiskFile.h b/src/DiskIO/AIO/AIODiskFile.h
index c424735df340c56626aaee1fe5ab48ae2919e709..fe5ab9b5465f72c208d5bc4846f2fe6acd9a6211 100644 (file)
--- a/src/DiskIO/AIO/AIODiskFile.h
+++ b/src/DiskIO/AIO/AIODiskFile.h
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------
  *

diff --git a/src/DiskIO/Blocking/BlockingFile.cc b/src/DiskIO/Blocking/BlockingFile.cc
index 2cb215a81d8ac7723700c6fb6872acb9605d23dd..8f9fb580ff0a2922dc4102e0a5a2f6b11303f0ce 100644 (file)
--- a/src/DiskIO/Blocking/BlockingFile.cc
+++ b/src/DiskIO/Blocking/BlockingFile.cc
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Robert Collins
  *
@@ -35,6 +33,8 @@
 #include "squid.h"
 #include "BlockingFile.h"
 #include "Debug.h"
+#include "defines.h"
+#include "globals.h"
 #include "DiskIO/IORequestor.h"
 #include "DiskIO/ReadRequest.h"
 #include "DiskIO/WriteRequest.h"

diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc
index c5666ff5c231bbfb0e58f44ac2ef7fe7753bd7a4..5368ab699a773aedeaaceaf4ff578a9ba1908b78 100644 (file)
--- a/src/HttpHeader.cc
+++ b/src/HttpHeader.cc
@@ -1,7 +1,4 @@
-
 /*
- * $Id$
- *
  * DEBUG: section 55    HTTP Header
  * AUTHOR: Alex Rousskov
  *
@@ -30,11 +27,11 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- *
  */
 
 #include "squid.h"
 #include "base64.h"
+#include "globals.h"
 #include "HttpHdrCc.h"
 #include "HttpHdrContRange.h"
 #include "HttpHdrSc.h"

diff --git a/src/HttpRequest.cc b/src/HttpRequest.cc
index b1a8128a33365131e12f26b5dc473c7a06424c3a..be4171e99faa2e1761c00b906fa746edc4847382 100644 (file)
--- a/src/HttpRequest.cc
+++ b/src/HttpRequest.cc
@@ -1,7 +1,4 @@
-
 /*
- * $Id$
- *
  * DEBUG: section 73    HTTP Request
  * AUTHOR: Duane Wessels
  *
@@ -40,6 +37,7 @@
 #include "client_side.h"
 #include "DnsLookupDetails.h"
 #include "err_detail_type.h"
+#include "globals.h"
 #include "gopher.h"
 #include "http.h"
 #include "HttpHdrCc.h"

diff --git a/src/client_side.cc b/src/client_side.cc
index 0801f102a375ea9aa8eb1813fe40c744ac175847..8efcd692a7a45495c1ddd6148c1ba711b0ded97f 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * DEBUG: section 33    Client-side Routines
  * AUTHOR: Duane Wessels
  *
@@ -29,7 +27,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- *
  */
 
 /**
@@ -105,6 +102,7 @@
 #include "fde.h"
 #include "forward.h"
 #include "fqdncache.h"
+#include "globals.h"
 #include "http.h"
 #include "HttpHdrContRange.h"
 #include "HttpHeaderTools.h"

diff --git a/src/comm/TcpAcceptor.cc b/src/comm/TcpAcceptor.cc
index 371cbbc7a07e859128207ea7a5c4efa3b2f2b845..bd4bad91e2ae58cc3eb70707e7b28dedba0b3a46 100644 (file)
--- a/src/comm/TcpAcceptor.cc
+++ b/src/comm/TcpAcceptor.cc
@@ -43,6 +43,7 @@
 #include "comm/TcpAcceptor.h"
 #include "fd.h"
 #include "fde.h"
+#include "globals.h"
 #include "ip/Intercept.h"
 #include "profiler/Profiler.h"
 #include "protos.h"

diff --git a/src/disk.cc b/src/disk.cc
index eb31a75db42080457a43fe74f6c770e9efe74af6..632aa7534616cb6b7849f5e0b2d48f8af0e1c4e4 100644 (file)
--- a/src/disk.cc
+++ b/src/disk.cc
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * DEBUG: section 06    Disk I/O Routines
  * AUTHOR: Harvest Derived
  *
@@ -36,6 +34,7 @@
 #include "comm/Loops.h"
 #include "fd.h"
 #include "fde.h"
+#include "globals.h"
 #include "Mem.h"
 #include "MemBuf.h"
 #include "profiler/Profiler.h"

diff --git a/src/fs/rock/RockRebuild.cc b/src/fs/rock/RockRebuild.cc
index 4b2b7d8fc945e00966f93513cd83a248fe64f53b..636b16fc88c4df2e47cad93d6fe3a3207b8fde53 100644 (file)
--- a/src/fs/rock/RockRebuild.cc
+++ b/src/fs/rock/RockRebuild.cc
@@ -7,6 +7,7 @@
 #include "fs/rock/RockRebuild.h"
 #include "fs/rock/RockSwapDir.h"
 #include "fs/rock/RockDbCell.h"
+#include "globals.h"
 #include "md5.h"
 #include "protos.h"
 #include "tools.h"

diff --git a/src/fs/rock/RockSwapDir.cc b/src/fs/rock/RockSwapDir.cc
index 9bb6acc038c3534ac8e0df94fa564f727301b2d2..7c5db08e6f7a39dde7d5f1ddc58e6585c467fb62 100644 (file)
--- a/src/fs/rock/RockSwapDir.cc
+++ b/src/fs/rock/RockSwapDir.cc
@@ -15,6 +15,7 @@
 #include "fs/rock/RockIoState.h"
 #include "fs/rock/RockIoRequests.h"
 #include "fs/rock/RockRebuild.h"
+#include "globals.h"
 #include "ipc/mem/Pages.h"
 #include "MemObject.h"
 #include "Parsing.h"

diff --git a/src/fs/ufs/RebuildState.cc b/src/fs/ufs/RebuildState.cc
index 9f345fc3d544eb87fd2512c2c8a8ff91aa0d7faa..28c388c5e43cea4d592820925f13de91a79c11f6 100644 (file)
--- a/src/fs/ufs/RebuildState.cc
+++ b/src/fs/ufs/RebuildState.cc
@@ -1,5 +1,4 @@
 /*
- *
  * DEBUG: section 47    Store Directory Routines
  * AUTHOR: Robert Collins
  *
@@ -33,12 +32,13 @@
 
 #include "squid.h"
 #include "disk.h"
+#include "globals.h"
 #include "protos.h"
 #include "RebuildState.h"
 #include "SquidTime.h"
 #include "store_key_md5.h"
-#include "StoreSwapLogData.h"
 #include "store_rebuild.h"
+#include "StoreSwapLogData.h"
 #include "tools.h"
 #include "UFSSwapLogParser.h"
 

diff --git a/src/fs/ufs/UFSSwapDir.cc b/src/fs/ufs/UFSSwapDir.cc
index 90828770c4f20cbbc8eb82047ecad19676cd816f..e64d106fa043200a5a2b854d21f45f7740ec2c11 100644 (file)
--- a/src/fs/ufs/UFSSwapDir.cc
+++ b/src/fs/ufs/UFSSwapDir.cc
@@ -38,6 +38,7 @@
 #include "DiskIO/DiskIOModule.h"
 #include "FileMap.h"
 #include "fde.h"
+#include "globals.h"
 #include "Parsing.h"
 #include "protos.h"
 #include "RebuildState.h"

diff --git a/src/gopher.cc b/src/gopher.cc
index 68ca56fc9bff4871a91db1ebd504df096bbc5272..50270a96c60e85aad2638f6c9fb53a5f9637ba8e 100644 (file)
--- a/src/gopher.cc
+++ b/src/gopher.cc
@@ -1,7 +1,4 @@
-
 /*
- * $Id$
- *
  * DEBUG: section 10    Gopher
  * AUTHOR: Harvest Derived
  *
@@ -30,7 +27,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- *
  */
 
 #include "squid.h"
@@ -39,6 +35,7 @@
 #include "errorpage.h"
 #include "fd.h"
 #include "forward.h"
+#include "globals.h"
 #include "html_quote.h"
 #include "HttpReply.h"
 #include "HttpRequest.h"

diff --git a/src/http.cc b/src/http.cc
index c904b1689bd64e5214718a0e2e6da2529824e4fd..a34be79e7f64d7b40e0baefa419c91f3205f0f8a 100644 (file)
--- a/src/http.cc
+++ b/src/http.cc
@@ -1,7 +1,4 @@
-
 /*
- * $Id$
- *
  * DEBUG: section 11    Hypertext Transfer Protocol (HTTP)
  * AUTHOR: Harvest Derived
  *
@@ -30,7 +27,6 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111, USA.
- *
  */
 
 /*
@@ -50,6 +46,7 @@
 #include "errorpage.h"
 #include "fd.h"
 #include "fde.h"
+#include "globals.h"
 #include "HttpControlMsg.h"
 #include "http.h"
 #include "HttpHdrCc.h"

diff --git a/src/ipc/Kids.cc b/src/ipc/Kids.cc
index 94089cf5486513f658febb9b998b53c851a1f6e5..9abaffefbeb450318310765da33d2efeb1574fb3 100644 (file)
--- a/src/ipc/Kids.cc
+++ b/src/ipc/Kids.cc
@@ -1,15 +1,14 @@
 /*
- * $Id$
- *
  * DEBUG: section 54    Interprocess Communication
- *
  */
 
 #include "squid.h"
 #include "base/TextException.h"
+#include "globals.h"
 #include "ipc/Kids.h"
 #include "protos.h"
 #include "tools.h"
+#include "structs.h"
 
 Kids TheKids;
 KidName TheKidName;

diff --git a/src/protos.h b/src/protos.h
index 6b7f6e9c01d80b9f631ad6ea0ae62c31f7cfd0d9..ed9de7a5e99541c3bc87c10169e9ca3d2e401b4a 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -88,8 +88,6 @@ extern void reconfigure(int);
 
 #include "fatal.h"
 
-
-
 SQUIDCEXTERN peer_t parseNeighborType(const char *s);
 
 SQUIDCEXTERN int stringHasWhitespace(const char *); //String.cc

diff --git a/src/typedefs.h b/src/typedefs.h
index 619fbd7f33edae6919b4a05b9a966b065eee8547..0dd6099aea4b006a2cd9cb647ca9a81328ddb6fb 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -1,7 +1,4 @@
-
 /*
- * $Id$
- *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
  * ----------------------------------------------------------