diff --git a/Makefile b/Makefile
index fea3272b3751c27e504da7d0af09ab423eedb440..606a2efbd9583a633367a98cde95e441f92663cc 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/create b/c/create
index ead57c8f8e50c00b91df03e93c722c39b077e6f9..3ec9b452ef3df776cd6702967875ff8d37c61c13 100644
--- a/c/create
+++ b/c/create
@@ -28,16 +28,16 @@
 #include "kernel.h"
 #include "swis.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "style.h"
-#include "messages.h"
-#include "string32.h"
-
-#include "objects/toolbox.h"
-#include "objects/iconbar.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/style.h"
+#include "tboxlibint/messages.h"
+#include "tboxlibint/string32.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/iconbar.h"
 
 #include "object.h"
 #include "task.h"
diff --git a/c/delete b/c/delete
index 71b461736fd40e7af0aa1dbc1d5d4cb46951e47e..7a2e9fb90cc017747cd8e13e85d2cbae26ba0086 100644
--- a/c/delete
+++ b/c/delete
@@ -26,14 +26,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/iconbar.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/iconbar.h"
 
 #include "object.h"
 #include "task.h"
diff --git a/c/events b/c/events
index d7416d69fa91d22240644e202b9ea2addff35217..839d2965b5403486fbf76583cc2b41b98d26d5b5 100644
--- a/c/events
+++ b/c/events
@@ -30,18 +30,18 @@
 #include "swis.h"
 
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "twimp.h"
-#include "style.h"
-#include "messages.h"
-#include "string32.h"
-
-#include "objects/toolbox.h"
-#include "objects/iconbar.h"
-#include "objects/menu.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/twimp.h"
+#include "tboxlibint/style.h"
+#include "tboxlibint/messages.h"
+#include "tboxlibint/string32.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/iconbar.h"
+#include "tboxlibint/objects/menu.h"
 
 
 
diff --git a/c/getstate b/c/getstate
index 343cfb11c6a08abf0d4c9b0dfe564ba1291ae3eb..12c856917e88ab2fe346f967faade15b94675ae4 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/iconbar.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/iconbar.h"
 
 #include "object.h"
 #include "task.h"
diff --git a/c/globals b/c/globals
index 9bccaf95ae4be9b7340bad64593d69a8fc51b09e..78856e66e54da6166539c715daba5bedb4835380 100644
--- a/c/globals
+++ b/c/globals
@@ -20,15 +20,15 @@
  */
 
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "messages.h"
-#include "twimp.h"
-
-#include "objects/toolbox.h"
-#include "objects/iconbar.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/iconbar.h"
 
 #include "globals.h"
 
diff --git a/c/hide b/c/hide
index b3b5b200a635aa328398aaccb92e3c48d175058a..8b221eabc0fe669a48c6ec6e5b38160ea41ff3a7 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/iconbar.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/iconbar.h"
 
 #include "object.h"
 #include "task.h"
diff --git a/c/main b/c/main
index 21591e9fa293fd80bbcbad84ae89f126c830dae3..57bf717f4df8e2a41406b4e38b5be5674fe010ba 100644
--- a/c/main
+++ b/c/main
@@ -26,17 +26,17 @@
 #include "swis.h"
 #include "Global/Services.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "messages.h"
-#include "rmensure.h"
-#include "objmodule.h"
-
-#include "objects/toolbox.h"
-#include "string32.h"
-#include "objects/iconbar.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/messages.h"
+#include "tboxlibint/rmensure.h"
+#include "tboxlibint/objmodule.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/string32.h"
+#include "tboxlibint/objects/iconbar.h"
 
 #include "create.h"
 #include "delete.h"
diff --git a/c/miscop b/c/miscop
index a76fb40128ec914a7bb5c77df102fb75a37e0055..901eb79be976fd9964349f0a4aee663b2fdb3c2a 100644
--- a/c/miscop
+++ b/c/miscop
@@ -26,16 +26,16 @@
 #include "kernel.h"
 #include "swis.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "twimp.h"
-#include "messages.h"
-#include "string32.h"
-
-#include "objects/toolbox.h"
-#include "objects/iconbar.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/twimp.h"
+#include "tboxlibint/messages.h"
+#include "tboxlibint/string32.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/iconbar.h"
 
 #include "object.h"
 #include "task.h"
diff --git a/c/show b/c/show
index 417c3ac6a2d2f227e55d235665dbd5c73108a0e3..6e21f5a5dc538dcf6323a2870612a63dba79fbe7 100644
--- a/c/show
+++ b/c/show
@@ -25,15 +25,15 @@
 #include "kernel.h"
 #include "swis.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "twimp.h"
-#include "messages.h"
-
-#include "objects/toolbox.h"
-#include "objects/iconbar.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/twimp.h"
+#include "tboxlibint/messages.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/iconbar.h"
 
 #include "object.h"
 #include "task.h"
diff --git a/c/task b/c/task
index 29eed2c5c1988796ae1b76412e9ff218533916f1..53bb0d69e31a4c544fbb87251c43d95c84c90f32 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/iconbar.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/iconbar.h"
 
 #include "object.h"
 
diff --git a/h/globals b/h/globals
index 69d104fbadec8307ea59dfc573600d316d603bd0..a56b235f90875717297ad2667cdd1e2f1091f88d 100644
--- a/h/globals
+++ b/h/globals
@@ -24,7 +24,7 @@
 
 
 #ifndef __toolbox_h
-#include "objects.toolbox.h"
+#include "tboxlibint/objects/toolbox.h"
 #endif
 
 extern EventInterest   messages_of_interest[];
diff --git a/h/object b/h/object
index cefca5961ebdf0e056b9fe0f21b3fb56eaa8464c..ae129cb71c4c471afd507562fc17237115a9e57c 100644
--- a/h/object
+++ b/h/object
@@ -24,11 +24,11 @@
 #define __object_h
 
 #ifndef __toolbox_h
-#include "objects.toolbox.h"
+#include "tboxlibint/objects/toolbox.h"
 #endif
 
 #ifndef __wimp_h
-#include "twimp.h"
+#include "tboxlibint/twimp.h"
 #endif
 
 typedef struct object