diff --git a/src/core/utils.c b/src/core/utils.c
index 1d9049a6..43cf3fe6 100644
--- a/src/core/utils.c
+++ b/src/core/utils.c
@@ -46,10 +46,13 @@
 
 #include <errno.h>
 #include <limits.h>
+#include <stdbool.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
 
-#include "utils.h"
+#include <ipfixcol2/api.h>
 
 
 int
diff --git a/src/core/utils.h b/src/core/utils.h
index ca4ad63e..59776697 100644
--- a/src/core/utils.h
+++ b/src/core/utils.h
@@ -45,8 +45,6 @@
 extern "C" {
 #endif
 
-#include <ipfixcol2.h>
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/tools/fdsdump/src/aggregator/stdAllocator.hpp b/src/tools/fdsdump/src/aggregator/stdAllocator.hpp
index 3414f105..7f172a8d 100644
--- a/src/tools/fdsdump/src/aggregator/stdAllocator.hpp
+++ b/src/tools/fdsdump/src/aggregator/stdAllocator.hpp
@@ -9,6 +9,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <memory>
 #include <vector>