diff --git a/Makefile b/Makefile
index a5d68285b7a93c24e36b22cfa7ed945b995f0152..2df9ad5eaaea708815fa99b44fc64e5fd80a06f4 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 7e125ec8685f9a55a0efe58ed85d86fbfae56e15..2b6dacbb0103e1f1f975f1160181f0baa28163d3 100644
--- a/c/auxiliary
+++ b/c/auxiliary
@@ -26,18 +26,18 @@
 #include "kernel.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/window.h"
-#include "objects/scale.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/window.h"
+#include "tboxlibint/objects/scale.h"
 
 #include "auxiliary.h"
 #include "object.h"
diff --git a/c/create b/c/create
index 86c672230112690cd4702a961ea14fbe2764c87f..a69e047f214bb5d1785ffcb94169afa50592693f 100644
--- a/c/create
+++ b/c/create
@@ -27,16 +27,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/window.h"
-#include "objects/scale.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/window.h"
+#include "tboxlibint/objects/scale.h"
 
 #include "auxiliary.h"
 #include "object.h"
diff --git a/c/delete b/c/delete
index b20c34d210e784b9ffa6d795a6224307d48989ae..7ae67f4361f4f594e50f06920553f2717e7dc863 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/scale.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/scale.h"
 
 #include "auxiliary.h"
 #include "object.h"
diff --git a/c/events b/c/events
index 2d88de1ce1373db9ce8d28a0407e305a97104dd3..985d3e113af5d1beaf8e30e7d639c4dcfbbdae16 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 "objects/toolbox.h"
-#include "objects/window.h"
-#include "objects/scale.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/scale.h"
 
 #include "auxiliary.h"
 #include "object.h"
diff --git a/c/getstate b/c/getstate
index 50dbab5205cda091f41f2c3dd4bcfe81bba6b433..9288adaf6ee37ed89179d6e9443446f242a15594 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 "objects/toolbox.h"
-#include "objects/scale.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/scale.h"
 
 #include "object.h"
 #include "auxiliary.h"
diff --git a/c/hide b/c/hide
index 99d6bab3b938bd1937d02bc19825f6e6686e34e7..55a05cfb68b1ae8e482711cb157748d3dab602aa 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/scale.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/scale.h"
 
 #include "auxiliary.h"
 #include "object.h"
diff --git a/c/main b/c/main
index 014d5e776ad96a13586f0331744ffd0e38d006c2..08c255fcb912cd076a4cb082e2304f9055cd97e0 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 "debug.h"
-#include "rmensure.h"
-#include "mem.h"
-#include "messages.h"
-#include "objmodule.h"
-
-#include "objects.toolbox.h"
-#include "objects.scale.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/rmensure.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/messages.h"
+#include "tboxlibint/objmodule.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/scale.h"
 
 #include "object.h"
 #include "create.h"
diff --git a/c/miscop b/c/miscop
index 13cc54b3c406d7d04aa7fdab704bcf92bfe36a92..342dcf982c3be11802ace0b41e0e7dda91bdb6cf 100644
--- a/c/miscop
+++ b/c/miscop
@@ -25,15 +25,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/scale.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/scale.h"
 
 #include "object.h"
 #include "task.h"
diff --git a/c/show b/c/show
index dee13dc4bc3dc20af43c59078aa353c41d924a5d..2ef6e88ba740441361c199f57514265291d6a51f 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/scale.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/scale.h"
 
 #include "auxiliary.h"
 #include "object.h"
diff --git a/c/task b/c/task
index 88ae4e9c986d89921ec948cab2d2e375d44f146e..0196b74bc155326a914d6183e81574301c14f6fb 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/scale.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/scale.h"
 
 #include "auxiliary.h"
 #include "object.h"
diff --git a/h/auxiliary b/h/auxiliary
index 29461927c3157c4bed934c976d35ae6a01db885f..bcf6d7ae3de83477f3e4e78fe8c44f0a9cab1b5c 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 __scale_h
-#include "objects.scale.h"
+#include "tboxlibint/objects/scale.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 "object.h"
diff --git a/h/object b/h/object
index 9e08a2277e7188e664404617f906f1dc73f86be1..1c2c4d81f4e0ffa9378add827bb667b9697bbe91 100644
--- a/h/object
+++ b/h/object
@@ -25,7 +25,7 @@
 
 
 #ifndef __window_h
-#include "objects.window.h"
+#include "tboxlibint/objects/window.h"
 #endif
 
 typedef struct _coords {