diff --git a/src/link/include/assign.h b/include/link/assign.h
similarity index 76%
rename from src/link/include/assign.h
rename to include/link/assign.h
index 04c2e888..9c9f8c79 100644
--- a/src/link/include/assign.h
+++ b/include/link/assign.h
@@ -1,7 +1,7 @@
-#ifndef ASSIGN_H
-#define ASSIGN_H
+#ifndef ASMOTOR_LINK_ASSIGN_H
+#define ASMOTOR_LINK_ASSIGN_H
 
-#include "types.h"
+#include "link/types.h"
 
 enum eBankDefine {
 	BANK_HOME = 0,
diff --git a/include/link/library.h b/include/link/library.h
new file mode 100644
index 00000000..0bf42967
--- /dev/null
+++ b/include/link/library.h
@@ -0,0 +1,6 @@
+#ifndef	ASMOTOR_LINK_LIBRARY_H
+#define	ASMOTOR_LINK_LIBRARY_H
+
+extern void AddNeededModules(void);
+
+#endif
diff --git a/src/link/include/main.h b/include/link/main.h
similarity index 75%
rename from src/link/include/main.h
rename to include/link/main.h
index 2b0ac9d9..29fc6f1d 100644
--- a/src/link/include/main.h
+++ b/include/link/main.h
@@ -1,7 +1,7 @@
-#ifndef MAIN_H
-#define MAIN_H
+#ifndef ASMOTOR_LINK_MAIN_H
+#define ASMOTOR_LINK_MAIN_H
 
-#include "types.h"
+#include "link/types.h"
 
 extern void PrintUsage(void);
 extern void fatalerror(char *s);
diff --git a/src/link/include/mapfile.h b/include/link/mapfile.h
similarity index 80%
rename from src/link/include/mapfile.h
rename to include/link/mapfile.h
index f367e707..a677e25e 100644
--- a/src/link/include/mapfile.h
+++ b/include/link/mapfile.h
@@ -1,5 +1,5 @@
-#ifndef	MAPFILE_H
-#define	MAPFILE_H
+#ifndef	ASMOTOR_LINK_MAPFILE_H
+#define	ASMOTOR_LINK_MAPFILE_H
 
 extern void SetMapfileName(char *name);
 extern void SetSymfileName(char *name);
diff --git a/src/link/include/mylink.h b/include/link/mylink.h
similarity index 94%
rename from src/link/include/mylink.h
rename to include/link/mylink.h
index 0f142d02..24c841f8 100644
--- a/src/link/include/mylink.h
+++ b/include/link/mylink.h
@@ -1,11 +1,11 @@
-#ifndef LINK_H
-#define LINK_H 1
+#ifndef ASMOTOR_LINK_LINK_H
+#define ASMOTOR_LINK_LINK_H
 
 #if defined(AMIGA) || defined(__GNUC__)
 #define _MAX_PATH	512
 #endif
 
-#include "types.h"
+#include "link/types.h"
 
 extern SLONG options;
 #define OPT_SMALL	0x01
diff --git a/src/link/include/object.h b/include/link/object.h
similarity index 62%
rename from src/link/include/object.h
rename to include/link/object.h
index 4901b9a7..72cb9f9e 100644
--- a/src/link/include/object.h
+++ b/include/link/object.h
@@ -1,5 +1,5 @@
-#ifndef	OBJECT_H
-#define	OBJECT_H
+#ifndef	ASMOTOR_LINK_OBJECT_H
+#define	ASMOTOR_LINK_OBJECT_H
 
 extern void obj_Readfile(char *tzObjectfile);
 extern void lib_Readfile(char *tzLibfile);
diff --git a/src/link/include/output.h b/include/link/output.h
similarity index 52%
rename from src/link/include/output.h
rename to include/link/output.h
index 179845a6..5b6ac733 100644
--- a/src/link/include/output.h
+++ b/include/link/output.h
@@ -1,5 +1,5 @@
-#ifndef	OUTPUT_H
-#define	OUTPUT_H
+#ifndef	ASMOTOR_LINK_OUTPUT_H
+#define	ASMOTOR_LINK_OUTPUT_H
 
 void out_Setname(char *tzOutputfile);
 void Output(void);
diff --git a/include/link/patch.h b/include/link/patch.h
new file mode 100644
index 00000000..8d302796
--- /dev/null
+++ b/include/link/patch.h
@@ -0,0 +1,9 @@
+#ifndef ASMOTOR_LINK_PATCH_H
+#define ASMOTOR_LINK_PATCH_H
+
+#include "link/types.h"
+
+void Patch(void);
+extern SLONG nPC;
+
+#endif
diff --git a/src/link/include/symbol.h b/include/link/symbol.h
similarity index 65%
rename from src/link/include/symbol.h
rename to include/link/symbol.h
index ae0733e8..3b77f4fe 100644
--- a/src/link/include/symbol.h
+++ b/include/link/symbol.h
@@ -1,7 +1,7 @@
-#ifndef SYMBOL_H
-#define SYMBOL_H
+#ifndef ASMOTOR_LINK_SYMBOL_H
+#define ASMOTOR_LINK_SYMBOL_H
 
-#include "types.h"
+#include "link/types.h"
 
 void sym_Init(void);
 void sym_CreateSymbol(char *tzName, SLONG nValue, SBYTE nBank);
diff --git a/src/link/include/types.h b/include/link/types.h
similarity index 70%
rename from src/link/include/types.h
rename to include/link/types.h
index 7de17db7..8f7f3189 100644
--- a/src/link/include/types.h
+++ b/include/link/types.h
@@ -1,7 +1,7 @@
-#ifndef TYPES_H
-#define TYPES_H 1
+#ifndef ASMOTOR_LINK_TYPES_H
+#define ASMOTOR_LINK_TYPES_H
 
-#if	defined(AMIGA) || defined(__GNUC__)
+#if defined(AMIGA) || defined(__GNUC__)
 #define	_MAX_PATH	512
 #endif
 
diff --git a/src/link/Makefile b/src/link/Makefile
index a47fa7d7..46b0d2a8 100644
--- a/src/link/Makefile
+++ b/src/link/Makefile
@@ -17,5 +17,5 @@ xlink: $(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/link/assign.c b/src/link/assign.c
index d95a9b94..03892f39 100644
--- a/src/link/assign.c
+++ b/src/link/assign.c
@@ -1,9 +1,10 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include "mylink.h"
-#include "main.h"
-#include "symbol.h"
-#include "assign.h"
+
+#include "link/mylink.h"
+#include "link/main.h"
+#include "link/symbol.h"
+#include "link/assign.h"
 
 struct sFreeArea {
 	SLONG nOrg;
diff --git a/src/link/include/library.h b/src/link/include/library.h
deleted file mode 100644
index 4e9d8edc..00000000
--- a/src/link/include/library.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef	LIBRARY_H
-#define	LIBRARY_H
-
-extern void AddNeededModules(void);
-
-#endif
diff --git a/src/link/include/patch.h b/src/link/include/patch.h
deleted file mode 100644
index b48808e0..00000000
--- a/src/link/include/patch.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef PATCH_H
-#define PATCH_H
-
-#include "types.h"
-
-void Patch(void);
-extern SLONG nPC;
-
-#endif
diff --git a/src/link/library.c b/src/link/library.c
index 4362561f..677b2572 100644
--- a/src/link/library.c
+++ b/src/link/library.c
@@ -1,9 +1,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "types.h"
-#include "mylink.h"
-#include "main.h"
+
+#include "link/types.h"
+#include "link/mylink.h"
+#include "link/main.h"
 
 static BBOOL symboldefined(char *name)
 {
diff --git a/src/link/main.c b/src/link/main.c
index 680c0c86..4ccd04d2 100644
--- a/src/link/main.c
+++ b/src/link/main.c
@@ -2,15 +2,16 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "object.h"
-#include "output.h"
-#include "assign.h"
-#include "patch.h"
 #include "asmotor.h"
-#include "mylink.h"
-#include "mapfile.h"
-#include "main.h"
-#include "library.h"
+
+#include "link/object.h"
+#include "link/output.h"
+#include "link/assign.h"
+#include "link/patch.h"
+#include "link/mylink.h"
+#include "link/mapfile.h"
+#include "link/main.h"
+#include "link/library.h"
 
 //      Quick and dirty...but it works
 #ifdef __GNUC__
diff --git a/src/link/mapfile.c b/src/link/mapfile.c
index 00abb227..707818c7 100644
--- a/src/link/mapfile.c
+++ b/src/link/mapfile.c
@@ -3,9 +3,10 @@
 #include <string.h>
 
 #include "asmotor.h"
-#include "main.h"
-#include "mylink.h"
-#include "assign.h"
+
+#include "link/main.h"
+#include "link/mylink.h"
+#include "link/assign.h"
 
 FILE *mf = NULL;
 FILE *sf = NULL;
diff --git a/src/link/object.c b/src/link/object.c
index eb7046cc..5553dc82 100644
--- a/src/link/object.c
+++ b/src/link/object.c
@@ -7,8 +7,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "mylink.h"
-#include "main.h"
+#include "link/mylink.h"
+#include "link/main.h"
 
 struct sSymbol **tSymbols;
 struct sSection *pSections = NULL;
diff --git a/src/link/output.c b/src/link/output.c
index 77e1c684..4b39b496 100644
--- a/src/link/output.c
+++ b/src/link/output.c
@@ -2,10 +2,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "mylink.h"
-#include "mapfile.h"
-#include "main.h"
-#include "assign.h"
+#include "link/mylink.h"
+#include "link/mapfile.h"
+#include "link/main.h"
+#include "link/assign.h"
 
 char tzOutname[_MAX_PATH];
 BBOOL oOutput = 0;
diff --git a/src/link/patch.c b/src/link/patch.c
index 83d27e7b..e0748ed4 100644
--- a/src/link/patch.c
+++ b/src/link/patch.c
@@ -1,9 +1,9 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "mylink.h"
-#include "symbol.h"
-#include "main.h"
+#include "link/mylink.h"
+#include "link/symbol.h"
+#include "link/main.h"
 
 struct sSection *pCurrentSection;
 SLONG rpnstack[256];
diff --git a/src/link/symbol.c b/src/link/symbol.c
index 313c9823..49af63b1 100644
--- a/src/link/symbol.c
+++ b/src/link/symbol.c
@@ -1,9 +1,10 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include "main.h"
-#include "patch.h"
-#include "types.h"
+
+#include "link/main.h"
+#include "link/patch.h"
+#include "link/types.h"
 
 #define HASHSIZE 73