From 82cdaeb318d6f8a05862a2401274b58091970017 Mon Sep 17 00:00:00 2001
From: Michal Sedlak <sedlakm@cesnet.cz>
Date: Thu, 6 Jun 2024 15:03:54 +0200
Subject: [PATCH 1/2] core: fix includes in utils.c

#include <ipfixcol2.h> resulted in including a file in which
be64toh/htobe64 functions were used. This would clash with the defines
present here that are necessary to get the wanted strerror_r function,
resulting in the be64toh/htobe64 functions being undefined.

This was fixed by not including ipfixcol2.h as a whole, but only the
necessary part, as well as adding explicit includes for the system
headers that were brought by ipfixcol2.h.
---
 src/core/utils.c | 5 ++++-
 src/core/utils.h | 2 --
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/core/utils.c b/src/core/utils.c
index 1d9049a67..43cf3fe6e 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 ca4ad63eb..597766973 100644
--- a/src/core/utils.h
+++ b/src/core/utils.h
@@ -45,8 +45,6 @@
 extern "C" {
 #endif
 
-#include <ipfixcol2.h>
-
 #ifdef __cplusplus
 }
 #endif

From f2ff6377aaaf6c3ef73fd6a197be2b82ddcff038 Mon Sep 17 00:00:00 2001
From: Michal Sedlak <sedlakm@cesnet.cz>
Date: Thu, 19 Jun 2025 14:40:38 +0200
Subject: [PATCH 2/2] fdsdump: add missing include

---
 src/tools/fdsdump/src/aggregator/stdAllocator.hpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/tools/fdsdump/src/aggregator/stdAllocator.hpp b/src/tools/fdsdump/src/aggregator/stdAllocator.hpp
index 3414f1050..7f172a8d7 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>