diff --git a/src/include/ndpi_define.h.in b/src/include/ndpi_define.h.in
index c22d698239d..4d61d7130e4 100644
--- a/src/include/ndpi_define.h.in
+++ b/src/include/ndpi_define.h.in
@@ -310,9 +310,10 @@
 #define get_u_int16_t(X,O)  (*(u_int16_t *)((&(((u_int8_t *)X)[O]))))
 #define get_u_int32_t(X,O)  (*(u_int32_t *)((&(((u_int8_t *)X)[O]))))
 #if defined(__arm__)
-static inline u_int64_t get_u_int64_t(const u_int8_t* X, int O)
+#include <stdint.h>
+static inline uint64_t get_u_int64_t(const uint8_t* X, int O)
 {
-  u_int64_t tmp;
+  uint64_t tmp;
   memcpy(&tmp, X + O, sizeof(tmp));
   return tmp;
 }
diff --git a/src/lib/third_party/src/roaring.c b/src/lib/third_party/src/roaring.c
index 537cb7db684..fd382ed0099 100644
--- a/src/lib/third_party/src/roaring.c
+++ b/src/lib/third_party/src/roaring.c
@@ -4298,7 +4298,6 @@ int run_run_container_ixor(
 
 #ifndef WIN32
 #include "ndpi_config.h"
-#include "ndpi_typedefs.h"
 
 #define NDPI_REPLACE_FPRINTF
 #include "../../ndpi_replace_printf.h"