diff --git a/src/lib/include/library.h b/include/lib/library.h
similarity index 79%
rename from src/lib/include/library.h
rename to include/lib/library.h
index 4fa84cf7..4037c930 100644
--- a/src/lib/include/library.h
+++ b/include/lib/library.h
@@ -1,7 +1,7 @@
-#ifndef LIBRARY_H
-#define LIBRARY_H
+#ifndef ASMOTOR_LIB_LIBRARY_H
+#define ASMOTOR_LIB_LIBRARY_H
 
-#include "libwrap.h"
+#include "lib/libwrap.h"
 
 extern sLibrary *lib_Read(char *filename);
 extern BBOOL lib_Write(sLibrary * lib, char *filename);
diff --git a/src/lib/include/libwrap.h b/include/lib/libwrap.h
similarity index 73%
rename from src/lib/include/libwrap.h
rename to include/lib/libwrap.h
index edf55b5b..d8c81447 100644
--- a/src/lib/include/libwrap.h
+++ b/include/lib/libwrap.h
@@ -1,7 +1,7 @@
-#ifndef LIBWRAP_H
-#define LIBWRAP_H
+#ifndef ASMOTOR_LIB_LIBWRAP_H
+#define ASMOTOR_LIB_LIBWRAP_H
 
-#include "types.h"
+#include "lib/types.h"
 
 #define MAXNAMELENGTH	256
 
diff --git a/src/lib/include/types.h b/include/lib/types.h
similarity index 83%
rename from src/lib/include/types.h
rename to include/lib/types.h
index 7de17db7..412c77a3 100644
--- a/src/lib/include/types.h
+++ b/include/lib/types.h
@@ -1,5 +1,5 @@
-#ifndef TYPES_H
-#define TYPES_H 1
+#ifndef ASMOTOR_LIB_TYPES_H
+#define ASMOTOR_LIB_TYPES_H
 
 #if	defined(AMIGA) || defined(__GNUC__)
 #define	_MAX_PATH	512
diff --git a/src/lib/Makefile b/src/lib/Makefile
index 1687e6a8..e5eedace 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -9,4 +9,4 @@ xlib: $(obj)
 	gcc -Wall -o $@ $^
 
 .c.o:
-	gcc -Wall -I. -I.. -Iinclude -g -c -o $@ $<
+	gcc -Wall -I. -I.. -I../../include -g -c -o $@ $<
diff --git a/src/lib/library.c b/src/lib/library.c
index c524d3ca..e7b2be7f 100644
--- a/src/lib/library.c
+++ b/src/lib/library.c
@@ -1,8 +1,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "types.h"
-#include "libwrap.h"
+
+#include "lib/types.h"
+#include "lib/libwrap.h"
 
 extern void fatalerror(char *s);
 
diff --git a/src/lib/main.c b/src/lib/main.c
index 12a39808..047596b8 100644
--- a/src/lib/main.c
+++ b/src/lib/main.c
@@ -4,8 +4,9 @@
 #include <ctype.h>
 
 #include "asmotor.h"
-#include "types.h"
-#include "library.h"
+
+#include "lib/types.h"
+#include "lib/library.h"
 
 //      Quick and dirty...but it works
 #ifdef __GNUC__