Stop #including Collectiondb.h from header files (mostly)

PageBasic.cpp

@@ -1,6 +1,7 @@
 #include "SafeBuf.h"
 #include "HttpRequest.h"
 #include "SearchInput.h"
+#include "Collectiondb.h"
 #include "Pages.h"
 #include "Parms.h"
 #include "Spider.h"

PageCrawlBot.cpp

@@ -21,6 +21,7 @@
 #include "HttpServer.h"
 #include "Pages.h" // g_msg
 #include "PageInject.h" // Msg7
+#include "Collectiondb.h"
 #include "Repair.h"
 #include "Parms.h"
 #include "SpiderLoop.h"

PageRoot.h

@@ -2,8 +2,10 @@
 #define GB_PAGEROOT_H
 
 #include "SafeBuf.h"
-#include "Collectiondb.h"
+
 class SearchInput;
+class CollectionRec;
+class HttpRequest;
 
 bool printFrontPageShell ( SafeBuf *sb,
                            const char *tabName,

SearchInput.cpp

@@ -6,6 +6,7 @@
 #include "CountryCode.h"
 #include "PageResults.h"
 #include "GbUtil.h"
+#include "Collectiondb.h"
 #include "Conf.h"
 
 #include <third-party/cld2/public/compact_lang_det.h>

SearchInput.h

@@ -16,7 +16,8 @@
 
 #include "Query.h" // MAX_QUERY_LEN
 #include "HttpRequest.h"
-#include "Collectiondb.h"
+
+class CollectionRec;
 
 class SearchInput {
 public: