diff --git a/MakeEnums.c b/MakeEnums.c
index 04b3e26..ec4cac0 100644
--- a/MakeEnums.c
+++ b/MakeEnums.c
@@ -5,7 +5,7 @@
 #include <ctype.h>
 #include <Processes.h>
 
-#include "libc/libc.h"
+#include <libc.h>
 
 #define msizeof(type, member) sizeof( ((type *)0)->member)
 
diff --git a/ReadGlobal.c b/ReadGlobal.c
index 19e928a..5b5689d 100644
--- a/ReadGlobal.c
+++ b/ReadGlobal.c
@@ -3,7 +3,7 @@
 #include <ctype.h>
 #include <string.h>
 
-#include "libc/libc.h"
+#include <libc.h>
 
 unsigned long GlobalAddress(const char *name, int *numeric)
 {
diff --git a/libc/err.h b/include/err.h
similarity index 100%
rename from libc/err.h
rename to include/err.h
diff --git a/libc/libc.h b/include/libc.h
similarity index 100%
rename from libc/libc.h
rename to include/libc.h
diff --git a/libc/libgen.h b/include/libgen.h
similarity index 100%
rename from libc/libgen.h
rename to include/libgen.h
diff --git a/libc/machine/endian.h b/include/machine/endian.h
similarity index 100%
rename from libc/machine/endian.h
rename to include/machine/endian.h
diff --git a/libc/stdbool.h b/include/stdbool.h
similarity index 100%
rename from libc/stdbool.h
rename to include/stdbool.h
diff --git a/libc/stdint.h b/include/stdint.h
similarity index 100%
rename from libc/stdint.h
rename to include/stdint.h
diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h
new file mode 100644
index 0000000..7ef7969
--- /dev/null
+++ b/include/sys/cdefs.h
@@ -0,0 +1,32 @@
+#ifndef _SYS_CDEFS_H_
+#define _SYS_CDEFS_H_
+
+#if defined(__cplusplus)
+#define __BEGIN_DECLS   extern "C" {
+#define __END_DECLS     }
+#else
+#define __BEGIN_DECLS
+#define __END_DECLS
+#endif
+
+#define __const const
+#define __restrict
+#define __signed signed
+#define __volatile volatile
+#if defined(__cplusplus)
+#define __inline inline
+#else
+#define __inline
+#endif
+
+#define __dead2
+#define __pure2
+#define __unused
+#define __used
+#define __deprecated
+#define __unavailable
+#define __dead
+#define __pure
+
+#endif
+
diff --git a/libc/sys/endian.h b/include/sys/endian.h
similarity index 100%
rename from libc/sys/endian.h
rename to include/sys/endian.h
diff --git a/libc/sysexits.h b/include/sysexits.h
similarity index 100%
rename from libc/sysexits.h
rename to include/sysexits.h
diff --git a/tomcrypt.h b/include/tomcrypt.h
similarity index 98%
rename from tomcrypt.h
rename to include/tomcrypt.h
index aca913d..ce3611a 100644
--- a/tomcrypt.h
+++ b/include/tomcrypt.h
@@ -110,6 +110,11 @@ typedef unsigned long ulong32;
 #define LTC_ARGCHKVD(x) LTC_ARGCHK(x)
 
 
+#define LTC_MD2
+#define LTC_MD4
+#define LTC_MD5
+#define LTC_SHA1
+
 //#include <tomcrypt_cfg.h>
 //#include <tomcrypt_macros.h>
 //#include <tomcrypt_cipher.h>
diff --git a/libc/unistd.h b/include/unistd.h
similarity index 100%
rename from libc/unistd.h
rename to include/unistd.h
diff --git a/makefile b/makefile
index 63b24e0..95f8057 100644
--- a/makefile
+++ b/makefile
@@ -14,7 +14,7 @@ LDFLAGS = -w -c 'MPS ' -t MPST \
 	-sn STDIO=Main -sn INTENV=Main -sn %A5Init=Main
 
 LIBFLAGS = -P
-SCFLAGS = -P -I libc/ -I ./
+SCFLAGS = -P -I include/
 
 # MPW 3.5
 
@@ -36,7 +36,10 @@ all: $(TARGETS)
 clean:
 	rm -f *.o
 	rm -f  $(TARGETS)
-	rm -f libc/libc libc/*.o
+	rm -f lib/libc libc/*.o
+	rm -f lib/*
+	rm -f libtomcrypt/src/hashes/*.o
+
 
 dist/Tools.tgz: $(TARGETS)
 	cp $^ dist/Tools/
@@ -47,7 +50,10 @@ dist/Tools.tgz: $(TARGETS)
 install: $(TARGETS)
 	cp $^ ~/mpw/Tools/
 
-libc/libc: libc/strcasecmp.c.o libc/_getprogname.c.o libc/err.c.o libc/getopt.c.o libc/basename.c.o
+lib:
+	mkdir lib
+
+lib/libc: libc/strcasecmp.c.o libc/_getprogname.c.o libc/err.c.o libc/getopt.c.o libc/basename.c.o | lib
 	$(MPW) Lib $(LIBFLAGS) -o $@ $^ 
 
 GetEnv: GetEnv.c.o
@@ -78,14 +84,14 @@ ListRez: ListRez.c.o
 ListRezIIgs: ListRezIIgs.c.o
 	$(MPW) Link $(LDFLAGS) -o $@ $^ $(LIBS) 
 
-LSeg: LSeg.c.o libc/libc
+LSeg: LSeg.c.o lib/libc
 	$(MPW) Link $(LDFLAGS) -o $@ $^ $(LIBS) 
 
 
-MakeEnums: MakeEnums.c.o libc/libc
+MakeEnums: MakeEnums.c.o lib/libc
 	$(MPW) Link $(LDFLAGS) -o $@ $^ $(LIBS) 
 
-ReadGlobal: ReadGlobal.c.o libc/libc
+ReadGlobal: ReadGlobal.c.o lib/libc
 	$(MPW) Link $(LDFLAGS) -o $@ $^ $(LIBS) 
 
 Parameters: Parameters.c.o
@@ -94,16 +100,21 @@ Parameters: Parameters.c.o
 Echo: Echo.c.o
 	$(MPW) Link $(LDFLAGS) -o $@ $^ $(LIBS) 
 
-md5 : md5.c.o libtomcrypt/src/hashes/md5.c.o
+
+md5 : md5.c.o lib/libtomcrypt
 	$(MPW) Link $(LDFLAGS) -o $@ $^ $(LIBS) 
 
 md5.c.o : md5.c
-	$(MPW) SC -P -I . -I libtomcrypt/src/headers $< -o $@
+	$(MPW) SC $(SCFLAGS) -I libtomcrypt/src/headers $< -o $@
 
-libtomcrypt/src/hashes/md5.c.o : libtomcrypt/src/hashes/md5.c
-	$(MPW) SC -P -I . -I libtomcrypt/src/headers -d LTC_MD5 $< -o $@
+LTC_H = libtomcrypt/src/hashes/
+lib/libtomcrypt : $(LTC_H)/md2.c.o $(LTC_H)/md4.c.o $(LTC_H)/md5.c.o $(LTC_H)/sha1.c.o | lib
+	$(MPW) Lib $(LIBFLAGS) -o $@ $^ 
 
 
+$(LTC_H)%.c.o : $(LTC_H)%.c
+	$(MPW) SC $(SCFLAGS) -I libtomcrypt/src/headers/  $< -o $@
+
 #SetFile.c : SetFile.rl
 #	ragel -G2 -p -m -o $@ $<
 
diff --git a/md5.c b/md5.c
index 2db4a0b..7a475ca 100644
--- a/md5.c
+++ b/md5.c
@@ -2,8 +2,7 @@
 #include <fcntl.h>
 #include <errno.h>
 
-#define LTC_MD5
-#include "tomcrypt.h"
+#include <tomcrypt.h>
 
 
 const char *unhash(const unsigned char *hash) {