Clean up includes

ratemon/runtime/ratemon.h

@@ -29,10 +29,10 @@
 
 // Key for use in flow-based maps.
 struct rm_flow {
-  __u32 local_addr;
-  __u32 remote_addr;
-  __u16 local_port;
-  __u16 remote_port;
+  unsigned int local_addr;
+  unsigned int remote_addr;
+  unsigned short local_port;
+  unsigned short remote_port;
 };
 
 #endif /* __RATEMON_H */

ratemon/runtime/ratemon_maps.bpf.c

@@ -1,12 +1,2 @@
 
-// clang-format off
-// vmlinux.h needs to be first.
-#include "vmlinux.h"
-#include <bpf/bpf_helpers.h>
-#include <bpf/bpf_tracing.h>
-#include <bpf/bpf_core_read.h>
-#include <bpf/bpf_endian.h>
-
-#include "ratemon.h"
 #include "ratemon_maps.h"
-// clang-format on

ratemon/runtime/ratemon_maps.h

@@ -3,11 +3,13 @@
 #ifndef __RATEMON_MAPS_H
 #define __RATEMON_MAPS_H
 
+// clang-format off
+// vmlinux.h needs to be first.
+#include "vmlinux.h"
 #include <bpf/bpf_helpers.h>
 
 #include "ratemon.h"
-
-#define PIN_GLOBAL_NS 2
+// clang-format on
 
 // Read RWND limit for flow, as set by userspace. Even though the advertised
 // window is only 16 bits in the TCP header, use 32 bits here because we have