diff --git a/cli_utils/Makefile b/cli_utils/Makefile
index 1e0d32f..7686ac0 100644
--- a/cli_utils/Makefile
+++ b/cli_utils/Makefile
@@ -1,5 +1,5 @@
 CC = gcc
-CFLAGS = -std=gnu99 -Wall -Wextra -Wpedantic -O3 -ggdb
+CFLAGS = -std=gnu99 -Wall -Wextra -O3 -ggdb -Wno-implicit-function-declaration
 
 TGTLIST = test_ecuidlist nisckfix1 nisckfix2 nisdec1 nisenc1
 TGTLIST += nisguess nisguess2 nisrom unpackdat
@@ -7,21 +7,21 @@ TGTLIST += findrefs findcallargs test_findcks test_romdb
 
 all: $(TGTLIST)
 
-nisckfix1: nisckfix1.c nislib.c
+nisckfix1: nisckfix1.c nislib.c nislib_shtools.c nisrom_finders.c
 
-nisckfix2: nisckfix2.c nislib.c
+nisckfix2: nisckfix2.c nislib.c nislib_shtools.c nisrom_finders.c
 
-nisdec1: nisdec1.c nislib.c
+nisdec1: nisdec1.c nislib.c nislib_shtools.c nisrom_finders.c
 
-nisenc1: nisenc1.c nislib.c
+nisenc1: nisenc1.c nislib.c nislib_shtools.c nisrom_finders.c
 
-nisguess: nisguess.c nislib.c
+nisguess: nisguess.c nislib.c nislib_shtools.c nisrom_finders.c
 
-nisguess2: nisguess2.c nislib.c
+nisguess2: nisguess2.c nislib.c nislib_shtools.c nisrom_finders.c
 
 nisrom: nisrom.c nislib.c nislib_shtools.c nisrom_finders.c nisrom_keyfinders.c nissan_romdefs.c nis_romdb.c libcsv/libcsv.c md5/md5.c
 
-unpackdat: unpackdat.c nislib.c
+unpackdat: unpackdat.c nislib.c nislib_shtools.c nisrom_finders.c
 
 test_ecuidlist: test_ecuidlist.c ecuid_list.c
 
@@ -31,4 +31,4 @@ findcallargs: findcallargs.c nislib.c nislib_shtools.c nisrom_finders.c
 
 test_findcks: test_findcks.c nislib.c nislib_shtools.c nisrom_finders.c
 
-test_romdb: test_romdb.c nislib.c nis_romdb.c nissan_romdefs.c libcsv/libcsv.c
+test_romdb: test_romdb.c nislib.c nislib_shtools.c nisrom_finders.c nis_romdb.c nissan_romdefs.c libcsv/libcsv.c
diff --git a/cli_utils/md5/md5.c b/cli_utils/md5/md5.c
index 655485b..fd190fe 100644
--- a/cli_utils/md5/md5.c
+++ b/cli_utils/md5/md5.c
@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 #include <string.h>
-#include <md5.h>
+#include "md5.h"
 
 #define PUT_64BIT_LE(cp, value) do {					\
 	(cp)[7] = (value) >> 56;					\
diff --git a/cli_utils/nislib_shtools.c b/cli_utils/nislib_shtools.c
index cb52407..75be78f 100644
--- a/cli_utils/nislib_shtools.c
+++ b/cli_utils/nislib_shtools.c
@@ -11,6 +11,7 @@
 #include "nislib.h"
 #include "nisrom_finders.h"
 #include "nislib_shtools.h"
+#include "nisrom_finders.h"
 #include "sh_opcodes.h"
 #include "stypes.h"