From: Amos Jeffries <squid3@treenet.co.nz>
Date: Tue, 28 Oct 2014 02:47:36 +0000 (-0700)
Subject: Source Maintenance
X-Git-Tag: merge-candidate-3-v1~529
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b367a435adcd0af40281b4f98a86ec1290e7a9ff;p=thirdparty%2Fsquid.git

Source Maintenance
---

diff --git a/src/StoreMetaMD5.h b/src/StoreMetaMD5.h
index 6b9431c420..72e89b5f1f 100644
--- a/src/StoreMetaMD5.h
+++ b/src/StoreMetaMD5.h
@@ -9,8 +9,8 @@
 #ifndef SQUID_STOREMETAMD5_H
 #define SQUID_STOREMETAMD5_H
 
-#include "StoreMeta.h"
 #include "MemPool.h"
+#include "StoreMeta.h"
 /* for STORE_META_KEY_MD5 */
 #include "enums.h"
 
diff --git a/src/StoreMetaSTD.h b/src/StoreMetaSTD.h
index 63c6e7a919..377586a53d 100644
--- a/src/StoreMetaSTD.h
+++ b/src/StoreMetaSTD.h
@@ -9,8 +9,8 @@
 #ifndef SQUID_STOREMETASTD_H
 #define SQUID_STOREMETASTD_H
 
-#include "StoreMeta.h"
 #include "MemPool.h"
+#include "StoreMeta.h"
 
 class StoreMetaSTD : public StoreMeta
 {
diff --git a/src/StoreMetaSTDLFS.h b/src/StoreMetaSTDLFS.h
index b6319f8ab0..df82ea3298 100644
--- a/src/StoreMetaSTDLFS.h
+++ b/src/StoreMetaSTDLFS.h
@@ -9,8 +9,8 @@
 #ifndef SQUID_STOREMETASTDLFS_H
 #define SQUID_STOREMETASTDLFS_H
 
-#include "StoreMeta.h"
 #include "MemPool.h"
+#include "StoreMeta.h"
 
 class StoreMetaSTDLFS : public StoreMeta
 {
diff --git a/src/StoreMetaURL.h b/src/StoreMetaURL.h
index 133d35ba06..f4c1f4a058 100644
--- a/src/StoreMetaURL.h
+++ b/src/StoreMetaURL.h
@@ -9,8 +9,8 @@
 #ifndef SQUID_STOREMETAURL_H
 #define SQUID_STOREMETAURL_H
 
-#include "StoreMeta.h"
 #include "MemPool.h"
+#include "StoreMeta.h"
 
 class StoreMetaURL : public StoreMeta
 {
diff --git a/src/StoreMetaVary.h b/src/StoreMetaVary.h
index 47c068cd84..e07c141591 100644
--- a/src/StoreMetaVary.h
+++ b/src/StoreMetaVary.h
@@ -9,8 +9,8 @@
 #ifndef SQUID_STOREMETAVARY_H
 #define SQUID_STOREMETAVARY_H
 
-#include "StoreMeta.h"
 #include "MemPool.h"
+#include "StoreMeta.h"
 
 class StoreMetaVary : public StoreMeta
 {
diff --git a/src/acl/HttpHeaderData.h b/src/acl/HttpHeaderData.h
index e61d193da9..8d7e259053 100644
--- a/src/acl/HttpHeaderData.h
+++ b/src/acl/HttpHeaderData.h
@@ -10,9 +10,9 @@
 #define SQUID_ACLHTTPHEADERDATA_H
 
 #include "acl/Data.h"
-#include "SquidString.h"
 #include "HttpHeader.h"
 #include "MemPool.h"
+#include "SquidString.h"
 
 class ACLHTTPHeaderData : public ACLData<HttpHeader*>
 {