diff --git a/ebpf_prog/Makefile b/ebpf_prog/Makefile
index 1bf0b6b7..d9878144 100644
--- a/ebpf_prog/Makefile
+++ b/ebpf_prog/Makefile
@@ -29,7 +29,7 @@ endif
 
 BIN := opensnitch.o opensnitch-procs.o opensnitch-dns.o
 CLANG_FLAGS = -I. \
-	-I$(KERNEL_HEADERS)/arch/x86/include/generated/ \
+	-I$(KERNEL_HEADERS)/arch/$(ARCH)/include/generated/ \
 	-I$(KERNEL_HEADERS)/include \
 	-include $(KERNEL_DIR)/include/linux/kconfig.h \
 	-I$(KERNEL_DIR)/include \
@@ -52,6 +52,6 @@ all: $(BIN)
 
 %.o: %.c
 	$(CLANG) $(CLANG_FLAGS) -c $< -o - | \
-		$(LLC) -march=bpf -mcpu=$(CPU) -filetype=obj -o $@
+		$(LLC) -march=bpf -mcpu=generic -filetype=obj -o $@
 clean:
 	rm -f *.o
diff --git a/ebpf_prog/opensnitch-dns.c b/ebpf_prog/opensnitch-dns.c
index 8a21dc2a..f080b7ee 100644
--- a/ebpf_prog/opensnitch-dns.c
+++ b/ebpf_prog/opensnitch-dns.c
@@ -4,7 +4,6 @@
 #include <linux/in6.h>
 #include <linux/ptrace.h>
 #include <linux/sched.h>
-#include <linux/version.h>
 #include <net/sock.h>
 #include <uapi/linux/bpf.h>
 #include <uapi/linux/tcp.h>
diff --git a/ebpf_prog/opensnitch.c b/ebpf_prog/opensnitch.c
index b36fe4bd..eab2a715 100644
--- a/ebpf_prog/opensnitch.c
+++ b/ebpf_prog/opensnitch.c
@@ -1,7 +1,6 @@
 #define KBUILD_MODNAME "dummy"
 
 #include "common_defs.h"
-#include <linux/version.h>
 #include <uapi/linux/tcp.h>
 #include <net/sock.h>
 #include <net/udp_tunnel.h>