diff --git a/src/compression.c b/src/compression.c
index 904ccb0..016b050 100644
--- a/src/compression.c
+++ b/src/compression.c
@@ -6,8 +6,8 @@
 // lz1 https://github.com/andyherbert/lz1
 //
 
-#include "deps.h"
-#include "compression.h"
+#include "inc/deps.h"
+#include "inc/compression.h"
 
 //--------------------------------------------------------------------
 
diff --git a/src/enc.c b/src/enc.c
index 248143a..ce1d1bd 100644
--- a/src/enc.c
+++ b/src/enc.c
@@ -5,8 +5,8 @@
     View README file supplied with this software for more details
 */
 
-#include "deps.h"
-#include "enc.h"
+#include "inc/deps.h"
+#include "inc/enc.h"
 
 char *ss_encrypt(char *string)
 {
diff --git a/src/functions.c b/src/functions.c
index 15dd4ca..cab4174 100644
--- a/src/functions.c
+++ b/src/functions.c
@@ -5,19 +5,19 @@
     View README file supplied with this software for more details
 */
 
-#include "deps.h"
-#include "functions.h"
-#include "util.h"
-#include "vars.h"
-#include "enc.h"
-#include "math.h"
-#include "md5.h"
-#include "network.h"
-#include "search.h"
-#include "inset.h"
+#include "inc/deps.h"
+#include "inc/functions.h"
+#include "inc/util.h"
+#include "inc/vars.h"
+#include "inc/enc.h"
+#include "inc/math.h"
+#include "inc/md5.h"
+#include "inc/network.h"
+#include "inc/search.h"
+#include "inc/inset.h"
 // For slidescript compression algorithm
-#include "tar.h"
-#include "compression.h"
+#include "inc/tar.h"
+#include "inc/compression.h"
 
 char *process_line(char *line)
 {
diff --git a/src/compression.h b/src/inc/compression.h
similarity index 100%
rename from src/compression.h
rename to src/inc/compression.h
diff --git a/src/config.h b/src/inc/config.h
similarity index 100%
rename from src/config.h
rename to src/inc/config.h
diff --git a/src/deps.h b/src/inc/deps.h
similarity index 93%
rename from src/deps.h
rename to src/inc/deps.h
index fe425b5..fa2ba94 100644
--- a/src/deps.h
+++ b/src/inc/deps.h
@@ -13,6 +13,9 @@
 #include <time.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <dirent.h>
+#include <grp.h>
+#include <pwd.h>
 #include <signal.h>
 #include <regex.h>
 #include <limits.h>
@@ -20,10 +23,15 @@
 #include "config.h"
 #include "sbyteswap.h"
 #include <sys/types.h>
+#include <sys/select.h>
 // Networking
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
+// For tar containers
+#if !defined(__APPLE__)
+#include <sys/sysmacros.h>
+#endif
 // For file handling
 #include <assert.h>
 #include <sys/stat.h>
diff --git a/src/enc.h b/src/inc/enc.h
similarity index 100%
rename from src/enc.h
rename to src/inc/enc.h
diff --git a/src/functions.h b/src/inc/functions.h
similarity index 100%
rename from src/functions.h
rename to src/inc/functions.h
diff --git a/src/inset.h b/src/inc/inset.h
similarity index 100%
rename from src/inset.h
rename to src/inc/inset.h
diff --git a/src/math.h b/src/inc/math.h
similarity index 100%
rename from src/math.h
rename to src/inc/math.h
diff --git a/src/md5.h b/src/inc/md5.h
similarity index 100%
rename from src/md5.h
rename to src/inc/md5.h
diff --git a/src/network.h b/src/inc/network.h
similarity index 100%
rename from src/network.h
rename to src/inc/network.h
diff --git a/src/pipe.h b/src/inc/pipe.h
similarity index 100%
rename from src/pipe.h
rename to src/inc/pipe.h
diff --git a/src/sbyteswap.h b/src/inc/sbyteswap.h
similarity index 100%
rename from src/sbyteswap.h
rename to src/inc/sbyteswap.h
diff --git a/src/search.h b/src/inc/search.h
similarity index 100%
rename from src/search.h
rename to src/inc/search.h
diff --git a/src/tar.h b/src/inc/tar.h
similarity index 94%
rename from src/tar.h
rename to src/inc/tar.h
index 46e015e..456b665 100644
--- a/src/tar.h
+++ b/src/inc/tar.h
@@ -30,26 +30,6 @@ THE SOFTWARE
 #define _DEFAULT_SOURCE
 #endif
 
-#include <errno.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include <dirent.h>
-#include <fcntl.h>
-#include <grp.h>
-#include <pwd.h>
-#if !defined(__APPLE__)
-#include <sys/sysmacros.h>
-#endif
-#include <sys/select.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <unistd.h>
-
 #define DEFAULT_DIR_MODE S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH // 0755
 
 #define BLOCKSIZE       512
diff --git a/src/util.h b/src/inc/util.h
similarity index 100%
rename from src/util.h
rename to src/inc/util.h
diff --git a/src/vars.h b/src/inc/vars.h
similarity index 100%
rename from src/vars.h
rename to src/inc/vars.h
diff --git a/src/inset.c b/src/inset.c
index 9f06eef..1c042d9 100644
--- a/src/inset.c
+++ b/src/inset.c
@@ -5,11 +5,11 @@
     View README file supplied with this software for more details
 */
 
-#include "deps.h"
-#include "inset.h"
-#include "functions.h"
-#include "vars.h"
-#include "util.h"
+#include "inc/deps.h"
+#include "inc/inset.h"
+#include "inc/functions.h"
+#include "inc/vars.h"
+#include "inc/util.h"
 
 BQ s_bqf [MAX_BQ_FUNCTIONS];
 
diff --git a/src/main.c b/src/main.c
index f424028..bbf0786 100644
--- a/src/main.c
+++ b/src/main.c
@@ -7,11 +7,11 @@
 
 #define MY_GLOBAL
 
-#include "deps.h"
-#include "util.h"
-#include "functions.h"
-#include "pipe.h"
-#include "vars.h"
+#include "inc/deps.h"
+#include "inc/util.h"
+#include "inc/functions.h"
+#include "inc/pipe.h"
+#include "inc/vars.h"
 
 int main(int argc, char **argv) 
 {
diff --git a/src/math.c b/src/math.c
index b511bb7..262e6f4 100644
--- a/src/math.c
+++ b/src/math.c
@@ -5,9 +5,9 @@
     View README file supplied with this software for more details
 */
 
-#include "deps.h"
-#include "math.h"
-#include "util.h"
+#include "inc/deps.h"
+#include "inc/math.h"
+#include "inc/util.h"
 
 EXPR sexpr [MAX_EXPR_ARGS];
 
diff --git a/src/md5.c b/src/md5.c
index da47597..508c480 100644
--- a/src/md5.c
+++ b/src/md5.c
@@ -9,8 +9,8 @@
     View README file supplied with this software for more details
 */
 
-#include "deps.h"
-#include "md5.h"
+#include "inc/deps.h"
+#include "inc/md5.h"
 
 #define ZERO    0
 #define ONE     1
diff --git a/src/network.c b/src/network.c
index 1380ba0..32273ab 100644
--- a/src/network.c
+++ b/src/network.c
@@ -5,9 +5,9 @@
     View README file supplied with this software for more details
 */
 
-#include "deps.h"
-#include "network.h"
-#include "util.h"
+#include "inc/deps.h"
+#include "inc/network.h"
+#include "inc/util.h"
 
 // Structure of file types for nethttp
 // mimetype struct, searched through when checking mimetype
diff --git a/src/pipe.c b/src/pipe.c
index 46e705a..0e6cbbf 100644
--- a/src/pipe.c
+++ b/src/pipe.c
@@ -6,10 +6,10 @@
 */
 
 
-#include "deps.h"
-#include "vars.h"
-#include "pipe.h"
-#include "util.h"
+#include "inc/deps.h"
+#include "inc/vars.h"
+#include "inc/pipe.h"
+#include "inc/util.h"
 
 void set_cmd(int index, char *cmd)
 {
diff --git a/src/search.c b/src/search.c
index a402a60..2682f51 100644
--- a/src/search.c
+++ b/src/search.c
@@ -5,9 +5,9 @@
     View README file supplied with this software for more details
 */
 
-#include "deps.h"
-#include "search.h"
-#include "util.h"
+#include "inc/deps.h"
+#include "inc/search.h"
+#include "inc/util.h"
 
 regex_t pattern;
 
diff --git a/src/tar.c b/src/tar.c
index 5706d69..c251ed6 100644
--- a/src/tar.c
+++ b/src/tar.c
@@ -1,4 +1,5 @@
-#include "tar.h"
+#include "inc/deps.h"
+#include "inc/tar.h"
 
 #define MIN(x, y) (((x) < (y)) ? (x) : (y))
 #define MAX(x, y) (((x) > (y)) ? (x) : (y))
diff --git a/src/util.c b/src/util.c
index 3e18512..814ff01 100644
--- a/src/util.c
+++ b/src/util.c
@@ -6,8 +6,8 @@
 */
 
 
-#include "deps.h"
-#include "util.h"
+#include "inc/deps.h"
+#include "inc/util.h"
 
 time_t current_time;
 
diff --git a/src/vars.c b/src/vars.c
index 63e7456..0982588 100644
--- a/src/vars.c
+++ b/src/vars.c
@@ -5,9 +5,9 @@
     View README file supplied with this software for more details
 */
 
-#include "deps.h"
-#include "vars.h"
-#include "util.h"
+#include "inc/deps.h"
+#include "inc/vars.h"
+#include "inc/util.h"
 
 void set_var(int index, char *varname, char *vardata)
 {