12 files changed, 53 insertions, 12 deletions
diff --git a/gentoobrowse-api/service/utils/dbUtils.cpp b/gentoobrowse-api/service/utils/dbUtils.cpp
index d0ae626..d08307a 100644
--- a/gentoobrowse-api/service/utils/dbUtils.cpp
+++ b/gentoobrowse-api/service/utils/dbUtils.cpp
@@ -1,9 +1,10 @@
 #include "dbUtils.h"
-#include <atomic>
 #include <boost/algorithm/string/join.hpp>
-#include <boost/lexical_cast.hpp>
-#include <buffer.h>
+#include <compileTimeFormatter.h>
+#include <connection.h>
 #include <tablepatch.h>
+#include <unistd.h>
+#include <vector>
 
 namespace Gentoo::Utils::Database {
 	std::string
@@ -14,7 +15,7 @@ namespace Gentoo::Utils::Database {
 		if (dot != std::string::npos) {
 			tempTable = tempTable.substr(dot + 1);
 		}
-		tempTable += "_clone_" + boost::lexical_cast<std::string>(db);
+		tempTable += AdHoc::scprintf<"_clone_%?%?">(getpid(), db);
 		db->execute("CREATE TEMPORARY TABLE " + tempTable + " AS SELECT * FROM " + orig + " WHERE false");
 		return tempTable;
 	}
diff --git a/gentoobrowse-api/service/utils/dbUtils.h b/gentoobrowse-api/service/utils/dbUtils.h
index dee1b2d..8a691b6 100644
--- a/gentoobrowse-api/service/utils/dbUtils.h
+++ b/gentoobrowse-api/service/utils/dbUtils.h
@@ -1,10 +1,14 @@
 #pragma once
 
-#include <IceUtil/Exception.h>
-#include <IceUtil/Optional.h>
-#include <command.h>
-#include <connection.h>
-#include <modifycommand.h>
+#include "command_fwd.h"
+#include <map>
+#include <set>
+#include <string>
+#include <utility>
+namespace DB {
+	class Connection;
+	class TablePatch;
+}
 
 namespace Gentoo::Utils::Database {
 	std::string emptyClone(DB::Connection *, const std::string &);
diff --git a/gentoobrowse-api/service/utils/ebuildCacheParser.cpp b/gentoobrowse-api/service/utils/ebuildCacheParser.cpp
index c3fef41..a34f807 100644
--- a/gentoobrowse-api/service/utils/ebuildCacheParser.cpp
+++ b/gentoobrowse-api/service/utils/ebuildCacheParser.cpp
@@ -1,4 +1,7 @@
 #include "ebuildCacheParser.h"
+#include "wrap/ustring.h"
+#include <fileUtils.h>
+#include <utility>
 
 namespace Gentoo::Utils {
 	EbuildCacheParser::EbuildCacheParser(const std::filesystem::path & p) : AdHoc::FileUtils::MemMap(p)
diff --git a/gentoobrowse-api/service/utils/ebuildCacheParser.h b/gentoobrowse-api/service/utils/ebuildCacheParser.h
index ee3977f..c36030e 100644
--- a/gentoobrowse-api/service/utils/ebuildCacheParser.h
+++ b/gentoobrowse-api/service/utils/ebuildCacheParser.h
@@ -1,11 +1,14 @@
 #pragma once
 
-#include "wrap/ustring.h"
 #include <fileUtils.h>
-#include <filesystem>
+#include <functional>
 #include <map>
 #include <optional>
+#include <string>
 #include <string_view>
+namespace Glib {
+	class ustring;
+}
 
 namespace Gentoo::Utils {
 	class EbuildCacheParser : public AdHoc::FileUtils::MemMap {
diff --git a/gentoobrowse-api/service/utils/entityWhereFilter.cpp b/gentoobrowse-api/service/utils/entityWhereFilter.cpp
index be74f2e..68ad09d 100644
--- a/gentoobrowse-api/service/utils/entityWhereFilter.cpp
+++ b/gentoobrowse-api/service/utils/entityWhereFilter.cpp
@@ -1,6 +1,10 @@
 #include "entityWhereFilter.h"
+#include <boost/format/alt_sstream.hpp>
+#include <boost/optional/optional.hpp>
 #include <buffer.h>
 #include <command.h>
+#include <cstdint>
+#include <utility>
 
 namespace Gentoo::Utils {
 	template<typename T> EntityWhereFilter<T>::EntityWhereFilter(std::string en) : entityColName(std::move(en)) { }
diff --git a/gentoobrowse-api/service/utils/entityWhereFilter.h b/gentoobrowse-api/service/utils/entityWhereFilter.h
index ccb92a0..d01ca82 100644
--- a/gentoobrowse-api/service/utils/entityWhereFilter.h
+++ b/gentoobrowse-api/service/utils/entityWhereFilter.h
@@ -2,6 +2,13 @@
 
 #include <set>
 #include <sqlWriter.h>
+#include <string>
+namespace AdHoc {
+	class Buffer;
+}
+namespace DB {
+	class Command;
+}
 
 namespace Gentoo::Utils {
 	template<typename T> class EntityWhereFilter : public DB::SqlWriter {
diff --git a/gentoobrowse-api/service/utils/git.cpp b/gentoobrowse-api/service/utils/git.cpp
index c2e94b7..2e1a3eb 100644
--- a/gentoobrowse-api/service/utils/git.cpp
+++ b/gentoobrowse-api/service/utils/git.cpp
@@ -1,6 +1,10 @@
 #include "git.h"
+#include <array>
+#include <cassert>
 #include <compileTimeFormatter.h>
+#include <cstdlib>
 #include <execinfo.h>
+#include <logWriter.h>
 #include <logger.h>
 #include <maintenance.h>
 
diff --git a/gentoobrowse-api/service/utils/git.h b/gentoobrowse-api/service/utils/git.h
index d240b51..27bf33b 100644
--- a/gentoobrowse-api/service/utils/git.h
+++ b/gentoobrowse-api/service/utils/git.h
@@ -3,6 +3,7 @@
 #include <git2.h>
 #include <memory>
 #include <ostream>
+#include <string>
 
 namespace Gentoo::Utils::Git {
 	void throwError(void * const func, int err);
diff --git a/gentoobrowse-api/service/utils/splitEbuildProps.cpp b/gentoobrowse-api/service/utils/splitEbuildProps.cpp
index f9e1b6e..b97586d 100644
--- a/gentoobrowse-api/service/utils/splitEbuildProps.cpp
+++ b/gentoobrowse-api/service/utils/splitEbuildProps.cpp
@@ -1,7 +1,9 @@
 #include "splitEbuildProps.h"
-#include "dbUtils.h"
+#include <boost/format/alt_sstream.hpp>
+#include <boost/optional/optional.hpp>
 #include <buffer.h>
 #include <command.h>
+#include <utility>
 
 namespace Gentoo::Utils {
 	SplitEbuildProps::SplitEbuildProps(std::string ce, int64_t e, std::string cp, std::optional<Glib::ustring> p) :
diff --git a/gentoobrowse-api/service/utils/splitEbuildProps.h b/gentoobrowse-api/service/utils/splitEbuildProps.h
index c413a51..9020c22 100644
--- a/gentoobrowse-api/service/utils/splitEbuildProps.h
+++ b/gentoobrowse-api/service/utils/splitEbuildProps.h
@@ -1,8 +1,16 @@
 #pragma once
 
 #include "wrap/ustring.h"
+#include <cstdint>
 #include <optional>
 #include <sqlWriter.h>
+#include <string>
+namespace AdHoc {
+	class Buffer;
+}
+namespace DB {
+	class Command;
+}
 
 namespace Gentoo::Utils {
 	class SplitEbuildProps : public DB::SqlWriter {
diff --git a/gentoobrowse-api/service/utils/xmlUtils.cpp b/gentoobrowse-api/service/utils/xmlUtils.cpp
index 195b054..efb8cbd 100644
--- a/gentoobrowse-api/service/utils/xmlUtils.cpp
+++ b/gentoobrowse-api/service/utils/xmlUtils.cpp
@@ -1,4 +1,7 @@
 #include "xmlUtils.h"
+#include "wrap/ustring.h"
+#include <stdexcept>
+#include <vector>
 
 namespace Gentoo::Utils {
 	XmlDoc::XmlDoc(const std::filesystem::path & path) : xmlpp::DomParser(path) { }
diff --git a/gentoobrowse-api/service/utils/xmlUtils.h b/gentoobrowse-api/service/utils/xmlUtils.h
index 0e44a73..0ca6039 100644
--- a/gentoobrowse-api/service/utils/xmlUtils.h
+++ b/gentoobrowse-api/service/utils/xmlUtils.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "wrap/domparser.h"
+#include "wrap/ustring.h"
 #include <filesystem>
 #include <optional>