diff --git a/Makefile b/Makefile
index a567defde7e2182b7901ce697410d148f1f9b1d4..4464dadea993e594e1c160dbc83b67add84481ed 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 c4b46dab6d1d13c714201486ae3a31a5458007d3..66a4ffa0bc04acc2fbfd631e8092cdcecd5e88ef 100644
--- a/c/auxiliary
+++ b/c/auxiliary
@@ -26,19 +26,19 @@
 #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 "os.h"
-#include "style.h"
-#include "objects.toolbox.h"
-#include "objects.fontmenu.h"
-#include "objects.menu.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/os.h"
+#include "tboxlibint/style.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/fontmenu.h"
+#include "tboxlibint/objects/menu.h"
 
 #include "auxiliary.h"
 #include "object.h"
diff --git a/c/create b/c/create
index fe9aec0e3f2a29caa108c260586ae79f13c720f6..a623d2b14d6167732c6456f815cbce111c85cd1d 100644
--- a/c/create
+++ b/c/create
@@ -26,14 +26,14 @@
 #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 "objects.toolbox.h"
-#include "objects.fontmenu.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/objects/toolbox.h"
+#include "tboxlibint/objects/fontmenu.h"
 
 #include "object.h"
 #include "auxiliary.h"
diff --git a/c/delete b/c/delete
index a5c060d1d5cde43aad30196c720799469e1b00cf..60af03bfc5c60c7da580002b7fac8bff6af664c2 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 "string32.h"
-#include "messages.h"
-#include "objects.toolbox.h"
-#include "objects.fontmenu.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/objects/toolbox.h"
+#include "tboxlibint/objects/fontmenu.h"
 
 #include "object.h"
 #include "auxiliary.h"
diff --git a/c/events b/c/events
index 927c27347abd5d2a7d4c56373df165f091c00931..0f78c7f3af337d4d7cbfbf36a5d1c3e82a04ffac 100644
--- a/c/events
+++ b/c/events
@@ -27,15 +27,15 @@
 #include "swis.h"
 
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "string32.h"
-#include "messages.h"
-#include "objects.toolbox.h"
-#include "objects.fontmenu.h"
-#include "objects.menu.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/objects/toolbox.h"
+#include "tboxlibint/objects/fontmenu.h"
+#include "tboxlibint/objects/menu.h"
 
 #include "object.h"
 #include "auxiliary.h"
diff --git a/c/getstate b/c/getstate
index 77cc182f338543c109aad6acc353cc1aedfb098f..36316ed07b15fdc29b4d89f61cffd9125fb64b8a 100644
--- a/c/getstate
+++ b/c/getstate
@@ -25,14 +25,13 @@
 #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.fontdbox.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 "object.h"
 #include "auxiliary.h"
diff --git a/c/hide b/c/hide
index 0a8594b9447384bad6f39aeff1242cfe0684328b..a9a354b36216b5787a60df477276cb891b640ef6 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 "string32.h"
-#include "messages.h"
-#include "objects.toolbox.h"
-#include "objects.fontmenu.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/objects/toolbox.h"
+#include "tboxlibint/objects/fontmenu.h"
 
 #include "object.h"
 #include "auxiliary.h"
diff --git a/c/main b/c/main
index 761b6a770bdee98ab6a5b64044d1ee8574edaafa..aee601fc0337780bfe2455390ddce658bba09914 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 "rmensure.h"
-#include "mem.h"
-#include "os.h"
-#include "string32.h"
-#include "messages.h"
-#include "objects.toolbox.h"
-#include "objects.fontmenu.h"
-#include "objmodule.h"
+#include "tboxlibint/const.h"
+#include "tboxlibint/macros.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/rmensure.h"
+#include "tboxlibint/mem.h"
+#include "tboxlibint/os.h"
+#include "tboxlibint/string32.h"
+#include "tboxlibint/messages.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/fontmenu.h"
+#include "tboxlibint/objmodule.h"
 
 #include "object.h"
 #include "auxiliary.h"
diff --git a/c/miscop b/c/miscop
index 036ba0f41a586df19cd07dd6c96d040b37de0886..b7024f6a3c2a0768f049c2cd4e807683b1a17ff9 100644
--- a/c/miscop
+++ b/c/miscop
@@ -26,14 +26,14 @@
 #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 "objects.toolbox.h"
-#include "objects.fontmenu.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/objects/toolbox.h"
+#include "tboxlibint/objects/fontmenu.h"
 
 
 #include "object.h"
diff --git a/c/show b/c/show
index f1d88b66a61612799648bbd2d705fc3092c4db91..90fc8f78d9a8d67496a4b90164c650e9a0c2d9c3 100644
--- a/c/show
+++ b/c/show
@@ -26,14 +26,14 @@
 #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 "objects.toolbox.h"
-#include "objects.fontmenu.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/objects/toolbox.h"
+#include "tboxlibint/objects/fontmenu.h"
 
 #include "object.h"
 #include "auxiliary.h"
diff --git a/c/task b/c/task
index f61f59cd978b75f5cc273970bc7e9c6c10f0db49..a528079daf16b70cc95bd66603271992263f652e 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 "string32.h"
-#include "messages.h"
-#include "objects.toolbox.h"
-#include "objects.fontmenu.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/objects/toolbox.h"
+#include "tboxlibint/objects/fontmenu.h"
 
 #include "object.h"
 #include "auxiliary.h"
diff --git a/h/auxiliary b/h/auxiliary
index 1380a5f0430c758f22cd643de2096ac659b90b43..3f2baa3afceb08efc2f8c8ace43bbc4640b28b8b 100644
--- a/h/auxiliary
+++ b/h/auxiliary
@@ -18,19 +18,19 @@
 #include "kernel.h"
 
 #ifndef __toolbox_h
-#include "objects.toolbox.h"
+#include "tboxlibint/objects/toolbox.h"
 #endif
 
 #ifndef __fontmenu_h
-#include "objects.fontmenu.h"
+#include "tboxlibint/objects/fontmenu.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/task b/h/task
index babc94c2b4f1ab559e05b15abf8763c5f8bdb2f5..ed5f4aadd97c25b96210b05a362fd5b0565df496 100644
--- a/h/task
+++ b/h/task
@@ -23,11 +23,11 @@
 #define __task_h
 
 #ifndef __toolbox_h
-#include "objects.toolbox.h"
+#include "tboxlibint/objects/toolbox.h"
 #endif
 
 #ifndef __fontmenu_h
-#include "objects.fontmenu.h"
+#include "tboxlibint/objects/fontmenu.h"
 #endif
 
 #ifndef __object_h