#include clean up Query.h

BigFile.cpp

@@ -10,6 +10,7 @@
 #include "Sanity.h"
 #include "GbMutex.h"
 #include "ScopedLock.h"
+#include "Mem.h"
 #include <fcntl.h>
 #include <new>
 #include <vector>

Collectiondb.cpp

@@ -22,6 +22,7 @@
 #include "Dir.h"
 #include "File.h"
 #include "Conf.h"
+#include "Mem.h"
 #include <sys/stat.h> //mkdir()
 
 static HashTableX g_collTable;

Conf.cpp

@@ -9,6 +9,7 @@
 #include "TcpSocket.h"
 #include "HttpRequest.h"
 #include "Process.h"
+#include "Mem.h"
 #include "ip.h"
 #include <sys/stat.h> //umask()
 

Hostdb.cpp

@@ -14,6 +14,7 @@
 #include "File.h"
 #include "IPAddressChecks.h"
 #include "ip.h"
+#include "Mem.h"
 #include <fcntl.h>
 #include <sys/types.h>
 #include <ifaddrs.h>

Matches.cpp

@@ -12,6 +12,7 @@
 #include "Xml.h"
 #include "BitOperations.h"
 #include "Process.h"
+#include "Mem.h"
 
 
 // TODO: have Matches set itself from all the meta tags, titles, link text,

Msg1.cpp

@@ -11,6 +11,8 @@
 #include "Conf.h"
 #include "GbMutex.h"
 #include "ScopedLock.h"
+#include "Mem.h"
+
 
 static void gotReplyWrapper1 ( void    *state , void *state2 ) ;
 static void handleRequest1   ( UdpSlot *slot  , int32_t niceness ) ;

Msg2.cpp

@@ -9,6 +9,7 @@
 #include "HighFrequencyTermShortcuts.h"
 #include "Sanity.h"
 #include "Conf.h"
+#include "Mem.h"
 
 
 static int countWhitelistItems(const char *whitelist) {

Msg22.cpp

@@ -6,6 +6,7 @@
 #include "UdpSlot.h"
 #include "Collectiondb.h"
 #include "Process.h"
+#include "Mem.h"
 
 static void handleRequest22 ( UdpSlot *slot , int32_t netnice ) ;
 

Msg3.cpp

@@ -9,6 +9,7 @@
 #include "ScopedLock.h"
 #include "Sanity.h"
 #include "Conf.h"
+#include "Mem.h"
 #include <new>
 
 

Msg4.cpp

@@ -17,6 +17,7 @@
 #include "PingServer.h"
 #include "ip.h"
 #include "max_niceness.h"
+#include "Mem.h"
 #include <sys/stat.h> //stat()
 #include <fcntl.h>
 

Msg5.cpp

@@ -11,6 +11,7 @@
 #include "ip.h"
 #include "Sanity.h"
 #include "Conf.h"
+#include "Mem.h"
 
 
 //#define GBSANITYCHECK

Msge0.cpp

@@ -2,6 +2,7 @@
 #include "Process.h"
 #include "Tagdb.h"
 #include "ip.h"
+#include "Mem.h"
 #include <new>
 
 

Msge1.cpp

@@ -2,6 +2,7 @@
 #include "Process.h"
 #include "ip.h"
 #include "Conf.h"
+#include "Mem.h"
 
 #include "Msge1.h"
 

PageAddUrl.cpp

@@ -7,6 +7,7 @@
 #include "Parms.h"
 #include "GigablastRequest.h"
 #include "Conf.h"
+#include "Mem.h"
 
 static bool sendReply( void *state );
 

PageStats.cpp

@@ -21,6 +21,8 @@
 #include "Sections.h"
 #include "Msg13.h"
 #include "Msg3.h"
+#include "Mem.h"
+
 
 static bool printNumAbbr(SafeBuf &p, int64_t vvv) {
 	float val = (float)vvv;

PageStatsdb.cpp

@@ -8,6 +8,7 @@
 #include "SafeBuf.h"
 #include "max_niceness.h"
 #include "Conf.h"
+#include "Mem.h"
 
 class StateStatsdb {
  public:

PingServer.cpp

@@ -26,6 +26,7 @@ int32_t klogctl( int, char *,int ) { return 0; }
 #include "Rebalance.h"
 #include "Stats.h"
 #include "ip.h"
+#include "Mem.h"
 #include "Version.h"
 
 #define PAGER_BUF_SIZE (10*1024)

Pos.cpp

@@ -4,6 +4,7 @@
 #include "Words.h"
 #include "Sections.h"
 #include "Conf.h"
+#include "Mem.h"
 
 
 Pos::Pos() {

Query.h

@@ -6,7 +6,6 @@
 #define GB_QUERY_H
 
 #include "SafeBuf.h"
-#include "Mem.h"
 
 // support big OR queries for image shingles
 #define ABS_MAX_QUERY_LEN 62000

Rdb.cpp

@@ -24,8 +24,10 @@
 #include "ip.h"
 #include "max_niceness.h"
 #include "Conf.h"
+#include "Mem.h"
 #include <sys/stat.h> //mdir()
 
+
 Rdb::Rdb ( ) {
 
 	m_lastReclaim = -1;

RdbBase.cpp

@@ -22,6 +22,7 @@
 #include "File.h"
 #include "GbMoveFile.h"
 #include "GbMakePath.h"
+#include "Mem.h"
 #include "ScopedLock.h"
 #include <sys/stat.h> //mkdir(), stat()
 #include <fcntl.h>

RdbBase.h

@@ -26,11 +26,8 @@
 #ifndef GB_RDBBASE_H
 #define GB_RDBBASE_H
 
-#include "Mem.h"
-#include "RdbScan.h"
 #include "RdbDump.h"
 #include "Msg3.h"               // MAX_RDB_FILES definition
-#include "RdbMem.h"
 #include "RdbIndex.h"
 #include "rdbid_t.h"
 #include "GbMutex.h"

RdbBuckets.cpp

@@ -7,6 +7,7 @@
 #include "Sanity.h"
 #include "Conf.h"
 #include "Collectiondb.h"
+#include "Mem.h"
 #include <fcntl.h>
 
 #define BUCKET_SIZE 8192

RdbCache.cpp

@@ -13,6 +13,7 @@
 #include "ScopedLock.h"
 #include "Sanity.h"
 #include "Conf.h"
+#include "Mem.h"
 #include <fcntl.h>
 
 

RdbDump.cpp

@@ -4,6 +4,7 @@
 #include "Collectiondb.h"
 #include "Statsdb.h"
 #include "Conf.h"
+#include "Mem.h"
 #include <fcntl.h>
 
 

RdbIndex.cpp

@@ -6,6 +6,7 @@
 #include "Process.h"
 #include "BitOperations.h"
 #include "Conf.h"
+#include "Mem.h"
 #include <set>
 #include <unordered_set>
 #include <algorithm>

RdbList.cpp

@@ -7,6 +7,7 @@
 #include "Posdb.h"
 #include "Linkdb.h"
 #include "Conf.h"
+#include "Mem.h"
 #include <set>
 
 // . compares to keys split into 6 byte ptrs

RdbMem.cpp

@@ -1,5 +1,6 @@
 #include "RdbMem.h"
 #include "Rdb.h"
+#include "Mem.h"
 #include "Sanity.h"
 
 // RdbMem allocates a fixed chunk of memory and initially sets m_ptr1 to point at the start and m_ptr2 at the end

RdbScan.cpp

@@ -3,6 +3,7 @@
 #include "RdbScan.h"
 #include "Rdb.h"
 #include "Process.h"
+#include "Mem.h"
 
 
 // . readset up for a scan of slots in the RdbScans

Summary.cpp

@@ -9,6 +9,7 @@
 #include "Process.h"
 #include "Conf.h"
 #include "Url.h"
+#include "Mem.h"
 
 
 Summary::Summary()

Tagdb.cpp

@@ -19,6 +19,7 @@
 #include "GbMutex.h"
 #include "GbUtil.h"
 #include "ScopedLock.h"
+#include "Mem.h"
 
 
 static HashTableX s_ht;

Wiktionary.cpp

@@ -7,6 +7,7 @@
 #include "Titledb.h"
 #include "Speller.h"
 #include "Conf.h"
+#include "Mem.h"
 #include <sys/stat.h> //stat()
 #include <fcntl.h>
 

Words.cpp

@@ -8,6 +8,7 @@
 #include "HashTableX.h"
 #include "Sections.h"
 #include "XmlNode.h" // getTagLen()
+#include "Mem.h"
 #include "Sanity.h"