diff --git a/Makefile b/Makefile
index 189a1a0c50123b9cc9dce42e1f3954796e944e61..186add57609cf2efe04319a87b112859edb51f79 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@ CMHGDEPENDS   = main
 ROMCDEFINES   = -DROM
 CDFLAGS       = -Ddebugging=1
 CMHGDFLAGS    = -Ddebugging=1
-CINCLUDES     = -IC:tboxlibint,tbox:,C:
+CINCLUDES     = -Itbox:,C:
 HDRS          =
 LIBS          = ${TBOXINTLIB}
 DBG_LIBS      = ${TBOXINTDBGLIB}
diff --git a/c/auxiliary b/c/auxiliary
index 2e21798a59342cadd86c4bcab0f046b1a05c9dac..e6839a54c4f576162cf09dae9cdf3864a09cfc92 100644
--- a/c/auxiliary
+++ b/c/auxiliary
@@ -27,17 +27,17 @@
 #include "Global/Sprite.h"
 #include "swis.h"
 
-#include "const.h"
-#include "macros.h"
-
-#include "debug.h"
-#include "mem.h"
-#include "string32.h"
-#include "messages.h"
-#include "twimp.h"
-#include "style.h"
-#include "objects/toolbox.h"
-#include "objects/fileinfo.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/string32.h"
+#include "tboxlibint/messages.h"
+#include "tboxlibint/twimp.h"
+#include "tboxlibint/style.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/fileinfo.h"
 
 #include "auxiliary.h"
 #include "object.h"
diff --git a/c/create b/c/create
index abe29387fd72d61cbe5043ad293edf0866333f47..b28de40755368825f25ec105bfdbd7fcc7306d89 100644
--- a/c/create
+++ b/c/create
@@ -26,16 +26,16 @@
 #include "kernel.h"
 #include "swis.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "messages.h"
-#include "objsupport.h"
-
-#include "objects/toolbox.h"
-#include "objects/fileinfo.h"
-#include "objects/window.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/messages.h"
+#include "tboxlibint/objsupport.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/fileinfo.h"
+#include "tboxlibint/objects/window.h"
 
 
 #include "auxiliary.h"
diff --git a/c/delete b/c/delete
index daeaf13c2240b9fb002d2373f17764b1cdc2cdfd..41166ae7ee52e535c4c766dba3279f8fa8951f3e 100644
--- a/c/delete
+++ b/c/delete
@@ -25,14 +25,14 @@
 #include "kernel.h"
 #include "swis.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "messages.h"
-
-#include "objects/toolbox.h"
-#include "objects/fileinfo.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/messages.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/fileinfo.h"
 
 #include "auxiliary.h"
 #include "object.h"
diff --git a/c/events b/c/events
index c8e0b79a015b657a178219c67aaa6cfabe916168..def7d08b652d9bdab145fcefca8be0376593de24 100644
--- a/c/events
+++ b/c/events
@@ -26,15 +26,15 @@
 #include "swis.h"
 
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "messages.h"
-#include "twimp.h"
-
-#include "objects/toolbox.h"
-#include "objects/fileinfo.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/messages.h"
+#include "tboxlibint/twimp.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/fileinfo.h"
 
 #include "auxiliary.h"
 #include "object.h"
diff --git a/c/getstate b/c/getstate
index cc7b1b902fc592e724c575ac16c6d91464c314dc..7c143a5ba26dfefd6346886629430837087b41c7 100644
--- a/c/getstate
+++ b/c/getstate
@@ -25,14 +25,14 @@
 #include "kernel.h"
 #include "swis.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "messages.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/messages.h"
 
-#include "objects/toolbox.h"
-#include "objects/generic.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/generic.h"
 
 #include "object.h"
 #include "auxiliary.h"
diff --git a/c/hide b/c/hide
index 01f057cfcb38a6313ed021713cb48c791521b63a..9fa8169da69f012258b1854f7716c33e35e41999 100644
--- a/c/hide
+++ b/c/hide
@@ -25,14 +25,14 @@
 #include "kernel.h"
 #include "swis.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "messages.h"
-
-#include "objects/toolbox.h"
-#include "objects/fileinfo.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/messages.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/fileinfo.h"
 
 #include "auxiliary.h"
 #include "object.h"
diff --git a/c/main b/c/main
index 1d2cb7470e53c530a5c0494c4cf9077df40c7178..5a0c0705387de9b0b2370164ecc83548041bc80e 100644
--- a/c/main
+++ b/c/main
@@ -26,16 +26,16 @@
 #include "swis.h"
 #include "Global/Services.h"
 
-#include "const.h"
-#include "macros.h"
-#include "rmensure.h"
-#include "debug.h"
-#include "mem.h"
-#include "messages.h"
-#include "objmodule.h"
-
-#include "objects/toolbox.h"
-#include "objects/fileinfo.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/rmensure.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/messages.h"
+#include "tboxlibint/objmodule.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/fileinfo.h"
 
 #include "auxiliary.h"
 #include "object.h"
diff --git a/c/miscop b/c/miscop
index 5c91a1dee5579bf0ebeabc08753d394fca02717b..0051d2e7469d3556b6405700957a06a5fbde51cd 100644
--- a/c/miscop
+++ b/c/miscop
@@ -26,15 +26,15 @@
 #include "kernel.h"
 #include "swis.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "messages.h"
-
-#include "objects/toolbox.h"
-#include "objects/fileinfo.h"
-#include "objects/window.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/messages.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/fileinfo.h"
+#include "tboxlibint/objects/window.h"
 
 #include "auxiliary.h"
 #include "object.h"
diff --git a/c/show b/c/show
index 674e1916568cfef7dbc2f65cd43d8e9646c0aa66..12c993ba5a38d5134daac4b93398bfda9469e63d 100644
--- a/c/show
+++ b/c/show
@@ -26,15 +26,15 @@
 #include "kernel.h"
 #include "swis.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "messages.h"
-
-#include "objects/toolbox.h"
-#include "objects/window.h"
-#include "objects/fileinfo.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/messages.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/window.h"
+#include "tboxlibint/objects/fileinfo.h"
 
 #include "auxiliary.h"
 #include "object.h"
diff --git a/c/task b/c/task
index 40cdf1fb62414cacfe271f5eda9e7eb2d319f5b6..fd46b7544e6cf2050cd0d2146597336d39da6af0 100644
--- a/c/task
+++ b/c/task
@@ -26,14 +26,14 @@
 #include "swis.h"
 
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "messages.h"
-
-#include "objects/toolbox.h"
-#include "objects/fileinfo.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/messages.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/fileinfo.h"
 
 #include "auxiliary.h"
 #include "object.h"
diff --git a/h/auxiliary b/h/auxiliary
index 2b4e7b271e9370c9dc134ed683f6728a91848e1b..a992abc01ae5bea43f0a8eac3a835079dd0e71ee 100644
--- a/h/auxiliary
+++ b/h/auxiliary
@@ -26,19 +26,19 @@
 #include "kernel.h"
 
 #ifndef __toolbox_h
-#include "objects.toolbox.h"
+#include "tboxlibint/objects/toolbox.h"
 #endif
 
 #ifndef __fileinfo_h
-#include "objects.fileinfo.h"
+#include "tboxlibint/objects/fileinfo.h"
 #endif
 
 #ifndef __wimp_h
-#include "twimp.h"
+#include "tboxlibint/twimp.h"
 #endif
 
 #ifndef __mem_h
-#include "mem.h"
+#include "tboxlibint/mem.h"
 #endif
 
 #include "auxiliary.h"
diff --git a/h/object b/h/object
index f1c48c2086d86d9ca45c7db992ca130740204ac9..429aee3685fe7181a8340f3ac0963e83b4e1165b 100644
--- a/h/object
+++ b/h/object
@@ -25,11 +25,11 @@
 #define __object_h
 
 #ifndef __os_h
-#include "os.h"
+#include "tboxlibint/os.h"
 #endif
 
 #ifndef __window_h
-#include "objects.h.window"
+#include "tboxlibint/objects/window.h"
 #endif
 
 typedef struct _coords {