diff --git a/lib/programmemory.cpp b/lib/programmemory.cpp
index a6a3f9955..faf086b5e 100644
--- a/lib/programmemory.cpp
+++ b/lib/programmemory.cpp
@@ -3,6 +3,7 @@
 #include "token.h"
 #include "astutils.h"
 #include "symboldatabase.h"
+#include <algorithm>
 #include <cassert>
 
 void ProgramMemory::setValue(nonneg int varid, const ValueFlow::Value &value)
diff --git a/lib/programmemory.h b/lib/programmemory.h
index 68df1db4a..010490418 100644
--- a/lib/programmemory.h
+++ b/lib/programmemory.h
@@ -1,6 +1,7 @@
 #ifndef GUARD_PROGRAMMEMORY_H
 #define GUARD_PROGRAMMEMORY_H
 
+#include "config.h"
 #include "utils.h"
 #include "valueflow.h"
 #include "mathlib.h"
diff --git a/lib/utils.h b/lib/utils.h
index b0a9d2116..059196427 100644
--- a/lib/utils.h
+++ b/lib/utils.h
@@ -21,6 +21,8 @@
 #define utilsH
 //---------------------------------------------------------------------------
 
+#include "config.h"
+
 #include <cctype>
 #include <cstddef>
 #include <string>