diff --git a/main.c b/src/main.c
similarity index 100%
rename from main.c
rename to src/main.c
diff --git a/misc.h b/src/misc.h
similarity index 100%
rename from misc.h
rename to src/misc.h
diff --git a/msg.c b/src/msg.c
similarity index 100%
rename from msg.c
rename to src/msg.c
diff --git a/msg.h b/src/msg.h
similarity index 100%
rename from msg.h
rename to src/msg.h
diff --git a/net.c b/src/net.c
similarity index 98%
rename from net.c
rename to src/net.c
index a6358c4..82ab9ed 100644
--- a/net.c
+++ b/src/net.c
@@ -15,9 +15,6 @@
 
 #include "misc.h"
 
-#define PORT(p) PORTSTR(p)
-#define PORTSTR(p) #p
-
 void *get_in_addr(struct sockaddr *sa)
 {
     if (sa->sa_family == AF_INET) {
diff --git a/net.h b/src/net.h
similarity index 51%
rename from net.h
rename to src/net.h
index b475e96..0cd91c3 100644
--- a/net.h
+++ b/src/net.h
@@ -1,4 +1,14 @@
 /* This file was automatically generated.  Do not edit! */
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <netdb.h>
 int run_client(const struct prog_info *pinfo,void(*framecallback)(long));
 int run_server(const struct prog_info *pinfo);
 void *get_in_addr(struct sockaddr *sa);