diff --git a/Makefile b/Makefile
index 8e3c2bb6902686a2e5e72ad4adb18d677147d1c5..31fcb5e9a328e1970d027f33c10c3c1ac94c36f1 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ ROMCDEFINES   = -DROM
 CDEFINES      = -D${SYSTEM} ${STYLE}
 CDFLAGS       = -Ddebugging=1
 CMHGDFLAGS    = -Ddebugging=1
-CINCLUDES     = -IC:tboxlibint,tbox:,C:
+CINCLUDES     = -Itbox:,C:
 HDRS          =
 LIBS          = ${TBOXINTLIB} ${WIMPLIB}
 DBG_LIBS      = ${TBOXINTDBGLIB}
diff --git a/c/create b/c/create
index 7ec6da6840bda3ce72763612ea0df6e74467c6cd..8416dd9db3b76a0639740227aa66eadb9fc47be7 100644
--- a/c/create
+++ b/c/create
@@ -28,15 +28,15 @@
 #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/window.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/window.h"
 
 #include "object.h"
 #include "task.h"
diff --git a/c/delete b/c/delete
index 6f92248aa82646abf89de13221ad7f1ceaa27ccc..302e9b9b4efe9aa88576d923ad975eade2c08b21 100644
--- a/c/delete
+++ b/c/delete
@@ -25,15 +25,15 @@
 #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/window.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/window.h"
 
 #include "object.h"
 #include "task.h"
diff --git a/c/events b/c/events
index 363b74c78c1ea16215c641d263a492c9bab17b14..612dacfd93a44b8f8d04f93a197ad890f063e578 100644
--- a/c/events
+++ b/c/events
@@ -28,16 +28,16 @@
 #include "swis.h"
 
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "string32.h"
-#include "messages.h"
-#include "style.h"
-
-#include "objects/toolbox.h"
-#include "objects/window.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/style.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/window.h"
 
 #include "object.h"
 #include "events.h"
diff --git a/c/gadgets b/c/gadgets
index 89d385212fcdf26be25fb35c273c0e048c0ad845..20c6e454fbfeb7a4af5dffa0bfd5522a0362f83d 100644
--- a/c/gadgets
+++ b/c/gadgets
@@ -34,16 +34,16 @@
 #include "Global/Services.h"
 #include "Global/NewErrors.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "string32.h"
-#include "messages.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 "objects/toolbox.h"
-#include "objects/window.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/window.h"
 
 #include "globals.h"
 #include "gadgets.h"
diff --git a/c/getstate b/c/getstate
index 31782de7e1ed465cc4f86f2003079508b31f6e0a..56c6c0bb51deba3ad05f91f981cbd656afcc1d41 100644
--- a/c/getstate
+++ b/c/getstate
@@ -25,15 +25,15 @@
 #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/window.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/window.h"
 
 #include "object.h"
 #include "task.h"
diff --git a/c/globals b/c/globals
index 788b53407edde11252755ee91530ed0c53cf093a..e899077e660bcebabad1f76bc3a619fa3ea3acd9 100644
--- a/c/globals
+++ b/c/globals
@@ -20,16 +20,16 @@
  */
 
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "string32.h"
-#include "messages.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 "objects/toolbox.h"
-#include "objects/window.h"
-#include "objects/menu.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/window.h"
+#include "tboxlibint/objects/menu.h"
 
 #include "globals.h"
 
diff --git a/c/hide b/c/hide
index e0304ecda67a0e1c5d025248478a839c5062f20e..12322526482464d1bd26a54b9919f3c0f40e2709 100644
--- a/c/hide
+++ b/c/hide
@@ -25,16 +25,16 @@
 #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/window.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/window.h"
+#include "tboxlibint/objects/menu.h"
 
 #include "object.h"
 #include "task.h"
diff --git a/c/main b/c/main
index 36e18f3e4c386a409b5fa7b4584473f9438a4afa..d1c46444597576720f88fadf016cc454ea5a85e8 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 "string32.h"
-#include "messages.h"
-#include "rmensure.h"
-#include "objmodule.h"
-
-#include "objects/toolbox.h"
-#include "objects/window.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/rmensure.h"
+#include "tboxlibint/objmodule.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/window.h"
 
 #include "object.h"
 #include "create.h"
diff --git a/c/miscop b/c/miscop
index d59a66f623072e1a7cba97de803f53c0e2587844..6aa7e03e37d7fe166d83b77e4364fa9ed3abdf70 100644
--- a/c/miscop
+++ b/c/miscop
@@ -31,15 +31,15 @@
 #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/window.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/window.h"
 
 #include "object.h"
 #include "task.h"
diff --git a/c/show b/c/show
index b647e06e313f328962647ec1fdb11ede86389df0..cc2b901d491c649b0741ef23dd8216d57a1eb051 100644
--- a/c/show
+++ b/c/show
@@ -31,15 +31,15 @@
 #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/window.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/window.h"
 
 #include "object.h"
 #include "task.h"
diff --git a/c/task b/c/task
index c4346ce0e60e8127d56d424df718ca97b144fd32..aa683ea75a556740760837096f39f91338ccf3e0 100644
--- a/c/task
+++ b/c/task
@@ -26,15 +26,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/window.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/window.h"
 
 #include "object.h"
 #include "globals.h"
diff --git a/c/toolbar b/c/toolbar
index e1350968770d47683c70ae45c710d3a9efb60efd..7e818bbde79d0477210bc68a226332c3932981b1 100644
--- a/c/toolbar
+++ b/c/toolbar
@@ -29,16 +29,16 @@
 #include "swis.h"
 
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "string32.h"
-#include "messages.h"
-#include "style.h"
-
-#include "objects/toolbox.h"
-#include "objects/window.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/style.h"
+
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/window.h"
 
 #include "object.h"
 #include "events.h"
diff --git a/c/utils b/c/utils
index 758f2fc17a13ac63a46dfeb40c839ec98cf40395..30be52544dce74794e30ddd1f73d023dfcf6f7ff 100644
--- a/c/utils
+++ b/c/utils
@@ -23,11 +23,11 @@
 #include <stdio.h>
 
 #include "utils.h"
-#include "twimp.h"
+#include "tboxlibint/twimp.h"
 #include "swis.h"
-#include "debug.h"
-#include "objects/window.h"
-#include "messages.h"
+#include "tboxlibint/debug.h"
+#include "tboxlibint/objects/window.h"
+#include "tboxlibint/messages.h"
 #include "string.h"
 #include "stddef.h"
 
diff --git a/gadgets/c/actbut b/gadgets/c/actbut
index 8e8445721921b585a56cf4e37e17084766d3c134..940dac00f7d37088f208ca32c6f7b47d5043c962 100644
--- a/gadgets/c/actbut
+++ b/gadgets/c/actbut
@@ -28,16 +28,16 @@
 #include "swis.h"
 #include "kernel.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "string32.h"
-#include "messages.h"
-
-#include "style.h"
-#include "objects/toolbox.h"
-#include "objects/window.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/style.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/window.h"
 
 #include "../globals.h"
 #include "../gadgets.h"
diff --git a/gadgets/c/adjuster b/gadgets/c/adjuster
index 45147393ee8d2af8701ed82fa5a3ceba407ab267..1176d0616a9966fe5f4ef12781ec6e36665c80aa 100644
--- a/gadgets/c/adjuster
+++ b/gadgets/c/adjuster
@@ -26,16 +26,16 @@
 #include "swis.h"
 #include "kernel.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "string32.h"
-#include "messages.h"
-
-#include "style.h"
-#include "objects/toolbox.h"
-#include "objects/window.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/style.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/window.h"
 
 #include "../globals.h"
 #include "../gadgets.h"
diff --git a/gadgets/c/button b/gadgets/c/button
index 14aabc9543a868db7b07daa5ba1f9f628ead791e..c61b729564cea6b10772333016582ad0bb959c68 100644
--- a/gadgets/c/button
+++ b/gadgets/c/button
@@ -24,16 +24,16 @@
 #include "swis.h"
 #include "kernel.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "string32.h"
-#include "messages.h"
-
-#include "style.h"
-#include "objects/toolbox.h"
-#include "objects/window.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/style.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/window.h"
 
 #include "../globals.h"
 #include "../gadgets.h"
diff --git a/gadgets/c/display b/gadgets/c/display
index 7fcfce05e65f6b8a61dceb7df734cb0dd75e495c..1b159180d041b490eeaf9e1ccc65e9eca83b6a63 100644
--- a/gadgets/c/display
+++ b/gadgets/c/display
@@ -27,16 +27,16 @@
 #include "swis.h"
 #include "kernel.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "string32.h"
-#include "messages.h"
-
-#include "style.h"
-#include "objects/toolbox.h"
-#include "objects/window.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/style.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/window.h"
 
 #include "../globals.h"
 #include "../gadgets.h"
diff --git a/gadgets/c/draggable b/gadgets/c/draggable
index 785f9bb7a3869db41e355e4b1bc7375b596d6aa4..11ffb1eea6326213f46255f8134cd641a8a18d55 100644
--- a/gadgets/c/draggable
+++ b/gadgets/c/draggable
@@ -27,16 +27,16 @@
 #include "swis.h"
 #include "Global/NewErrors.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "string32.h"
-#include "messages.h"
-
-#include "style.h"
-#include "objects/toolbox.h"
-#include "objects/window.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/style.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/window.h"
 
 #include "../globals.h"
 #include "../gadgets.h"
diff --git a/gadgets/c/label b/gadgets/c/label
index b5981affcb7a0cd43ab9588be6b0db7ae29bbc8c..38632fe4436d09630e9984c59049fcc690304114 100644
--- a/gadgets/c/label
+++ b/gadgets/c/label
@@ -27,16 +27,16 @@
 #include "swis.h"
 #include "kernel.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "string32.h"
-#include "messages.h"
-
-#include "style.h"
-#include "objects/toolbox.h"
-#include "objects/window.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/style.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/window.h"
 
 #include "../globals.h"
 #include "../gadgets.h"
diff --git a/gadgets/c/labelbox b/gadgets/c/labelbox
index 4cb9602c533cab3ce425b493eee71058c7472e94..9f208c531f435529a134c5c4250e10b1b9b17a4c 100644
--- a/gadgets/c/labelbox
+++ b/gadgets/c/labelbox
@@ -25,16 +25,16 @@
 #include "swis.h"
 #include "kernel.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "string32.h"
-#include "messages.h"
-
-#include "style.h"
-#include "objects/toolbox.h"
-#include "objects/window.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/style.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/window.h"
 
 #include "../globals.h"
 #include "../gadgets.h"
diff --git a/gadgets/c/numrange b/gadgets/c/numrange
index 870d5009e0d4b878a2de03179757b10bc25eb506..7c8a3fffb5fe24d5625fae9a8d4ba5826d15dac3 100644
--- a/gadgets/c/numrange
+++ b/gadgets/c/numrange
@@ -26,16 +26,16 @@
 #include "swis.h"
 #include "kernel.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "string32.h"
-#include "messages.h"
-
-#include "style.h"
-#include "objects/toolbox.h"
-#include "objects/window.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/style.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/window.h"
 
 #include "../globals.h"
 #include "../gadgets.h"
diff --git a/gadgets/c/optbut b/gadgets/c/optbut
index d4f544b2aef8f17f3d8c509b046640a8fcdd6e12..159b013ac094cacc15b37c395e3366845764fa60 100644
--- a/gadgets/c/optbut
+++ b/gadgets/c/optbut
@@ -27,16 +27,16 @@
 #include "swis.h"
 #include "kernel.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "string32.h"
-#include "messages.h"
-
-#include "style.h"
-#include "objects/toolbox.h"
-#include "objects/window.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/style.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/window.h"
 
 #include "../globals.h"
 #include "../gadgets.h"
diff --git a/gadgets/c/popupmenu b/gadgets/c/popupmenu
index 7447d9172a9adac41af2d3afd7df6f214595ac19..9e4d2c6a95dd8d133772bd8a406f4351d6b9ab32 100644
--- a/gadgets/c/popupmenu
+++ b/gadgets/c/popupmenu
@@ -26,17 +26,17 @@
 #include "swis.h"
 #include "kernel.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "string32.h"
-#include "messages.h"
-
-#include "style.h"
-#include "objects/toolbox.h"
-#include "objects/window.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/style.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/window.h"
+#include "tboxlibint/objects/menu.h"
 
 #include "../globals.h"
 #include "../gadgets.h"
diff --git a/gadgets/c/radiobut b/gadgets/c/radiobut
index 8b7578a5010b4da9eecab722341f82dd19573117..6d73ab6aef24649f4f162649d8b96102c4f1f5d4 100644
--- a/gadgets/c/radiobut
+++ b/gadgets/c/radiobut
@@ -26,16 +26,16 @@
 #include "swis.h"
 #include "kernel.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "string32.h"
-#include "messages.h"
-
-#include "style.h"
-#include "objects/toolbox.h"
-#include "objects/window.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/style.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/window.h"
 
 #include "../globals.h"
 #include "../gadgets.h"
diff --git a/gadgets/c/simple b/gadgets/c/simple
index 77fd16eea30cbb8c29f444d1713f5f7d4d78ecbb..18618a6439b3fc3e4578aa89733b80ac870a9d41 100644
--- a/gadgets/c/simple
+++ b/gadgets/c/simple
@@ -25,16 +25,16 @@
 #include "swis.h"
 #include "kernel.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "string32.h"
-#include "messages.h"
-
-#include "style.h"
-#include "objects/toolbox.h"
-#include "objects/window.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/style.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/window.h"
 
 #include "../globals.h"
 #include "../gadgets.h"
diff --git a/gadgets/c/slider b/gadgets/c/slider
index 91765e5b7ff67bcb5d3cbeb771eb2e978cb73f91..58b5f4627105c36ce19b42276e5b7310e369739a 100644
--- a/gadgets/c/slider
+++ b/gadgets/c/slider
@@ -27,16 +27,16 @@
 #include "swis.h"
 #include "kernel.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "string32.h"
-#include "messages.h"
-
-#include "style.h"
-#include "objects/toolbox.h"
-#include "objects/window.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/style.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/window.h"
 
 #include "../globals.h"
 #include "../gadgets.h"
diff --git a/gadgets/c/stringset b/gadgets/c/stringset
index 950b00b3ea8ea4176c099b23eacc5db4eada95ae..9e23f182bcc0e8083378a52278e4db3bf0c0294a 100644
--- a/gadgets/c/stringset
+++ b/gadgets/c/stringset
@@ -28,17 +28,17 @@
 #include "swis.h"
 #include "kernel.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "string32.h"
-#include "messages.h"
-
-#include "style.h"
-#include "objects/toolbox.h"
-#include "objects/window.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/style.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/window.h"
+#include "tboxlibint/objects/menu.h"
 
 #include "../globals.h"
 #include "../gadgets.h"
diff --git a/gadgets/c/writable b/gadgets/c/writable
index c6843e42c12aefae29e2958a50ca236413a6b656..f326934001b829df45ac4108bfab88b42693b607 100644
--- a/gadgets/c/writable
+++ b/gadgets/c/writable
@@ -26,16 +26,16 @@
 #include "swis.h"
 #include "kernel.h"
 
-#include "const.h"
-#include "macros.h"
-#include "debug.h"
-#include "mem.h"
-#include "string32.h"
-#include "messages.h"
-
-#include "style.h"
-#include "objects/toolbox.h"
-#include "objects/window.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/style.h"
+#include "tboxlibint/objects/toolbox.h"
+#include "tboxlibint/objects/window.h"
 
 #include "../globals.h"
 #include "../gadgets.h"
diff --git a/h/gadgets b/h/gadgets
index ad292bfa616d81fa41be78fcbc3b13fbbf691584..371658aa8b4cd426cb53502cf57300c96d4c2c75 100644
--- a/h/gadgets
+++ b/h/gadgets
@@ -32,9 +32,9 @@
 #ifndef  __gadgets_h
 #define __gadgets_h
 
-#include "objects.toolbox.h"   /* For ToolboxEvent */
-#include "objects.window.h"    /* For Gadget */
-#include "twimp.h"
+#include "tboxlibint/objects/toolbox.h"   /* For ToolboxEvent */
+#include "tboxlibint/objects/window.h"    /* For Gadget */
+#include "tboxlibint/twimp.h"
 #include "utils.h"
 
 #ifndef __object_h
diff --git a/h/globals b/h/globals
index 45d4008fd9ef8ff1df693304dc820d2f33ee4c61..60418ece72d0a236e520ccd834afdb3ff8ada747 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 f64ad1af6a8379bacb8282ca65e8a252d262f2e2..54c8f602db3a636940cb3533ec933e12e7f24774 100644
--- a/h/object
+++ b/h/object
@@ -25,7 +25,7 @@
 
 
 #ifndef __wimp_h
-#include "twimp.h"
+#include "tboxlibint/twimp.h"
 #endif
 
 #ifndef __window_h
diff --git a/h/utils b/h/utils
index fc0e02491a5f2aaf38ce84d8df7587218ff4c290..f3dda76e065ab031d2990aaaec2deda4ad4a6750 100644
--- a/h/utils
+++ b/h/utils
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "twimp.h"
+#include "tboxlibint/twimp.h"
 #include "kernel.h"
 #include "swis.h"