diff --git a/src/core/include/utils/memory.h b/src/core/include/utils/memory.h
index ccd71cd2a..a4d637c8e 100644
--- a/src/core/include/utils/memory.h
+++ b/src/core/include/utils/memory.h
@@ -38,6 +38,7 @@
 
 #include <cstdint>
 #include <cstddef>
+#include <iterator>
 #include <utility>
 #include <vector>
 
diff --git a/src/core/lib/math/discretegaussiangeneratorgeneric.cpp b/src/core/lib/math/discretegaussiangeneratorgeneric.cpp
index 5215a9d0b..eef38c886 100644
--- a/src/core/lib/math/discretegaussiangeneratorgeneric.cpp
+++ b/src/core/lib/math/discretegaussiangeneratorgeneric.cpp
@@ -47,6 +47,7 @@
 #include "utils/exception.h"
 #include "utils/inttypes.h"
 
+#include <algorithm>
 #include <cmath>
 #include <memory>
 #include <random>
diff --git a/src/core/lib/utils/demangle.cpp b/src/core/lib/utils/demangle.cpp
index ee476a160..013d921d4 100644
--- a/src/core/lib/utils/demangle.cpp
+++ b/src/core/lib/utils/demangle.cpp
@@ -29,7 +29,9 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //==================================================================================
 #include "utils/demangle.h"
-#include <memory>
+
+#include <cstdlib>
+#include <string>
 
 #if defined(__clang__) || defined(__GNUC__)
     #include <cxxabi.h>
diff --git a/src/core/lib/utils/get-call-stack.cpp b/src/core/lib/utils/get-call-stack.cpp
index 7b0bccd25..b6ed3375a 100644
--- a/src/core/lib/utils/get-call-stack.cpp
+++ b/src/core/lib/utils/get-call-stack.cpp
@@ -34,8 +34,9 @@
 // clang-format off
 #include "utils/demangle.h"
 
-#include <execinfo.h>
+#include <cstdlib>
 #include <cxxabi.h>
+#include <execinfo.h>
 #include <memory>
 // clang-format on
 
diff --git a/src/pke/include/scheme/ckksrns/gen-cryptocontext-ckksrns-internal.h b/src/pke/include/scheme/ckksrns/gen-cryptocontext-ckksrns-internal.h
index f368f9b3b..30b09c2e9 100644
--- a/src/pke/include/scheme/ckksrns/gen-cryptocontext-ckksrns-internal.h
+++ b/src/pke/include/scheme/ckksrns/gen-cryptocontext-ckksrns-internal.h
@@ -36,11 +36,12 @@
 #ifndef _GEN_CRYPTOCONTEXT_CKKSRNS_INTERNAL_H_
 #define _GEN_CRYPTOCONTEXT_CKKSRNS_INTERNAL_H_
 
-#include "encoding/encodingparams.h"
 #include "constants.h"
-#include "utils/exception.h"
-#include "scheme/scheme-utils.h"
+#include "cryptocontext.h"
+#include "encoding/encodingparams.h"
 #include "scheme/scheme-id.h"
+#include "scheme/scheme-utils.h"
+#include "utils/exception.h"
 
 #include <memory>