6 files changed, 10 insertions, 10 deletions
diff --git a/gentoobrowse-api/service/utils/ebuildCacheParser.h b/gentoobrowse-api/service/utils/ebuildCacheParser.h
index e881e53..4fed766 100644
--- a/gentoobrowse-api/service/utils/ebuildCacheParser.h
+++ b/gentoobrowse-api/service/utils/ebuildCacheParser.h
@@ -1,9 +1,9 @@
 #ifndef GENTOOBROWSE_API_SERVICE_MAINTENANCE_EBUILDCACHEPARSER_H
 #define GENTOOBROWSE_API_SERVICE_MAINTENANCE_EBUILDCACHEPARSER_H
 
+#include "wrap/ustring.h"
 #include <fileUtils.h>
 #include <filesystem>
-#include <glibmm/ustring.h>
 #include <map>
 #include <optional>
 #include <string_view>
diff --git a/gentoobrowse-api/service/utils/git.cpp b/gentoobrowse-api/service/utils/git.cpp
index 1d7d9a8..b21edf2 100644
--- a/gentoobrowse-api/service/utils/git.cpp
+++ b/gentoobrowse-api/service/utils/git.cpp
@@ -35,7 +35,7 @@ namespace Gentoo {
 			GitAnnotatedCommitPtr
 			gitFetch(git_repository * repo, git_remote * remote, const char * remoteBranchName)
 			{
-				auto opts = gitSafeGet(git_fetch_init_options, GIT_FETCH_OPTIONS_VERSION);
+				auto opts = gitSafeGet(git_fetch_init_options, static_cast<unsigned int>(GIT_FETCH_OPTIONS_VERSION));
 				opts.prune = GIT_FETCH_PRUNE;
 				opts.update_fetchhead = 1;
 				auto localBranch = gitSafeGet(git_repository_head, git_reference_free, repo);
@@ -57,7 +57,7 @@ namespace Gentoo {
 				const git_annotated_commit * heads[] = {fetch_head};
 				git_merge_analysis_t analysis = GIT_MERGE_ANALYSIS_NONE;
 				git_merge_preference_t preference = GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY;
-				gitSafe(git_merge_analysis, &analysis, &preference, repo, heads, 1);
+				gitSafe(git_merge_analysis, &analysis, &preference, repo, heads, 1LU);
 
 				auto head = gitSafeGet(git_repository_head, git_reference_free, repo);
 				if (analysis == GIT_MERGE_ANALYSIS_UP_TO_DATE) {
diff --git a/gentoobrowse-api/service/utils/git.h b/gentoobrowse-api/service/utils/git.h
index 7e2e66a..b9191e1 100644
--- a/gentoobrowse-api/service/utils/git.h
+++ b/gentoobrowse-api/service/utils/git.h
@@ -14,8 +14,8 @@ namespace Gentoo {
 			void
 			gitSafe(int (*func)(P...), A... p)
 			{
-				if (int _giterror = func(p...) < 0) {
-					throwError((void * const)func, _giterror);
+				if (int giterror_ = func(p...) < 0) {
+					throwError(reinterpret_cast<void * const>(func), giterror_);
 				}
 			}
 
diff --git a/gentoobrowse-api/service/utils/splitEbuildProps.cpp b/gentoobrowse-api/service/utils/splitEbuildProps.cpp
index 1f2c5ea..ec9df6b 100644
--- a/gentoobrowse-api/service/utils/splitEbuildProps.cpp
+++ b/gentoobrowse-api/service/utils/splitEbuildProps.cpp
@@ -6,7 +6,7 @@
 namespace Gentoo {
 	namespace Utils {
 		SplitEbuildProps::SplitEbuildProps(
-				const std::string & ce, int e, const std::string & cp, const std::optional<Glib::ustring> & p) :
+				const std::string & ce, int64_t e, const std::string & cp, const std::optional<Glib::ustring> & p) :
 			entityId(e),
 			colEntityName(ce), colPropName(cp), props(p)
 		{
diff --git a/gentoobrowse-api/service/utils/splitEbuildProps.h b/gentoobrowse-api/service/utils/splitEbuildProps.h
index 00ce910..3945b6a 100644
--- a/gentoobrowse-api/service/utils/splitEbuildProps.h
+++ b/gentoobrowse-api/service/utils/splitEbuildProps.h
@@ -1,7 +1,7 @@
 #ifndef GENTOOBROWSE_API_SERVICE_MAINTENANCE_SPLITEBUILDPROPS_H
 #define GENTOOBROWSE_API_SERVICE_MAINTENANCE_SPLITEBUILDPROPS_H
 
-#include <glibmm/ustring.h>
+#include "wrap/ustring.h"
 #include <optional>
 #include <sqlWriter.h>
 
@@ -10,12 +10,12 @@ namespace Gentoo {
 		class SplitEbuildProps : public DB::SqlWriter {
 		public:
 			SplitEbuildProps(
-					const std::string & ce, int e, const std::string & cp, const std::optional<Glib::ustring> & p);
+					const std::string & ce, int64_t e, const std::string & cp, const std::optional<Glib::ustring> & p);
 
 			void writeSql(AdHoc::Buffer & sql) override;
 			void bindParams(DB::Command * c, unsigned int & offset) override;
 
-			const int entityId;
+			const int64_t entityId;
 			const std::string colEntityName, colPropName;
 			const std::optional<Glib::ustring> props;
 		};
diff --git a/gentoobrowse-api/service/utils/xmlUtils.h b/gentoobrowse-api/service/utils/xmlUtils.h
index 26e5da0..51da33a 100644
--- a/gentoobrowse-api/service/utils/xmlUtils.h
+++ b/gentoobrowse-api/service/utils/xmlUtils.h
@@ -1,8 +1,8 @@
 #ifndef GENTOOBROWSE_API_SERVICE_XMLUTILS_H
 #define GENTOOBROWSE_API_SERVICE_XMLUTILS_H
 
+#include "wrap/domparser.h"
 #include <filesystem>
-#include <libxml++/parsers/domparser.h>
 #include <optional>
 
 namespace Gentoo {