diff --git a/SP5WWP/m17-coder/Makefile b/SP5WWP/m17-coder/Makefile
index ac3b38a..43cc8e3 100644
--- a/SP5WWP/m17-coder/Makefile
+++ b/SP5WWP/m17-coder/Makefile
@@ -1,7 +1,5 @@
-m17-coder-sym:
-	gcc -O2 -Wall m17-coder-sym.c \
-	../lib/*.c \
-	-o m17-coder-sym -lm
+m17-coder-sym: m17-coder-sym.c ../lib/*.c ../lib/*.h
+	gcc -O2 -Wall m17-coder-sym.c ../lib/*.c -o m17-coder-sym -lm
 
 clean:
 	rm -f m17-coder-sym
diff --git a/SP5WWP/m17-coder/m17-coder-sym.c b/SP5WWP/m17-coder/m17-coder-sym.c
index 487e447..b1a48ea 100644
--- a/SP5WWP/m17-coder/m17-coder-sym.c
+++ b/SP5WWP/m17-coder/m17-coder-sym.c
@@ -1,15 +1,16 @@
 #include <stdio.h>
-#include <string.h>
+#include <stdlib.h>
 #include <stdint.h>
+#include <string.h>
 
-//#include "../lib/m17lib.h"
-//#include "../lib/m17call.h"
+#include "../lib/m17lib.h"
+#include "../lib/m17call.h"
 #include "../lib/m17consts.h"
-//#include "../lib/m17convol.h"
-//#include "../lib/m17crc.h"
-//#include "../lib/m17golay.h"
-//#include "../lib/m17math.h"
-//#include "../lib/m17viterbi.h"
+#include "../lib/m17convol.h"
+#include "../lib/m17crc.h"
+#include "../lib/m17golay.h"
+#include "../lib/m17math.h"
+#include "../lib/m17viterbi.h"
 
 //#define FN60_DEBUG
 
diff --git a/SP5WWP/m17-decoder/Makefile b/SP5WWP/m17-decoder/Makefile
index 3370442..b8dff7b 100644
--- a/SP5WWP/m17-decoder/Makefile
+++ b/SP5WWP/m17-decoder/Makefile
@@ -1,5 +1,5 @@
-m17-decoder-sym: m17-decoder-sym.c ../lib/m17lib.c ../lib/m17lib.h
-	gcc -Wall -O2 m17-decoder-sym.c ../lib/m17lib.c -o m17-decoder-sym -lm
+m17-decoder-sym: m17-decoder-sym.c ../lib/*.c ../lib/*.h
+	gcc -Wall -O2 m17-decoder-sym.c ../lib/*.c -o m17-decoder-sym -lm
 
 clean:
 	rm -f m17-decoder-sym
diff --git a/SP5WWP/m17-decoder/m17-decoder-sym.c b/SP5WWP/m17-decoder/m17-decoder-sym.c
index 9dedc0f..0f9fa09 100644
--- a/SP5WWP/m17-decoder/m17-decoder-sym.c
+++ b/SP5WWP/m17-decoder/m17-decoder-sym.c
@@ -4,6 +4,13 @@
 #include <string.h>
 
 #include "../lib/m17lib.h"
+#include "../lib/m17call.h"
+#include "../lib/m17consts.h"
+#include "../lib/m17convol.h"
+#include "../lib/m17crc.h"
+#include "../lib/m17golay.h"
+#include "../lib/m17math.h"
+#include "../lib/m17viterbi.h"
 
 #define DECODE_CALLSIGNS
 #define SHOW_VITERBI_ERRS
diff --git a/SP5WWP/m17-packet/Makefile b/SP5WWP/m17-packet/Makefile
index 6304332..d7c214d 100644
--- a/SP5WWP/m17-packet/Makefile
+++ b/SP5WWP/m17-packet/Makefile
@@ -1,10 +1,10 @@
 all: m17-packet-encode m17-packet-decode
 
-m17-packet-encode: m17-packet-encode.c ../lib/m17lib.c ../lib/m17lib.h
-	gcc -O2 -Wall m17-packet-encode.c ../lib/m17lib.c -o m17-packet-encode -lm
+m17-packet-encode: m17-packet-encode.c ../lib/*.c ../lib/*.h
+	gcc -O2 -Wall m17-packet-encode.c ../lib/*.c -o m17-packet-encode -lm
 
-m17-packet-decode: m17-packet-decode.c ../lib/m17lib.c ../lib/m17lib.h
-	gcc -O2 -Wall m17-packet-decode.c ../lib/m17lib.c -o m17-packet-decode -lm
+m17-packet-decode: m17-packet-decode.c ../lib/*.c ../lib/*.h
+	gcc -O2 -Wall m17-packet-decode.c ../lib/*.c -o m17-packet-decode -lm
 
 install: all
 	sudo install m17-packet-encode /usr/local/bin
diff --git a/SP5WWP/m17-packet/m17-packet-decode.c b/SP5WWP/m17-packet/m17-packet-decode.c
index 66df7fb..57a3954 100644
--- a/SP5WWP/m17-packet/m17-packet-decode.c
+++ b/SP5WWP/m17-packet/m17-packet-decode.c
@@ -4,6 +4,13 @@
 #include <string.h>
 
 #include "../lib/m17lib.h"
+#include "../lib/m17call.h"
+#include "../lib/m17consts.h"
+#include "../lib/m17convol.h"
+#include "../lib/m17crc.h"
+#include "../lib/m17golay.h"
+#include "../lib/m17math.h"
+#include "../lib/m17viterbi.h"
 
 float sample;                       //last raw sample from the stdin
 float last[8];                      //look-back buffer for finding syncwords
diff --git a/SP5WWP/m17-packet/m17-packet-encode.c b/SP5WWP/m17-packet/m17-packet-encode.c
index c731b48..ae882a7 100644
--- a/SP5WWP/m17-packet/m17-packet-encode.c
+++ b/SP5WWP/m17-packet/m17-packet-encode.c
@@ -1,10 +1,17 @@
 #include <stdio.h>
-#include <string.h>
-#include <stdint.h>
 #include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
 #include <math.h>
 
 #include "../lib/m17lib.h"
+#include "../lib/m17call.h"
+#include "../lib/m17consts.h"
+#include "../lib/m17convol.h"
+#include "../lib/m17crc.h"
+#include "../lib/m17golay.h"
+#include "../lib/m17math.h"
+#include "../lib/m17viterbi.h"
 
 #define FLT_LEN         (BSB_SPS*FLT_SPAN+1)                //for 48kHz sample rate this is 81