diff --git a/Makefile b/Makefile
index b192268..2f2276f 100644
--- a/Makefile
+++ b/Makefile
@@ -238,17 +238,17 @@ ECHO_N = -n
 ECHO_T = 
 ETAGS = etags
 EXEEXT = 
-INSTALL = /usr/bin/install -c
+INSTALL = /bin/install -c
 INSTALL_DATA = ${INSTALL} -m 644
 INSTALL_PROGRAM = ${INSTALL}
 INSTALL_SCRIPT = ${INSTALL}
 INSTALL_STRIP_PROGRAM = $(install_sh) -c -s
-LDFLAGS = -pthread -static
+LDFLAGS = -pthread 
 LIBOBJS = 
 LIBS = -Wl,--as-need -lprotobuf-lite
 LTLIBOBJS = 
 MAKEINFO = ${SHELL} '/home/ziggi/Projects/tcpserv09/missing' makeinfo
-MKDIR_P = /usr/bin/mkdir -p
+MKDIR_P = /bin/mkdir -p
 OBJEXT = o
 PACKAGE = helmet
 PACKAGE_BUGREPORT = 
@@ -258,7 +258,7 @@ PACKAGE_TARNAME = helmet
 PACKAGE_URL = 
 PACKAGE_VERSION = 0.0.1
 PATH_SEPARATOR = :
-PROTOC = /usr/bin/protoc
+PROTOC = /bin/protoc
 RANLIB = ranlib
 SET_MAKE = 
 SHELL = /bin/bash
diff --git a/Makefile.am b/Makefile.am
index 60cce60..c98def7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@
 AUTOMAKE_OPTIONS = foreign no-dependencies no-installinfo subdir-objects
 
 CXXFLAGS = -std=c++23 -Wall -I. -pthread -D_GNU_SOURCE=1
-LDFLAGS = -pthread -static
+LDFLAGS = -pthread 
 LIBS = -Wl,--as-need -lprotobuf-lite
 
 sbin_PROGRAMS = helmetd
diff --git a/Makefile.in b/Makefile.in
index d2e6657..6d9a17e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -243,7 +243,7 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = -pthread -static
+LDFLAGS = -pthread 
 LIBOBJS = @LIBOBJS@
 LIBS = -Wl,--as-need -lprotobuf-lite
 LTLIBOBJS = @LTLIBOBJS@
diff --git a/helmetd.cpp b/helmetd.cpp
index b731339..f241c71 100644
--- a/helmetd.cpp
+++ b/helmetd.cpp
@@ -3,7 +3,7 @@
 #include <string>
 #include <cstring>
 
-#include <tunnel.hpp>
+#include <interface.hpp>
 #include <service.hpp>
 
 
diff --git a/server.cpp b/server.cpp
index f2eb5b7..21ad508 100644
--- a/server.cpp
+++ b/server.cpp
@@ -12,7 +12,7 @@ extern "C" {
 #include <chrono>
 #include <cstring>
 
-#include <tunnel.hpp>
+#include <interface.hpp>
 #include <service.hpp>
 #include <server.hpp>
 
diff --git a/server.hpp b/server.hpp
index 151708f..a68bebe 100644
--- a/server.hpp
+++ b/server.hpp
@@ -1,26 +1,12 @@
 
 
-
-extern "C" {
-#include <arpa/inet.h>
-}
-
 #include <expected>
 #include <string>
-#include <vector>
-#include <span>
-#include <iostream>
-#include <thread>
-#include <chrono>
 #include <cstring>
 
-#include <tunnel.hpp>
+#include <interface.hpp>
 #include <service.hpp>
 
-#include <hello.pb.h>
-
-using namespace std::chrono_literals;
-
 class Server {
     private:
         Interface iface;
diff --git a/server_test.cpp b/server_test.cpp
index 2397361..9f0dc91 100644
--- a/server_test.cpp
+++ b/server_test.cpp
@@ -3,8 +3,10 @@
 #include <string>
 #include <chrono>
 #include <cstring>
+#include <thread>
+#include <iostream>
+
 
-#include <tunnel.hpp>
 #include <server.hpp>
 
 using namespace std::chrono_literals;
diff --git a/service_test.cpp b/service_test.cpp
index 28fc5b0..cb1b1df 100644
--- a/service_test.cpp
+++ b/service_test.cpp
@@ -1,14 +1,10 @@
 
-extern "C" {
-#include <arpa/inet.h>
-}
 
 #include <expected>
 #include <string>
 #include <cstring>
 #include <iostream>
 
-#include <tunnel.hpp>
 #include <service.hpp>
 
 int main(int argc, char** argv) {