Restructure includes.

src/loader/utils/config.h

@@ -6,7 +6,6 @@
 #include <stdlib.h>
 #include <libconfig.h>
 #include <string.h>
-#include <linux/types.h>
 
 #include <arpa/inet.h>
 

src/loader/utils/stats.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <bpf.h>
-#include <libbpf.h>
 #include <xdp/libxdp.h>
 
 #include <common/all.h>

src/loader/utils/xdp.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include <bpf.h>
-#include <libbpf.h>
 #include <xdp/libxdp.h>
 
 #include  <common/all.h>

src/xdp/utils/helpers.h

@@ -3,12 +3,16 @@
 #include <common/all.h>
 
 #include <linux/bpf.h>
-#include <linux/bpf_common.h>
 
-#include <bpf_helpers.h>
 #include <xdp/xdp_helpers.h>
 #include <xdp/prog_dispatcher.h>
 
+#ifdef __LIBXDP_STATIC__
+#include <bpf_helpers.h>
+#else
+#include <bpf/bpf_helpers.h>
+#endif
+
 #define likely(x) __builtin_expect(!!(x), 1)
 #define unlikely(x) __builtin_expect(!!(x), 0)
 

src/xdp/utils/rl.h

@@ -9,7 +9,6 @@
 static __always_inline void UpdateIpStats(u64 *pps, u64 *bps, u32 ip, u16 port, u8 protocol, u16 pkt_len, u64 now);
 static __always_inline void UpdateIp6Stats(u64 *pps, u64 *bps, u128 *ip, u16 port, u8 protocol, u16 pkt_len, u64 now);
 
-
 // The source file is included directly below instead of compiled and linked as an object because when linking, there is no guarantee the compiler will inline the function (which is crucial for performance).
 // I'd prefer not to include the function logic inside of the header file.
 // More Info: https://stackoverflow.com/questions/24289599/always-inline-does-not-work-when-function-is-implemented-in-different-file