diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index 07716acba1..ac74bbcf65 100644
--- a/gtk2_ardour/actions.cc
+++ b/gtk2_ardour/actions.cc
@@ -26,9 +26,9 @@
 #include <string>
 #include <list>
 
-#include <gtk/gtkaccelmap.h>
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkactiongroup.h>
+#include <ytk/gtkaccelmap.h>
+#include <ytk/gtkuimanager.h>
+#include <ytk/gtkactiongroup.h>
 
 #include <gtkmm/accelmap.h>
 #include <gtkmm/uimanager.h>
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 5f3332fb0b..88acd4819a 100644
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -39,7 +39,7 @@
 
 #include <glibmm/miscutils.h>
 #include <gtkmm/accelmap.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 #include "pbd/file_utils.h"
 #include "pbd/fpu.h"
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index 35f63cd82b..667b6a1089 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -27,7 +27,7 @@
  */
 
 #include <gio/gio.h>
-#include <gtk/gtkiconfactory.h>
+#include <ytk/gtkiconfactory.h>
 
 #include "pbd/file_utils.h"
 
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index 8a7bfd822a..414f070e3e 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -33,7 +33,7 @@
 
 #include <string>
 
-#include <gtk/gtkaction.h>
+#include <ytk/gtkaction.h>
 
 #include "canvas/container.h"
 #include "canvas/canvas.h"
diff --git a/gtk2_ardour/mac_vst_plugin_ui.mm b/gtk2_ardour/mac_vst_plugin_ui.mm
index 2bfc198141..113802d26b 100644
--- a/gtk2_ardour/mac_vst_plugin_ui.mm
+++ b/gtk2_ardour/mac_vst_plugin_ui.mm
@@ -17,7 +17,7 @@
  */
 
 #include <gtkmm.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <ydk/gdkquartz.h>
 
 #include "gui_thread.h"
diff --git a/gtk2_ardour/piano_key_bindings.h b/gtk2_ardour/piano_key_bindings.h
index 139149598b..a497ab8e11 100644
--- a/gtk2_ardour/piano_key_bindings.h
+++ b/gtk2_ardour/piano_key_bindings.h
@@ -23,7 +23,7 @@
 #include <map>
 #include <string>
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 /*
  * Class for mapping PC keyboard keys to note pitches. Used by the
diff --git a/gtk2_ardour/pianokeyboard.cc b/gtk2_ardour/pianokeyboard.cc
index 886c06e019..f20bd6177b 100644
--- a/gtk2_ardour/pianokeyboard.cc
+++ b/gtk2_ardour/pianokeyboard.cc
@@ -28,7 +28,7 @@
 #include <pango/pangocairo.h>
 
 #include <ydk/gdkkeysyms.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 #include "gtkmm2ext/keyboard.h"
 
diff --git a/gtk2_ardour/utils.cc b/gtk2_ardour/utils.cc
index 5887e70c08..140aca27f7 100644
--- a/gtk2_ardour/utils.cc
+++ b/gtk2_ardour/utils.cc
@@ -41,7 +41,7 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include <gtk/gtkpaned.h>
+#include <ytk/gtkpaned.h>
 #include <gtkmm/label.h>
 #include <gtkmm/paned.h>
 #include <gtkmm/rc.h>
diff --git a/gtk2_ardour/vst3_nsview_plugin_ui.mm b/gtk2_ardour/vst3_nsview_plugin_ui.mm
index 38703f5c63..ce76cad85c 100644
--- a/gtk2_ardour/vst3_nsview_plugin_ui.mm
+++ b/gtk2_ardour/vst3_nsview_plugin_ui.mm
@@ -21,7 +21,7 @@
 #endif
 
 #include <gtkmm.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <ydk/gdkquartz.h>
 
 #include "pbd/convert.h"
diff --git a/gtk2_ardour/windows_vst_plugin_ui.cc b/gtk2_ardour/windows_vst_plugin_ui.cc
index 3b45302e69..2e6be24167 100644
--- a/gtk2_ardour/windows_vst_plugin_ui.cc
+++ b/gtk2_ardour/windows_vst_plugin_ui.cc
@@ -18,8 +18,8 @@
  */
 
 #include <gtkmm.h>
-#include <gtk/gtk.h>
-#include <gtk/gtksocket.h>
+#include <ytk/ytk.h>
+#include <ytk/gtksocket.h>
 #include "gtkmm2ext/gui_thread.h"
 #include "fst.h"
 #include "ardour/plug_insert_base.h"
diff --git a/libs/clearlooks-newer/animation.h b/libs/clearlooks-newer/animation.h
index dca70bc9a4..457fddf744 100644
--- a/libs/clearlooks-newer/animation.h
+++ b/libs/clearlooks-newer/animation.h
@@ -19,7 +19,7 @@
 #include "config.h"
 
 #ifdef HAVE_ANIMATION
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <ge-support.h>
 
 #define CL_IS_PROGRESS_BAR(widget) GE_IS_PROGRESS_BAR(widget) && widget->allocation.x != -1 && widget->allocation.y != -1
diff --git a/libs/clearlooks-newer/cairo-support.h b/libs/clearlooks-newer/cairo-support.h
index 12163b0469..13a1b983a0 100644
--- a/libs/clearlooks-newer/cairo-support.h
+++ b/libs/clearlooks-newer/cairo-support.h
@@ -1,6 +1,6 @@
 /* Helpful functions when dealing with cairo in gtk engines */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <math.h>
 
 typedef struct
diff --git a/libs/clearlooks-newer/clearlooks_draw.h b/libs/clearlooks-newer/clearlooks_draw.h
index bf3c0bb486..589fa00b86 100644
--- a/libs/clearlooks-newer/clearlooks_draw.h
+++ b/libs/clearlooks-newer/clearlooks_draw.h
@@ -4,7 +4,7 @@
 #include "clearlooks_types.h"
 #include "clearlooks_style.h"
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <ydk/gdk.h>
 
 #include <cairo.h>
diff --git a/libs/clearlooks-newer/clearlooks_rc_style.h b/libs/clearlooks-newer/clearlooks_rc_style.h
index a80a846000..ddcf535694 100644
--- a/libs/clearlooks-newer/clearlooks_rc_style.h
+++ b/libs/clearlooks-newer/clearlooks_rc_style.h
@@ -22,7 +22,7 @@
  * Modified by Kulyk Nazar <schamane@myeburg.net>
  */
 
-#include <gtk/gtkrc.h>
+#include <ytk/gtkrc.h>
 #include "clearlooks_types.h"
 
 typedef struct _ClearlooksRcStyle ClearlooksRcStyle;
diff --git a/libs/clearlooks-newer/clearlooks_style.c b/libs/clearlooks-newer/clearlooks_style.c
index ca1b5825ff..61aa4bbb07 100644
--- a/libs/clearlooks-newer/clearlooks_style.c
+++ b/libs/clearlooks-newer/clearlooks_style.c
@@ -19,7 +19,7 @@
  *
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <cairo.h>
 #include <math.h>
 #include <string.h>
diff --git a/libs/clearlooks-newer/clearlooks_style.h b/libs/clearlooks-newer/clearlooks_style.h
index b306836453..77de3656a5 100644
--- a/libs/clearlooks-newer/clearlooks_style.h
+++ b/libs/clearlooks-newer/clearlooks_style.h
@@ -21,7 +21,7 @@
  * and by Alexander Larsson <alexl@redhat.com>
  * Modified by Richard Stellingwerff <remenic@gmail.com>
  */
-#include <gtk/gtkstyle.h>
+#include <ytk/gtkstyle.h>
 
 #ifndef CLEARLOOKS_STYLE_H
 #define CLEARLOOKS_STYLE_H
diff --git a/libs/clearlooks-newer/clearlooks_theme_main.c b/libs/clearlooks-newer/clearlooks_theme_main.c
index ae856278e7..63d4922d07 100644
--- a/libs/clearlooks-newer/clearlooks_theme_main.c
+++ b/libs/clearlooks-newer/clearlooks_theme_main.c
@@ -1,5 +1,5 @@
 #include <gmodule.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 #include "clearlooks_style.h"
 #include "clearlooks_rc_style.h"
diff --git a/libs/clearlooks-newer/support.h b/libs/clearlooks-newer/support.h
index 1f24971cf3..05ba0bfa10 100644
--- a/libs/clearlooks-newer/support.h
+++ b/libs/clearlooks-newer/support.h
@@ -1,7 +1,7 @@
 #ifndef SUPPORT_H
 #define SUPPORT_H
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <math.h>
 #include <string.h>
 
diff --git a/libs/clearlooks-newer/widget-information.c b/libs/clearlooks-newer/widget-information.c
index 41a3c5a3aa..f45b0577f1 100644
--- a/libs/clearlooks-newer/widget-information.c
+++ b/libs/clearlooks-newer/widget-information.c
@@ -1,4 +1,4 @@
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 #include "general-support.h"
 #include "widget-information.h"
diff --git a/libs/gtkmm2ext/actions.cc b/libs/gtkmm2ext/actions.cc
index dcf24b4cd1..bd0a854892 100644
--- a/libs/gtkmm2ext/actions.cc
+++ b/libs/gtkmm2ext/actions.cc
@@ -27,9 +27,9 @@
 #include <stack>
 
 
-#include <gtk/gtkaccelmap.h>
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkactiongroup.h>
+#include <ytk/gtkaccelmap.h>
+#include <ytk/gtkuimanager.h>
+#include <ytk/gtkactiongroup.h>
 
 #include <gtkmm.h>
 #include <gtkmm/accelmap.h>
diff --git a/libs/gtkmm2ext/gtkapplication_quartz.mm b/libs/gtkmm2ext/gtkapplication_quartz.mm
index aaa9a15f36..7e0505a716 100644
--- a/libs/gtkmm2ext/gtkapplication_quartz.mm
+++ b/libs/gtkmm2ext/gtkapplication_quartz.mm
@@ -28,7 +28,7 @@
 #include <sigc++/slot.h>
 
 #include <string.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <ydk/gdkkeysyms.h>
 #include <gtkmm2ext/gtkapplication.h>
 #include <gtkmm2ext/gtkapplication-private.h>
diff --git a/libs/gtkmm2ext/gtkmm2ext/gtkapplication-private.h b/libs/gtkmm2ext/gtkmm2ext/gtkapplication-private.h
index 87812c6d8d..b652714ed5 100644
--- a/libs/gtkmm2ext/gtkmm2ext/gtkapplication-private.h
+++ b/libs/gtkmm2ext/gtkmm2ext/gtkapplication-private.h
@@ -24,7 +24,7 @@
 #ifndef __GTK_APPLICATION_PRIVATE_H__
 #define __GTK_APPLICATION_PRIVATE_H__
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/gtkmm2ext/gtkmm2ext/gtkapplication.h b/libs/gtkmm2ext/gtkmm2ext/gtkapplication.h
index c7c22349cb..8bd4610a54 100644
--- a/libs/gtkmm2ext/gtkmm2ext/gtkapplication.h
+++ b/libs/gtkmm2ext/gtkmm2ext/gtkapplication.h
@@ -24,7 +24,7 @@
 #ifndef __GTK_APPLICATION_H__
 #define __GTK_APPLICATION_H__
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 #include "gtkmm2ext/visibility.h"
 
diff --git a/libs/gtkmm2ext/gtkmm2ext/keyboard.h b/libs/gtkmm2ext/gtkmm2ext/keyboard.h
index 156bb2f987..7aed9bb55e 100644
--- a/libs/gtkmm2ext/gtkmm2ext/keyboard.h
+++ b/libs/gtkmm2ext/gtkmm2ext/keyboard.h
@@ -27,7 +27,7 @@
 #include <string>
 #include <vector>
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <gtkmm/accelkey.h>
 
 #include "pbd/signals.h"
diff --git a/libs/gtkmm2ext/gtkmm2ext/sync-menu.h b/libs/gtkmm2ext/gtkmm2ext/sync-menu.h
index b1fb455858..8ba4aa7f99 100644
--- a/libs/gtkmm2ext/gtkmm2ext/sync-menu.h
+++ b/libs/gtkmm2ext/gtkmm2ext/sync-menu.h
@@ -25,7 +25,7 @@
 #ifndef __IGE_MAC_MENU_H__
 #define __IGE_MAC_MENU_H__
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 #include "gtkmm2ext/visibility.h"
 
diff --git a/libs/gtkmm2ext/menu_elems.cc b/libs/gtkmm2ext/menu_elems.cc
index e214106346..3d7c4c579a 100644
--- a/libs/gtkmm2ext/menu_elems.cc
+++ b/libs/gtkmm2ext/menu_elems.cc
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include "gtkmm2ext/menu_elems.h"
 
 using namespace Gtkmm2ext;
diff --git a/libs/gtkmm2ext/sync-menu.c b/libs/gtkmm2ext/sync-menu.c
index 20fe895633..c883424bf0 100644
--- a/libs/gtkmm2ext/sync-menu.c
+++ b/libs/gtkmm2ext/sync-menu.c
@@ -22,7 +22,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <ydk/gdkkeysyms.h>
 
 #include <Carbon/Carbon.h>
diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc
index 144114251a..15c9bd7755 100644
--- a/libs/gtkmm2ext/utils.cc
+++ b/libs/gtkmm2ext/utils.cc
@@ -26,8 +26,8 @@
 #include <algorithm>
 #include <iostream>
 
-#include <gtk/gtkpaned.h>
-#include <gtk/gtk.h>
+#include <ytk/gtkpaned.h>
+#include <ytk/ytk.h>
 
 #include <gtkmm/widget.h>
 #include <gtkmm/button.h>
diff --git a/libs/tk/suil/cocoa_in_gtk2.mm b/libs/tk/suil/cocoa_in_gtk2.mm
index efcbcb05eb..9ea0cf95ef 100644
--- a/libs/tk/suil/cocoa_in_gtk2.mm
+++ b/libs/tk/suil/cocoa_in_gtk2.mm
@@ -20,7 +20,7 @@
 #include "lv2/options/options.h"
 #include "lv2/urid/urid.h"
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <ydk/gdkquartz.h>
 
 #include <string.h>
diff --git a/libs/tk/suil/win_in_gtk2.cpp b/libs/tk/suil/win_in_gtk2.cpp
index c91c29f8c8..540fdbd01d 100644
--- a/libs/tk/suil/win_in_gtk2.cpp
+++ b/libs/tk/suil/win_in_gtk2.cpp
@@ -19,7 +19,7 @@
 #include "lv2/options/options.h"
 #include "lv2/urid/urid.h"
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <ydk/gdkwin32.h>
 
 #ifndef WM_MOUSEWHEEL
diff --git a/libs/tk/suil/x11_in_gtk2.c b/libs/tk/suil/x11_in_gtk2.c
index 455c7c1e2a..f13516c588 100644
--- a/libs/tk/suil/x11_in_gtk2.c
+++ b/libs/tk/suil/x11_in_gtk2.c
@@ -31,7 +31,7 @@
 #include <glib-object.h>
 #include <glib.h>
 #include <gobject/gclosure.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/libs/tk/ydkmm/dragcontext.cc b/libs/tk/ydkmm/dragcontext.cc
index 7b70205840..e37a4c1e8b 100644
--- a/libs/tk/ydkmm/dragcontext.cc
+++ b/libs/tk/ydkmm/dragcontext.cc
@@ -32,7 +32,7 @@
  */
 
 #include <gdkmm/window.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <ydk/gdk.h>
 #include <glibmm/utility.h> //For ScopedPtr<>.
 
diff --git a/libs/tk/ytk/gtkmountoperation-x11.c b/libs/tk/ytk/gtkmountoperation-x11.c
index 303fca7cb1..c9e30a8fbc 100644
--- a/libs/tk/ytk/gtkmountoperation-x11.c
+++ b/libs/tk/ytk/gtkmountoperation-x11.c
@@ -34,7 +34,7 @@
 #include <gio/gio.h>
 #include "ydk/gdkx.h"
 #include <X11/Xatom.h>
-#include <gtk/gtkicontheme.h>
+#include <ytk/gtkicontheme.h>
 #include "gtkintl.h"
 
 /* for the kill(2) system call and errno - POSIX.1-2001 and later */
diff --git a/libs/tk/ytk/gtktoolitemgroup.c b/libs/tk/ytk/gtktoolitemgroup.c
index 3008cba5a1..c2dd994680 100644
--- a/libs/tk/ytk/gtktoolitemgroup.c
+++ b/libs/tk/ytk/gtktoolitemgroup.c
@@ -24,7 +24,7 @@
 
 #include "gtktoolpaletteprivate.h"
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <math.h>
 #include <string.h>
 #include "gtkprivate.h"
diff --git a/libs/tk/ytk/gtktoolpalette.c b/libs/tk/ytk/gtktoolpalette.c
index f08c159da3..ad837f4755 100644
--- a/libs/tk/ytk/gtktoolpalette.c
+++ b/libs/tk/ytk/gtktoolpalette.c
@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 #include "gtktoolpaletteprivate.h"
 #include "gtkmarshalers.h"
diff --git a/libs/tk/ytk/gtktypebuiltins.c b/libs/tk/ytk/gtktypebuiltins.c
index ddb86e7732..bd9e071dd5 100644
--- a/libs/tk/ytk/gtktypebuiltins.c
+++ b/libs/tk/ytk/gtktypebuiltins.c
@@ -3,7 +3,7 @@
 
 #undef GTK_DISABLE_DEPRECATED
 #define GTK_ENABLE_BROKEN
-#include "gtk.h"
+#include "ytk.h"
 #include "gtkprivate.h"
 #include "gtkalias.h"
 /* enumerations from "gtkaccelgroup.h" */
diff --git a/libs/tk/ytk/gtkwindow.c b/libs/tk/ytk/gtkwindow.c
index 61ab7ab1f2..d749bc835d 100644
--- a/libs/tk/ytk/gtkwindow.c
+++ b/libs/tk/ytk/gtkwindow.c
@@ -8010,7 +8010,7 @@ gtk_XParseGeometry (const char   *string,
  * gtk_widget_show_all() on the contents and gtk_window_set_geometry_hints()
  * on the window.
  * |[
- * #include <gtk/gtk.h>
+ * #include <ytk/ytk.h>
  *    
  * static void
  * fill_with_content (GtkWidget *vbox)
diff --git a/libs/tk/ytk/wscript b/libs/tk/ytk/wscript
index b72cb6361c..bf63da170f 100644
--- a/libs/tk/ytk/wscript
+++ b/libs/tk/ytk/wscript
@@ -270,8 +270,8 @@ def configure(conf):
 def build(bld):
     obj = bld.shlib(features = 'c cshlib')
     obj.cflags          = [ bld.env['compiler_flags_dict']['pic'], '-w' ]
-    obj.export_includes = ['ytk']
-    obj.includes        = ['.', '..', 'ytk', 'ytk/gtk']
+    obj.export_includes = ['.']
+    obj.includes        = ['.', 'ytk']
     obj.name            = 'libytk'
     obj.target          = 'ytk'
     obj.use             = [ 'libztk', 'libydk-pixbuf', 'libydk' ]
diff --git a/libs/tk/ytk/ytk/gtk/gtk.h b/libs/tk/ytk/ytk/gtk/gtk.h
deleted file mode 100644
index 020aafe4e8..0000000000
--- a/libs/tk/ytk/ytk/gtk/gtk.h
+++ /dev/null
@@ -1,219 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
- */
-
-#ifndef __GTK_H__
-#define __GTK_H__
-
-#define __GTK_H_INSIDE__
-
-#include <ydk/gdk.h>
-#include <gtk/gtkaboutdialog.h>
-#include <gtk/gtkaccelgroup.h>
-#include <gtk/gtkaccellabel.h>
-#include <gtk/gtkaccelmap.h>
-#include <gtk/gtkaccessible.h>
-#include <gtk/gtkaction.h>
-#include <gtk/gtkactiongroup.h>
-#include <gtk/gtkactivatable.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkalignment.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtkaspectframe.h>
-#include <gtk/gtkassistant.h>
-#include <gtk/gtkbbox.h>
-#include <gtk/gtkbin.h>
-#include <gtk/gtkbindings.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkbuildable.h>
-#include <gtk/gtkbuilder.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkcelleditable.h>
-#include <gtk/gtkcelllayout.h>
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtkcellrendereraccel.h>
-#include <gtk/gtkcellrenderercombo.h>
-#include <gtk/gtkcellrendererpixbuf.h>
-#include <gtk/gtkcellrendererprogress.h>
-#include <gtk/gtkcellrendererspin.h>
-#include <gtk/gtkcellrendererspinner.h>
-#include <gtk/gtkcellrenderertext.h>
-#include <gtk/gtkcellrenderertoggle.h>
-#include <gtk/gtkcellview.h>
-#include <gtk/gtkcheckbutton.h>
-#include <gtk/gtkcheckmenuitem.h>
-#include <gtk/gtkclipboard.h>
-#include <gtk/gtkcolorbutton.h>
-#include <gtk/gtkcolorsel.h>
-#include <gtk/gtkcolorseldialog.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtkcomboboxentry.h>
-#include <gtk/gtkcomboboxtext.h>
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkdebug.h>
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkdrawingarea.h>
-#include <gtk/gtkeditable.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkentrybuffer.h>
-#include <gtk/gtkentrycompletion.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkexpander.h>
-#include <gtk/gtkfixed.h>
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkfilechooserbutton.h>
-#include <gtk/gtkfilechooserdialog.h>
-#include <gtk/gtkfilechooserwidget.h>
-#include <gtk/gtkfilefilter.h>
-#include <gtk/gtkfontbutton.h>
-#include <gtk/gtkfontsel.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkgc.h>
-#include <gtk/gtkhandlebox.h>
-#include <gtk/gtkhbbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkhpaned.h>
-#include <gtk/gtkhruler.h>
-#include <gtk/gtkhscale.h>
-#include <gtk/gtkhscrollbar.h>
-#include <gtk/gtkhseparator.h>
-#include <gtk/gtkhsv.h>
-#include <gtk/gtkiconfactory.h>
-#include <gtk/gtkicontheme.h>
-#include <gtk/gtkiconview.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkimagemenuitem.h>
-#include <gtk/gtkimcontext.h>
-#include <gtk/gtkimcontextsimple.h>
-#include <gtk/gtkimmulticontext.h>
-#include <gtk/gtkinfobar.h>
-#include <gtk/gtkinvisible.h>
-#include <gtk/gtkitem.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtklayout.h>
-#include <gtk/gtklinkbutton.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenubar.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkmenushell.h>
-#include <gtk/gtkmenutoolbutton.h>
-#include <gtk/gtkmessagedialog.h>
-#include <gtk/gtkmisc.h>
-#include <gtk/gtkmodules.h>
-#include <gtk/gtkmountoperation.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtkoffscreenwindow.h>
-#include <gtk/gtkorientable.h>
-#include <gtk/gtkpaned.h>
-#include <gtk/gtkplug.h>
-#include <gtk/gtkprogressbar.h>
-#include <gtk/gtkradioaction.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkradiomenuitem.h>
-#include <gtk/gtkradiotoolbutton.h>
-#include <gtk/gtkrange.h>
-#include <gtk/gtkrc.h>
-#include <gtk/gtkrecentaction.h>
-#include <gtk/gtkrecentchooser.h>
-#include <gtk/gtkrecentchooserdialog.h>
-#include <gtk/gtkrecentchoosermenu.h>
-#include <gtk/gtkrecentchooserwidget.h>
-#include <gtk/gtkrecentfilter.h>
-#include <gtk/gtkrecentmanager.h>
-#include <gtk/gtkruler.h>
-#include <gtk/gtkscale.h>
-#include <gtk/gtkscalebutton.h>
-#include <gtk/gtkscrollbar.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtkseparator.h>
-#include <gtk/gtkseparatormenuitem.h>
-#include <gtk/gtkseparatortoolitem.h>
-#include <gtk/gtksettings.h>
-#include <gtk/gtkshow.h>
-#include <gtk/gtksizegroup.h>
-#include <gtk/gtksocket.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkspinner.h>
-#include <gtk/gtkstatusbar.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkstyle.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtktearoffmenuitem.h>
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtktextbufferrichtext.h>
-#include <gtk/gtktextchild.h>
-#include <gtk/gtktextiter.h>
-#include <gtk/gtktextmark.h>
-#include <gtk/gtktexttag.h>
-#include <gtk/gtktexttagtable.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtktoggleaction.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtktoggletoolbutton.h>
-#include <gtk/gtktoolbar.h>
-#include <gtk/gtktoolbutton.h>
-#include <gtk/gtktoolitem.h>
-#include <gtk/gtktoolitemgroup.h>
-#include <gtk/gtktoolpalette.h>
-#include <gtk/gtktoolshell.h>
-#include <gtk/gtktooltip.h>
-#include <gtk/gtktestutils.h>
-#include <gtk/gtktreednd.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreemodelfilter.h>
-#include <gtk/gtktreemodelsort.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreesortable.h>
-#include <gtk/gtktreestore.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeviewcolumn.h>
-#include <gtk/gtktypeutils.h>
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkvbbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkversion.h>
-#include <gtk/gtkviewport.h>
-#include <gtk/gtkvpaned.h>
-#include <gtk/gtkvruler.h>
-#include <gtk/gtkvscale.h>
-#include <gtk/gtkvscrollbar.h>
-#include <gtk/gtkvseparator.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
-
-/* Deprecated */
-#include <gtk/gtkoptionmenu.h>
-#include <gtk/gtkprogress.h>
-#include <gtk/gtktooltips.h>
-
-#undef __GTK_H_INSIDE__
-
-#endif /* __GTK_H__ */
diff --git a/libs/tk/ytk/ytk/gtk/gtkaboutdialog.h b/libs/tk/ytk/ytk/gtkaboutdialog.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkaboutdialog.h
rename to libs/tk/ytk/ytk/gtkaboutdialog.h
index aef5f40386..ee4511a3d1 100644
--- a/libs/tk/ytk/ytk/gtk/gtkaboutdialog.h
+++ b/libs/tk/ytk/ytk/gtkaboutdialog.h
@@ -26,10 +26,10 @@
 #define __GTK_ABOUT_DIALOG_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkdialog.h>
+#include <ytk/gtkdialog.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkaccelgroup.h b/libs/tk/ytk/ytk/gtkaccelgroup.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkaccelgroup.h
rename to libs/tk/ytk/ytk/gtkaccelgroup.h
index 7ab8e48570..8d2f28082d 100644
--- a/libs/tk/ytk/ytk/gtk/gtkaccelgroup.h
+++ b/libs/tk/ytk/ytk/gtkaccelgroup.h
@@ -29,11 +29,11 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <ydk/gdk.h>
-#include <gtk/gtkenums.h>
+#include <ytk/gtkenums.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkaccellabel.h b/libs/tk/ytk/ytk/gtkaccellabel.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkaccellabel.h
rename to libs/tk/ytk/ytk/gtkaccellabel.h
index d5d2fa43bc..2835ea1270 100644
--- a/libs/tk/ytk/ytk/gtk/gtkaccellabel.h
+++ b/libs/tk/ytk/ytk/gtkaccellabel.h
@@ -32,10 +32,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtklabel.h>
+#include <ytk/gtklabel.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkaccelmap.h b/libs/tk/ytk/ytk/gtkaccelmap.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkaccelmap.h
rename to libs/tk/ytk/ytk/gtkaccelmap.h
index 19b573da02..51204c5097 100644
--- a/libs/tk/ytk/ytk/gtk/gtkaccelmap.h
+++ b/libs/tk/ytk/ytk/gtkaccelmap.h
@@ -22,10 +22,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkaccelgroup.h>
+#include <ytk/gtkaccelgroup.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkaccessible.h b/libs/tk/ytk/ytk/gtkaccessible.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkaccessible.h
rename to libs/tk/ytk/ytk/gtkaccessible.h
index 252a0aed6f..b4f0fdd13f 100644
--- a/libs/tk/ytk/ytk/gtk/gtkaccessible.h
+++ b/libs/tk/ytk/ytk/gtkaccessible.h
@@ -21,11 +21,11 @@
 #define __GTK_ACCESSIBLE_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <ztk/atk.h>
-#include <gtk/gtkwidget.h>
+#include <ytk/gtkwidget.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkaction.h b/libs/tk/ytk/ytk/gtkaction.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtkaction.h
rename to libs/tk/ytk/ytk/gtkaction.h
index 2fe85e6350..a9222fa61f 100644
--- a/libs/tk/ytk/ytk/gtk/gtkaction.h
+++ b/libs/tk/ytk/ytk/gtkaction.h
@@ -32,10 +32,10 @@
 #define __GTK_ACTION_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkwidget.h>
+#include <ytk/gtkwidget.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkactiongroup.h b/libs/tk/ytk/ytk/gtkactiongroup.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkactiongroup.h
rename to libs/tk/ytk/ytk/gtkactiongroup.h
index 06fd735d57..8feb466091 100644
--- a/libs/tk/ytk/ytk/gtk/gtkactiongroup.h
+++ b/libs/tk/ytk/ytk/gtkactiongroup.h
@@ -32,11 +32,11 @@
 #define __GTK_ACTION_GROUP_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkaction.h>
-#include <gtk/gtktypeutils.h> /* for GtkTranslateFunc */
+#include <ytk/gtkaction.h>
+#include <ytk/gtktypeutils.h> /* for GtkTranslateFunc */
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkactivatable.h b/libs/tk/ytk/ytk/gtkactivatable.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkactivatable.h
rename to libs/tk/ytk/ytk/gtkactivatable.h
index 02a32cfb79..f78b2d7c3d 100644
--- a/libs/tk/ytk/ytk/gtk/gtkactivatable.h
+++ b/libs/tk/ytk/ytk/gtkactivatable.h
@@ -21,11 +21,11 @@
 #define __GTK_ACTIVATABLE_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkaction.h>
-#include <gtk/gtktypeutils.h>
+#include <ytk/gtkaction.h>
+#include <ytk/gtktypeutils.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkadjustment.h b/libs/tk/ytk/ytk/gtkadjustment.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkadjustment.h
rename to libs/tk/ytk/ytk/gtkadjustment.h
index f4d5f9680b..c0baaa4afe 100644
--- a/libs/tk/ytk/ytk/gtk/gtkadjustment.h
+++ b/libs/tk/ytk/ytk/gtkadjustment.h
@@ -29,11 +29,11 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <ydk/gdk.h>
-#include <gtk/gtkobject.h>
+#include <ytk/gtkobject.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkalias.h b/libs/tk/ytk/ytk/gtkalias.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtkalias.h
rename to libs/tk/ytk/ytk/gtkalias.h
diff --git a/libs/tk/ytk/ytk/gtk/gtkalignment.h b/libs/tk/ytk/ytk/gtkalignment.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkalignment.h
rename to libs/tk/ytk/ytk/gtkalignment.h
index 086a2f4bc5..267a3ba8e5 100644
--- a/libs/tk/ytk/ytk/gtk/gtkalignment.h
+++ b/libs/tk/ytk/ytk/gtkalignment.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkbin.h>
+#include <ytk/gtkbin.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkarrow.h b/libs/tk/ytk/ytk/gtkarrow.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkarrow.h
rename to libs/tk/ytk/ytk/gtkarrow.h
index a0ef78a728..3371628d00 100644
--- a/libs/tk/ytk/ytk/gtk/gtkarrow.h
+++ b/libs/tk/ytk/ytk/gtkarrow.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkmisc.h>
+#include <ytk/gtkmisc.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkaspectframe.h b/libs/tk/ytk/ytk/gtkaspectframe.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkaspectframe.h
rename to libs/tk/ytk/ytk/gtkaspectframe.h
index c149477f08..c0f6d51246 100644
--- a/libs/tk/ytk/ytk/gtk/gtkaspectframe.h
+++ b/libs/tk/ytk/ytk/gtkaspectframe.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkframe.h>
+#include <ytk/gtkframe.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkassistant.h b/libs/tk/ytk/ytk/gtkassistant.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkassistant.h
rename to libs/tk/ytk/ytk/gtkassistant.h
index d6a3ee152e..0d6ef7eaff 100644
--- a/libs/tk/ytk/ytk/gtk/gtkassistant.h
+++ b/libs/tk/ytk/ytk/gtkassistant.h
@@ -27,10 +27,10 @@
 #define __GTK_ASSISTANT_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkwindow.h>
+#include <ytk/gtkwindow.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkbbox.h b/libs/tk/ytk/ytk/gtkbbox.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkbbox.h
rename to libs/tk/ytk/ytk/gtkbbox.h
index 0809150e3e..c4644c21ee 100644
--- a/libs/tk/ytk/ytk/gtk/gtkbbox.h
+++ b/libs/tk/ytk/ytk/gtkbbox.h
@@ -28,10 +28,10 @@
 #define __GTK_BUTTON_BOX_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkbox.h>
+#include <ytk/gtkbox.h>
 
 
 G_BEGIN_DECLS  
diff --git a/libs/tk/ytk/ytk/gtk/gtkbin.h b/libs/tk/ytk/ytk/gtkbin.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkbin.h
rename to libs/tk/ytk/ytk/gtkbin.h
index 1366f7beda..733c588c0b 100644
--- a/libs/tk/ytk/ytk/gtk/gtkbin.h
+++ b/libs/tk/ytk/ytk/gtkbin.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcontainer.h>
+#include <ytk/gtkcontainer.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkbindings.h b/libs/tk/ytk/ytk/gtkbindings.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkbindings.h
rename to libs/tk/ytk/ytk/gtkbindings.h
index 82a35924da..4909a1d2ad 100644
--- a/libs/tk/ytk/ytk/gtk/gtkbindings.h
+++ b/libs/tk/ytk/ytk/gtkbindings.h
@@ -32,11 +32,11 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <ydk/gdk.h>
-#include <gtk/gtkobject.h>
+#include <ytk/gtkobject.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkbox.h b/libs/tk/ytk/ytk/gtkbox.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkbox.h
rename to libs/tk/ytk/ytk/gtkbox.h
index f389da33ef..665425da03 100644
--- a/libs/tk/ytk/ytk/gtk/gtkbox.h
+++ b/libs/tk/ytk/ytk/gtkbox.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcontainer.h>
+#include <ytk/gtkcontainer.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkbuildable.h b/libs/tk/ytk/ytk/gtkbuildable.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkbuildable.h
rename to libs/tk/ytk/ytk/gtkbuildable.h
index 0eaecfd2db..2d71738db3 100644
--- a/libs/tk/ytk/ytk/gtk/gtkbuildable.h
+++ b/libs/tk/ytk/ytk/gtkbuildable.h
@@ -22,11 +22,11 @@
 #define __GTK_BUILDABLE_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkbuilder.h>
-#include <gtk/gtktypeutils.h>
+#include <ytk/gtkbuilder.h>
+#include <ytk/gtktypeutils.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkbuilder.h b/libs/tk/ytk/ytk/gtkbuilder.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtkbuilder.h
rename to libs/tk/ytk/ytk/gtkbuilder.h
index 41bfa585c4..12537c3d0b 100644
--- a/libs/tk/ytk/ytk/gtk/gtkbuilder.h
+++ b/libs/tk/ytk/ytk/gtkbuilder.h
@@ -22,7 +22,7 @@
 #define __GTK_BUILDER_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <gdkconfig.h>
diff --git a/libs/tk/ytk/ytk/gtk/gtkbuilderprivate.h b/libs/tk/ytk/ytk/gtkbuilderprivate.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtkbuilderprivate.h
rename to libs/tk/ytk/ytk/gtkbuilderprivate.h
diff --git a/libs/tk/ytk/ytk/gtk/gtkbuiltincache.h b/libs/tk/ytk/ytk/gtkbuiltincache.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtkbuiltincache.h
rename to libs/tk/ytk/ytk/gtkbuiltincache.h
diff --git a/libs/tk/ytk/ytk/gtk/gtkbutton.h b/libs/tk/ytk/ytk/gtkbutton.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkbutton.h
rename to libs/tk/ytk/ytk/gtkbutton.h
index 3419b81747..f38dbd0d3f 100644
--- a/libs/tk/ytk/ytk/gtk/gtkbutton.h
+++ b/libs/tk/ytk/ytk/gtkbutton.h
@@ -29,11 +29,11 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkbin.h>
-#include <gtk/gtkimage.h>
+#include <ytk/gtkbin.h>
+#include <ytk/gtkimage.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkcelleditable.h b/libs/tk/ytk/ytk/gtkcelleditable.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkcelleditable.h
rename to libs/tk/ytk/ytk/gtkcelleditable.h
index 9d5a6332ea..39004f2b8e 100644
--- a/libs/tk/ytk/ytk/gtk/gtkcelleditable.h
+++ b/libs/tk/ytk/ytk/gtkcelleditable.h
@@ -21,10 +21,10 @@
 #define __GTK_CELL_EDITABLE_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkwidget.h>
+#include <ytk/gtkwidget.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkcelllayout.h b/libs/tk/ytk/ytk/gtkcelllayout.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkcelllayout.h
rename to libs/tk/ytk/ytk/gtkcelllayout.h
index 828105c9e0..dda3d6e250 100644
--- a/libs/tk/ytk/ytk/gtk/gtkcelllayout.h
+++ b/libs/tk/ytk/ytk/gtkcelllayout.h
@@ -21,13 +21,13 @@
 #define __GTK_CELL_LAYOUT_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtktreeviewcolumn.h>
-#include <gtk/gtkbuildable.h>
-#include <gtk/gtkbuilder.h>
+#include <ytk/gtkcellrenderer.h>
+#include <ytk/gtktreeviewcolumn.h>
+#include <ytk/gtkbuildable.h>
+#include <ytk/gtkbuilder.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkcellrenderer.h b/libs/tk/ytk/ytk/gtkcellrenderer.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkcellrenderer.h
rename to libs/tk/ytk/ytk/gtkcellrenderer.h
index c4831f960f..d724303505 100644
--- a/libs/tk/ytk/ytk/gtk/gtkcellrenderer.h
+++ b/libs/tk/ytk/ytk/gtkcellrenderer.h
@@ -21,10 +21,10 @@
 #define __GTK_CELL_RENDERER_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcelleditable.h>
+#include <ytk/gtkcelleditable.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkcellrendereraccel.h b/libs/tk/ytk/ytk/gtkcellrendereraccel.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkcellrendereraccel.h
rename to libs/tk/ytk/ytk/gtkcellrendereraccel.h
index 905882a942..964b174992 100644
--- a/libs/tk/ytk/ytk/gtk/gtkcellrendereraccel.h
+++ b/libs/tk/ytk/ytk/gtkcellrendereraccel.h
@@ -21,10 +21,10 @@
 #define __GTK_CELL_RENDERER_ACCEL_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcellrenderertext.h>
+#include <ytk/gtkcellrenderertext.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkcellrenderercombo.h b/libs/tk/ytk/ytk/gtkcellrenderercombo.h
similarity index 95%
rename from libs/tk/ytk/ytk/gtk/gtkcellrenderercombo.h
rename to libs/tk/ytk/ytk/gtkcellrenderercombo.h
index acd2109ffb..f68ccbc6d0 100644
--- a/libs/tk/ytk/ytk/gtk/gtkcellrenderercombo.h
+++ b/libs/tk/ytk/ytk/gtkcellrenderercombo.h
@@ -21,11 +21,11 @@
 #define __GTK_CELL_RENDERER_COMBO_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkcellrenderertext.h>
+#include <ytk/gtktreemodel.h>
+#include <ytk/gtkcellrenderertext.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkcellrendererpixbuf.h b/libs/tk/ytk/ytk/gtkcellrendererpixbuf.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkcellrendererpixbuf.h
rename to libs/tk/ytk/ytk/gtkcellrendererpixbuf.h
index 581d6a692d..e150259fcc 100644
--- a/libs/tk/ytk/ytk/gtk/gtkcellrendererpixbuf.h
+++ b/libs/tk/ytk/ytk/gtkcellrendererpixbuf.h
@@ -21,10 +21,10 @@
 #define __GTK_CELL_RENDERER_PIXBUF_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcellrenderer.h>
+#include <ytk/gtkcellrenderer.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkcellrendererprogress.h b/libs/tk/ytk/ytk/gtkcellrendererprogress.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkcellrendererprogress.h
rename to libs/tk/ytk/ytk/gtkcellrendererprogress.h
index b9043cfa8c..83328a4edb 100644
--- a/libs/tk/ytk/ytk/gtk/gtkcellrendererprogress.h
+++ b/libs/tk/ytk/ytk/gtkcellrendererprogress.h
@@ -29,10 +29,10 @@
 #define __GTK_CELL_RENDERER_PROGRESS_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcellrenderer.h>
+#include <ytk/gtkcellrenderer.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkcellrendererspin.h b/libs/tk/ytk/ytk/gtkcellrendererspin.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkcellrendererspin.h
rename to libs/tk/ytk/ytk/gtkcellrendererspin.h
index ca4e2403bf..e45a851c5a 100644
--- a/libs/tk/ytk/ytk/gtk/gtkcellrendererspin.h
+++ b/libs/tk/ytk/ytk/gtkcellrendererspin.h
@@ -21,10 +21,10 @@
 #define __GTK_CELL_RENDERER_SPIN_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcellrenderertext.h>
+#include <ytk/gtkcellrenderertext.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkcellrendererspinner.h b/libs/tk/ytk/ytk/gtkcellrendererspinner.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkcellrendererspinner.h
rename to libs/tk/ytk/ytk/gtkcellrendererspinner.h
index 7a9dc276b0..6056dc1f30 100644
--- a/libs/tk/ytk/ytk/gtk/gtkcellrendererspinner.h
+++ b/libs/tk/ytk/ytk/gtkcellrendererspinner.h
@@ -24,10 +24,10 @@
 #define __GTK_CELL_RENDERER_SPINNER_H__
 
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcellrenderer.h>
+#include <ytk/gtkcellrenderer.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkcellrenderertext.h b/libs/tk/ytk/ytk/gtkcellrenderertext.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkcellrenderertext.h
rename to libs/tk/ytk/ytk/gtkcellrenderertext.h
index 1156bf3822..3227a02b28 100644
--- a/libs/tk/ytk/ytk/gtk/gtkcellrenderertext.h
+++ b/libs/tk/ytk/ytk/gtkcellrenderertext.h
@@ -22,10 +22,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcellrenderer.h>
+#include <ytk/gtkcellrenderer.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkcellrenderertoggle.h b/libs/tk/ytk/ytk/gtkcellrenderertoggle.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkcellrenderertoggle.h
rename to libs/tk/ytk/ytk/gtkcellrenderertoggle.h
index d6145e6a5b..b6c3ac9a52 100644
--- a/libs/tk/ytk/ytk/gtk/gtkcellrenderertoggle.h
+++ b/libs/tk/ytk/ytk/gtkcellrenderertoggle.h
@@ -21,10 +21,10 @@
 #define __GTK_CELL_RENDERER_TOGGLE_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcellrenderer.h>
+#include <ytk/gtkcellrenderer.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkcellview.h b/libs/tk/ytk/ytk/gtkcellview.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkcellview.h
rename to libs/tk/ytk/ytk/gtkcellview.h
index 1835c7a1c6..65ace53843 100644
--- a/libs/tk/ytk/ytk/gtk/gtkcellview.h
+++ b/libs/tk/ytk/ytk/gtkcellview.h
@@ -21,12 +21,12 @@
 #define __GTK_CELL_VIEW_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtktreemodel.h>
+#include <ytk/gtkwidget.h>
+#include <ytk/gtkcellrenderer.h>
+#include <ytk/gtktreemodel.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkcheckbutton.h b/libs/tk/ytk/ytk/gtkcheckbutton.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkcheckbutton.h
rename to libs/tk/ytk/ytk/gtkcheckbutton.h
index 8b1a9aa0d2..a942b661cd 100644
--- a/libs/tk/ytk/ytk/gtk/gtkcheckbutton.h
+++ b/libs/tk/ytk/ytk/gtkcheckbutton.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtktogglebutton.h>
+#include <ytk/gtktogglebutton.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkcheckmenuitem.h b/libs/tk/ytk/ytk/gtkcheckmenuitem.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkcheckmenuitem.h
rename to libs/tk/ytk/ytk/gtkcheckmenuitem.h
index 5e0ecba8a3..bf3f6fb0dc 100644
--- a/libs/tk/ytk/ytk/gtk/gtkcheckmenuitem.h
+++ b/libs/tk/ytk/ytk/gtkcheckmenuitem.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkmenuitem.h>
+#include <ytk/gtkmenuitem.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkclipboard.h b/libs/tk/ytk/ytk/gtkclipboard.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkclipboard.h
rename to libs/tk/ytk/ytk/gtkclipboard.h
index bead067f31..dc9110ed62 100644
--- a/libs/tk/ytk/ytk/gtk/gtkclipboard.h
+++ b/libs/tk/ytk/ytk/gtkclipboard.h
@@ -23,10 +23,10 @@
 #define __GTK_CLIPBOARD_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkselection.h>
+#include <ytk/gtkselection.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkcolorbutton.h b/libs/tk/ytk/ytk/gtkcolorbutton.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkcolorbutton.h
rename to libs/tk/ytk/ytk/gtkcolorbutton.h
index c16220734a..184a020fa0 100644
--- a/libs/tk/ytk/ytk/gtk/gtkcolorbutton.h
+++ b/libs/tk/ytk/ytk/gtkcolorbutton.h
@@ -34,10 +34,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkbutton.h>
+#include <ytk/gtkbutton.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkcolorsel.h b/libs/tk/ytk/ytk/gtkcolorsel.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkcolorsel.h
rename to libs/tk/ytk/ytk/gtkcolorsel.h
index 4d71f19f60..b8d3d1ea54 100644
--- a/libs/tk/ytk/ytk/gtk/gtkcolorsel.h
+++ b/libs/tk/ytk/ytk/gtkcolorsel.h
@@ -29,11 +29,11 @@
 #define __GTK_COLOR_SELECTION_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkvbox.h>
+#include <ytk/gtkdialog.h>
+#include <ytk/gtkvbox.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkcolorseldialog.h b/libs/tk/ytk/ytk/gtkcolorseldialog.h
similarity index 95%
rename from libs/tk/ytk/ytk/gtk/gtkcolorseldialog.h
rename to libs/tk/ytk/ytk/gtkcolorseldialog.h
index 9cc70b897f..b2abca7248 100644
--- a/libs/tk/ytk/ytk/gtk/gtkcolorseldialog.h
+++ b/libs/tk/ytk/ytk/gtkcolorseldialog.h
@@ -28,12 +28,12 @@
 #define __GTK_COLOR_SELECTION_DIALOG_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkcolorsel.h>
-#include <gtk/gtkvbox.h>
+#include <ytk/gtkdialog.h>
+#include <ytk/gtkcolorsel.h>
+#include <ytk/gtkvbox.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkcombobox.h b/libs/tk/ytk/ytk/gtkcombobox.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkcombobox.h
rename to libs/tk/ytk/ytk/gtkcombobox.h
index 56dd9e6dee..c772e81731 100644
--- a/libs/tk/ytk/ytk/gtk/gtkcombobox.h
+++ b/libs/tk/ytk/ytk/gtkcombobox.h
@@ -21,12 +21,12 @@
 #define __GTK_COMBO_BOX_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkbin.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeview.h>
+#include <ytk/gtkbin.h>
+#include <ytk/gtktreemodel.h>
+#include <ytk/gtktreeview.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkcomboboxentry.h b/libs/tk/ytk/ytk/gtkcomboboxentry.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkcomboboxentry.h
rename to libs/tk/ytk/ytk/gtkcomboboxentry.h
index c4099445d4..d079f7db54 100644
--- a/libs/tk/ytk/ytk/gtk/gtkcomboboxentry.h
+++ b/libs/tk/ytk/ytk/gtkcomboboxentry.h
@@ -21,11 +21,11 @@
 #define __GTK_COMBO_BOX_ENTRY_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtktreemodel.h>
+#include <ytk/gtkcombobox.h>
+#include <ytk/gtktreemodel.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkcomboboxtext.h b/libs/tk/ytk/ytk/gtkcomboboxtext.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkcomboboxtext.h
rename to libs/tk/ytk/ytk/gtkcomboboxtext.h
index 4158a2b73b..e23d6cbce2 100644
--- a/libs/tk/ytk/ytk/gtk/gtkcomboboxtext.h
+++ b/libs/tk/ytk/ytk/gtkcomboboxtext.h
@@ -20,10 +20,10 @@
 #define __GTK_COMBO_BOX_TEXT_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcombobox.h>
+#include <ytk/gtkcombobox.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkcontainer.h b/libs/tk/ytk/ytk/gtkcontainer.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkcontainer.h
rename to libs/tk/ytk/ytk/gtkcontainer.h
index ac169c249c..9180e87e87 100644
--- a/libs/tk/ytk/ytk/gtk/gtkcontainer.h
+++ b/libs/tk/ytk/ytk/gtkcontainer.h
@@ -29,11 +29,11 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkadjustment.h>
+#include <ytk/gtkwidget.h>
+#include <ytk/gtkadjustment.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkdebug.h b/libs/tk/ytk/ytk/gtkdebug.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkdebug.h
rename to libs/tk/ytk/ytk/gtkdebug.h
index 623750301d..e718b5e22e 100644
--- a/libs/tk/ytk/ytk/gtk/gtkdebug.h
+++ b/libs/tk/ytk/ytk/gtkdebug.h
@@ -28,7 +28,7 @@
 #define __GTK_DEBUG_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <glib.h>
diff --git a/libs/tk/ytk/ytk/gtk/gtkdialog.h b/libs/tk/ytk/ytk/gtkdialog.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkdialog.h
rename to libs/tk/ytk/ytk/gtkdialog.h
index 389c52473b..e25195ffb2 100644
--- a/libs/tk/ytk/ytk/gtk/gtkdialog.h
+++ b/libs/tk/ytk/ytk/gtkdialog.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkwindow.h>
+#include <ytk/gtkwindow.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkdnd.h b/libs/tk/ytk/ytk/gtkdnd.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkdnd.h
rename to libs/tk/ytk/ytk/gtkdnd.h
index 400ed52502..612df265cd 100644
--- a/libs/tk/ytk/ytk/gtk/gtkdnd.h
+++ b/libs/tk/ytk/ytk/gtkdnd.h
@@ -30,11 +30,11 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkselection.h>
+#include <ytk/gtkwidget.h>
+#include <ytk/gtkselection.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkdndcursors.h b/libs/tk/ytk/ytk/gtkdndcursors.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtkdndcursors.h
rename to libs/tk/ytk/ytk/gtkdndcursors.h
diff --git a/libs/tk/ytk/ytk/gtk/gtkdrawingarea.h b/libs/tk/ytk/ytk/gtkdrawingarea.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkdrawingarea.h
rename to libs/tk/ytk/ytk/gtkdrawingarea.h
index e667c65df4..fad9c08318 100644
--- a/libs/tk/ytk/ytk/gtk/gtkdrawingarea.h
+++ b/libs/tk/ytk/ytk/gtkdrawingarea.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkwidget.h>
+#include <ytk/gtkwidget.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkeditable.h b/libs/tk/ytk/ytk/gtkeditable.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkeditable.h
rename to libs/tk/ytk/ytk/gtkeditable.h
index 1f5ed3f8e8..3d915576d8 100644
--- a/libs/tk/ytk/ytk/gtk/gtkeditable.h
+++ b/libs/tk/ytk/ytk/gtkeditable.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkwidget.h>
+#include <ytk/gtkwidget.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkentry.h b/libs/tk/ytk/ytk/gtkentry.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkentry.h
rename to libs/tk/ytk/ytk/gtkentry.h
index f771e1774b..c8308498dc 100644
--- a/libs/tk/ytk/ytk/gtk/gtkentry.h
+++ b/libs/tk/ytk/ytk/gtkentry.h
@@ -33,16 +33,16 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkeditable.h>
-#include <gtk/gtkimcontext.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkentrybuffer.h>
-#include <gtk/gtkentrycompletion.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkselection.h>
+#include <ytk/gtkeditable.h>
+#include <ytk/gtkimcontext.h>
+#include <ytk/gtkmenu.h>
+#include <ytk/gtkentrybuffer.h>
+#include <ytk/gtkentrycompletion.h>
+#include <ytk/gtkimage.h>
+#include <ytk/gtkselection.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkentrybuffer.h b/libs/tk/ytk/ytk/gtkentrybuffer.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtkentrybuffer.h
rename to libs/tk/ytk/ytk/gtkentrybuffer.h
index 5f78b80181..6be37f819b 100644
--- a/libs/tk/ytk/ytk/gtk/gtkentrybuffer.h
+++ b/libs/tk/ytk/ytk/gtkentrybuffer.h
@@ -21,7 +21,7 @@
 #define __GTK_ENTRY_BUFFER_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <glib-object.h>
diff --git a/libs/tk/ytk/ytk/gtk/gtkentrycompletion.h b/libs/tk/ytk/ytk/gtkentrycompletion.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkentrycompletion.h
rename to libs/tk/ytk/ytk/gtkentrycompletion.h
index 7a99f787cb..a7412d9f79 100644
--- a/libs/tk/ytk/ytk/gtk/gtkentrycompletion.h
+++ b/libs/tk/ytk/ytk/gtkentrycompletion.h
@@ -21,13 +21,13 @@
 #define __GTK_ENTRY_COMPLETION_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtktreeviewcolumn.h>
-#include <gtk/gtktreemodelfilter.h>
+#include <ytk/gtktreemodel.h>
+#include <ytk/gtkliststore.h>
+#include <ytk/gtktreeviewcolumn.h>
+#include <ytk/gtktreemodelfilter.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkentryprivate.h b/libs/tk/ytk/ytk/gtkentryprivate.h
similarity index 93%
rename from libs/tk/ytk/ytk/gtk/gtkentryprivate.h
rename to libs/tk/ytk/ytk/gtkentryprivate.h
index bdb41cbfa9..085d5aeeb4 100644
--- a/libs/tk/ytk/ytk/gtk/gtkentryprivate.h
+++ b/libs/tk/ytk/ytk/gtkentryprivate.h
@@ -20,11 +20,11 @@
 #ifndef __GTK_ENTRY_PRIVATE_H__
 #define __GTK_ENTRY_PRIVATE_H__
 
-#include <gtk/gtktreeviewcolumn.h>
-#include <gtk/gtktreemodelfilter.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkentrycompletion.h>
-#include <gtk/gtkentry.h>
+#include <ytk/gtktreeviewcolumn.h>
+#include <ytk/gtktreemodelfilter.h>
+#include <ytk/gtkliststore.h>
+#include <ytk/gtkentrycompletion.h>
+#include <ytk/gtkentry.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkenums.h b/libs/tk/ytk/ytk/gtkenums.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtkenums.h
rename to libs/tk/ytk/ytk/gtkenums.h
index 5860021832..6b861bc12a 100644
--- a/libs/tk/ytk/ytk/gtk/gtkenums.h
+++ b/libs/tk/ytk/ytk/gtkenums.h
@@ -28,7 +28,7 @@
 #define __GTK_ENUMS_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <glib-object.h>
diff --git a/libs/tk/ytk/ytk/gtk/gtkeventbox.h b/libs/tk/ytk/ytk/gtkeventbox.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkeventbox.h
rename to libs/tk/ytk/ytk/gtkeventbox.h
index 15675cb37f..63920c2eda 100644
--- a/libs/tk/ytk/ytk/gtk/gtkeventbox.h
+++ b/libs/tk/ytk/ytk/gtkeventbox.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkbin.h>
+#include <ytk/gtkbin.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkexpander.h b/libs/tk/ytk/ytk/gtkexpander.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkexpander.h
rename to libs/tk/ytk/ytk/gtkexpander.h
index 0cfa0e12aa..f716f9d5eb 100644
--- a/libs/tk/ytk/ytk/gtk/gtkexpander.h
+++ b/libs/tk/ytk/ytk/gtkexpander.h
@@ -25,10 +25,10 @@
 #define __GTK_EXPANDER_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkbin.h>
+#include <ytk/gtkbin.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkfilechooser.h b/libs/tk/ytk/ytk/gtkfilechooser.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtkfilechooser.h
rename to libs/tk/ytk/ytk/gtkfilechooser.h
index 7680daa532..162f166f5f 100644
--- a/libs/tk/ytk/ytk/gtk/gtkfilechooser.h
+++ b/libs/tk/ytk/ytk/gtkfilechooser.h
@@ -22,11 +22,11 @@
 #define __GTK_FILE_CHOOSER_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkfilefilter.h>
-#include <gtk/gtkwidget.h>
+#include <ytk/gtkfilefilter.h>
+#include <ytk/gtkwidget.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkfilechooserbutton.h b/libs/tk/ytk/ytk/gtkfilechooserbutton.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkfilechooserbutton.h
rename to libs/tk/ytk/ytk/gtkfilechooserbutton.h
index fdacc4b6ec..7a10f64164 100644
--- a/libs/tk/ytk/ytk/gtk/gtkfilechooserbutton.h
+++ b/libs/tk/ytk/ytk/gtkfilechooserbutton.h
@@ -22,11 +22,11 @@
 #define __GTK_FILE_CHOOSER_BUTTON_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkfilechooser.h>
+#include <ytk/gtkhbox.h>
+#include <ytk/gtkfilechooser.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkfilechooserdefault.h b/libs/tk/ytk/ytk/gtkfilechooserdefault.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkfilechooserdefault.h
rename to libs/tk/ytk/ytk/gtkfilechooserdefault.h
index e6eabefefc..60c1a6ea41 100644
--- a/libs/tk/ytk/ytk/gtk/gtkfilechooserdefault.h
+++ b/libs/tk/ytk/ytk/gtkfilechooserdefault.h
@@ -22,7 +22,7 @@
 #define __GTK_FILE_CHOOSER_DEFAULT_H__
 
 #include "gtkfilesystem.h"
-#include <gtk/gtkwidget.h>
+#include <ytk/gtkwidget.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkfilechooserdialog.h b/libs/tk/ytk/ytk/gtkfilechooserdialog.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkfilechooserdialog.h
rename to libs/tk/ytk/ytk/gtkfilechooserdialog.h
index 78c02d2a40..ced4e487ec 100644
--- a/libs/tk/ytk/ytk/gtk/gtkfilechooserdialog.h
+++ b/libs/tk/ytk/ytk/gtkfilechooserdialog.h
@@ -22,11 +22,11 @@
 #define __GTK_FILE_CHOOSER_DIALOG_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkfilechooser.h>
+#include <ytk/gtkdialog.h>
+#include <ytk/gtkfilechooser.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkfilechooserembed.h b/libs/tk/ytk/ytk/gtkfilechooserembed.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtkfilechooserembed.h
rename to libs/tk/ytk/ytk/gtkfilechooserembed.h
index 65888981e2..63473c1f9f 100644
--- a/libs/tk/ytk/ytk/gtk/gtkfilechooserembed.h
+++ b/libs/tk/ytk/ytk/gtkfilechooserembed.h
@@ -21,7 +21,7 @@
 #ifndef __GTK_FILE_CHOOSER_EMBED_H__
 #define __GTK_FILE_CHOOSER_EMBED_H__
 
-#include <gtk/gtkwidget.h>
+#include <ytk/gtkwidget.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkfilechooserentry.h b/libs/tk/ytk/ytk/gtkfilechooserentry.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtkfilechooserentry.h
rename to libs/tk/ytk/ytk/gtkfilechooserentry.h
diff --git a/libs/tk/ytk/ytk/gtk/gtkfilechooserprivate.h b/libs/tk/ytk/ytk/gtkfilechooserprivate.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtkfilechooserprivate.h
rename to libs/tk/ytk/ytk/gtkfilechooserprivate.h
diff --git a/libs/tk/ytk/ytk/gtk/gtkfilechoosersettings.h b/libs/tk/ytk/ytk/gtkfilechoosersettings.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtkfilechoosersettings.h
rename to libs/tk/ytk/ytk/gtkfilechoosersettings.h
diff --git a/libs/tk/ytk/ytk/gtk/gtkfilechooserutils.h b/libs/tk/ytk/ytk/gtkfilechooserutils.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtkfilechooserutils.h
rename to libs/tk/ytk/ytk/gtkfilechooserutils.h
diff --git a/libs/tk/ytk/ytk/gtk/gtkfilechooserwidget.h b/libs/tk/ytk/ytk/gtkfilechooserwidget.h
similarity index 95%
rename from libs/tk/ytk/ytk/gtk/gtkfilechooserwidget.h
rename to libs/tk/ytk/ytk/gtkfilechooserwidget.h
index 4d3fa3bcbc..a046a4b0bb 100644
--- a/libs/tk/ytk/ytk/gtk/gtkfilechooserwidget.h
+++ b/libs/tk/ytk/ytk/gtkfilechooserwidget.h
@@ -22,11 +22,11 @@
 #define __GTK_FILE_CHOOSER_WIDGET_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkfilechooser.h>
-#include <gtk/gtkvbox.h>
+#include <ytk/gtkfilechooser.h>
+#include <ytk/gtkvbox.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkfilefilter.h b/libs/tk/ytk/ytk/gtkfilefilter.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkfilefilter.h
rename to libs/tk/ytk/ytk/gtkfilefilter.h
index 491143d4b9..8a342f811e 100644
--- a/libs/tk/ytk/ytk/gtk/gtkfilefilter.h
+++ b/libs/tk/ytk/ytk/gtkfilefilter.h
@@ -22,7 +22,7 @@
 #define __GTK_FILE_FILTER_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <glib-object.h>
diff --git a/libs/tk/ytk/ytk/gtk/gtkfilesystem.h b/libs/tk/ytk/ytk/gtkfilesystem.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtkfilesystem.h
rename to libs/tk/ytk/ytk/gtkfilesystem.h
index 7fc539ec18..04e1ecaf55 100644
--- a/libs/tk/ytk/ytk/gtk/gtkfilesystem.h
+++ b/libs/tk/ytk/ytk/gtkfilesystem.h
@@ -22,7 +22,7 @@
 #define __GTK_FILE_SYSTEM_H__
 
 #include <gio/gio.h>
-#include <gtk/gtkwidget.h>	/* For icon handling */
+#include <ytk/gtkwidget.h>	/* For icon handling */
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkfilesystemmodel.h b/libs/tk/ytk/ytk/gtkfilesystemmodel.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkfilesystemmodel.h
rename to libs/tk/ytk/ytk/gtkfilesystemmodel.h
index 46743f124f..213d2594bd 100644
--- a/libs/tk/ytk/ytk/gtk/gtkfilesystemmodel.h
+++ b/libs/tk/ytk/ytk/gtkfilesystemmodel.h
@@ -22,8 +22,8 @@
 #define __GTK_FILE_SYSTEM_MODEL_H__
 
 #include <gio/gio.h>
-#include <gtk/gtkfilefilter.h>
-#include <gtk/gtktreemodel.h>
+#include <ytk/gtkfilefilter.h>
+#include <ytk/gtktreemodel.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkfixed.h b/libs/tk/ytk/ytk/gtkfixed.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkfixed.h
rename to libs/tk/ytk/ytk/gtkfixed.h
index 14aad5d026..23885ca805 100644
--- a/libs/tk/ytk/ytk/gtk/gtkfixed.h
+++ b/libs/tk/ytk/ytk/gtkfixed.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcontainer.h>
+#include <ytk/gtkcontainer.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkfontbutton.h b/libs/tk/ytk/ytk/gtkfontbutton.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkfontbutton.h
rename to libs/tk/ytk/ytk/gtkfontbutton.h
index e5d97431f4..605ad333ff 100644
--- a/libs/tk/ytk/ytk/gtk/gtkfontbutton.h
+++ b/libs/tk/ytk/ytk/gtkfontbutton.h
@@ -28,10 +28,10 @@
 #define __GTK_FONT_BUTTON_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkbutton.h>
+#include <ytk/gtkbutton.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkfontsel.h b/libs/tk/ytk/ytk/gtkfontsel.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkfontsel.h
rename to libs/tk/ytk/ytk/gtkfontsel.h
index 5aa86483bb..f5af9d098c 100644
--- a/libs/tk/ytk/ytk/gtk/gtkfontsel.h
+++ b/libs/tk/ytk/ytk/gtkfontsel.h
@@ -33,11 +33,11 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkvbox.h>
+#include <ytk/gtkdialog.h>
+#include <ytk/gtkvbox.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkframe.h b/libs/tk/ytk/ytk/gtkframe.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkframe.h
rename to libs/tk/ytk/ytk/gtkframe.h
index 7164f67364..59868a509a 100644
--- a/libs/tk/ytk/ytk/gtk/gtkframe.h
+++ b/libs/tk/ytk/ytk/gtkframe.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkbin.h>
+#include <ytk/gtkbin.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkgc.h b/libs/tk/ytk/ytk/gtkgc.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkgc.h
rename to libs/tk/ytk/ytk/gtkgc.h
index 82cdc5351a..68e6ea2e96 100644
--- a/libs/tk/ytk/ytk/gtk/gtkgc.h
+++ b/libs/tk/ytk/ytk/gtkgc.h
@@ -29,7 +29,7 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <ydk/gdk.h>
diff --git a/libs/tk/ytk/ytk/gtk/gtkhandlebox.h b/libs/tk/ytk/ytk/gtkhandlebox.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkhandlebox.h
rename to libs/tk/ytk/ytk/gtkhandlebox.h
index 2dd96b286d..aa2ea13379 100644
--- a/libs/tk/ytk/ytk/gtk/gtkhandlebox.h
+++ b/libs/tk/ytk/ytk/gtkhandlebox.h
@@ -34,10 +34,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkbin.h>
+#include <ytk/gtkbin.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkhbbox.h b/libs/tk/ytk/ytk/gtkhbbox.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkhbbox.h
rename to libs/tk/ytk/ytk/gtkhbbox.h
index bbd05bcac5..893bd9c7e7 100644
--- a/libs/tk/ytk/ytk/gtk/gtkhbbox.h
+++ b/libs/tk/ytk/ytk/gtkhbbox.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkbbox.h>
+#include <ytk/gtkbbox.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkhbox.h b/libs/tk/ytk/ytk/gtkhbox.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkhbox.h
rename to libs/tk/ytk/ytk/gtkhbox.h
index e547aa3592..ecf7c5cd81 100644
--- a/libs/tk/ytk/ytk/gtk/gtkhbox.h
+++ b/libs/tk/ytk/ytk/gtkhbox.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkbox.h>
+#include <ytk/gtkbox.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkhpaned.h b/libs/tk/ytk/ytk/gtkhpaned.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkhpaned.h
rename to libs/tk/ytk/ytk/gtkhpaned.h
index 2f10427b21..550ed67484 100644
--- a/libs/tk/ytk/ytk/gtk/gtkhpaned.h
+++ b/libs/tk/ytk/ytk/gtkhpaned.h
@@ -28,10 +28,10 @@
 #define __GTK_HPANED_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkpaned.h>
+#include <ytk/gtkpaned.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkhruler.h b/libs/tk/ytk/ytk/gtkhruler.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkhruler.h
rename to libs/tk/ytk/ytk/gtkhruler.h
index c0e2118b76..29f6983023 100644
--- a/libs/tk/ytk/ytk/gtk/gtkhruler.h
+++ b/libs/tk/ytk/ytk/gtkhruler.h
@@ -35,7 +35,7 @@
  */
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #ifndef GTK_DISABLE_DEPRECATED
@@ -44,7 +44,7 @@
 #define __GTK_HRULER_H__
 
 
-#include <gtk/gtkruler.h>
+#include <ytk/gtkruler.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkhscale.h b/libs/tk/ytk/ytk/gtkhscale.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkhscale.h
rename to libs/tk/ytk/ytk/gtkhscale.h
index a90fd45176..e33b8e9d7d 100644
--- a/libs/tk/ytk/ytk/gtk/gtkhscale.h
+++ b/libs/tk/ytk/ytk/gtkhscale.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkscale.h>
+#include <ytk/gtkscale.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkhscrollbar.h b/libs/tk/ytk/ytk/gtkhscrollbar.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkhscrollbar.h
rename to libs/tk/ytk/ytk/gtkhscrollbar.h
index e12941ad5b..180a87813e 100644
--- a/libs/tk/ytk/ytk/gtk/gtkhscrollbar.h
+++ b/libs/tk/ytk/ytk/gtkhscrollbar.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkscrollbar.h>
+#include <ytk/gtkscrollbar.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkhseparator.h b/libs/tk/ytk/ytk/gtkhseparator.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkhseparator.h
rename to libs/tk/ytk/ytk/gtkhseparator.h
index 464f6bcd10..cccf5d8837 100644
--- a/libs/tk/ytk/ytk/gtk/gtkhseparator.h
+++ b/libs/tk/ytk/ytk/gtkhseparator.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkseparator.h>
+#include <ytk/gtkseparator.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkhsv.h b/libs/tk/ytk/ytk/gtkhsv.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkhsv.h
rename to libs/tk/ytk/ytk/gtkhsv.h
index c352b9922c..74498e76ea 100644
--- a/libs/tk/ytk/ytk/gtk/gtkhsv.h
+++ b/libs/tk/ytk/ytk/gtkhsv.h
@@ -33,10 +33,10 @@
 #define __GTK_HSV_H__
 
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkwidget.h>
+#include <ytk/gtkwidget.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkiconcache.h b/libs/tk/ytk/ytk/gtkiconcache.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtkiconcache.h
rename to libs/tk/ytk/ytk/gtkiconcache.h
diff --git a/libs/tk/ytk/ytk/gtk/gtkiconcachevalidator.h b/libs/tk/ytk/ytk/gtkiconcachevalidator.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtkiconcachevalidator.h
rename to libs/tk/ytk/ytk/gtkiconcachevalidator.h
diff --git a/libs/tk/ytk/ytk/gtk/gtkiconfactory.h b/libs/tk/ytk/ytk/gtkiconfactory.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtkiconfactory.h
rename to libs/tk/ytk/ytk/gtkiconfactory.h
index 0a0b39a271..a5376ec278 100644
--- a/libs/tk/ytk/ytk/gtk/gtkiconfactory.h
+++ b/libs/tk/ytk/ytk/gtkiconfactory.h
@@ -28,11 +28,11 @@
 #define __GTK_ICON_FACTORY_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <ydk/gdk.h>
-#include <gtk/gtkrc.h>
+#include <ytk/gtkrc.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkicontheme.h b/libs/tk/ytk/ytk/gtkicontheme.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtkicontheme.h
rename to libs/tk/ytk/ytk/gtkicontheme.h
index e25b62a09d..32c2b025d5 100644
--- a/libs/tk/ytk/ytk/gtk/gtkicontheme.h
+++ b/libs/tk/ytk/ytk/gtkicontheme.h
@@ -21,7 +21,7 @@
 #define __GTK_ICON_THEME_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/libs/tk/ytk/ytk/gtk/gtkiconview.h b/libs/tk/ytk/ytk/gtkiconview.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkiconview.h
rename to libs/tk/ytk/ytk/gtkiconview.h
index e19401c4ba..2e87b6260c 100644
--- a/libs/tk/ytk/ytk/gtk/gtkiconview.h
+++ b/libs/tk/ytk/ytk/gtkiconview.h
@@ -21,14 +21,14 @@
 #define __GTK_ICON_VIEW_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtkselection.h>
-#include <gtk/gtktooltip.h>
+#include <ytk/gtkcontainer.h>
+#include <ytk/gtktreemodel.h>
+#include <ytk/gtkcellrenderer.h>
+#include <ytk/gtkselection.h>
+#include <ytk/gtktooltip.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkimage.h b/libs/tk/ytk/ytk/gtkimage.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtkimage.h
rename to libs/tk/ytk/ytk/gtkimage.h
index 167ea90235..6fde34bed8 100644
--- a/libs/tk/ytk/ytk/gtk/gtkimage.h
+++ b/libs/tk/ytk/ytk/gtkimage.h
@@ -29,11 +29,11 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <gio/gio.h>
-#include <gtk/gtkmisc.h>
+#include <ytk/gtkmisc.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkimagemenuitem.h b/libs/tk/ytk/ytk/gtkimagemenuitem.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkimagemenuitem.h
rename to libs/tk/ytk/ytk/gtkimagemenuitem.h
index 7aef6181ef..124c3a497c 100644
--- a/libs/tk/ytk/ytk/gtk/gtkimagemenuitem.h
+++ b/libs/tk/ytk/ytk/gtkimagemenuitem.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkmenuitem.h>
+#include <ytk/gtkmenuitem.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkimcontext.h b/libs/tk/ytk/ytk/gtkimcontext.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkimcontext.h
rename to libs/tk/ytk/ytk/gtkimcontext.h
index 168c8fc164..164a5fb8b4 100644
--- a/libs/tk/ytk/ytk/gtk/gtkimcontext.h
+++ b/libs/tk/ytk/ytk/gtkimcontext.h
@@ -22,11 +22,11 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <ydk/gdk.h>
-#include <gtk/gtkobject.h>
+#include <ytk/gtkobject.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkimcontextsimple.h b/libs/tk/ytk/ytk/gtkimcontextsimple.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkimcontextsimple.h
rename to libs/tk/ytk/ytk/gtkimcontextsimple.h
index a8db87646f..b864576cdb 100644
--- a/libs/tk/ytk/ytk/gtk/gtkimcontextsimple.h
+++ b/libs/tk/ytk/ytk/gtkimcontextsimple.h
@@ -21,10 +21,10 @@
 #define __GTK_IM_CONTEXT_SIMPLE_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkimcontext.h>
+#include <ytk/gtkimcontext.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkimcontextsimpleseqs.h b/libs/tk/ytk/ytk/gtkimcontextsimpleseqs.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtkimcontextsimpleseqs.h
rename to libs/tk/ytk/ytk/gtkimcontextsimpleseqs.h
diff --git a/libs/tk/ytk/ytk/gtk/gtkimmodule.h b/libs/tk/ytk/ytk/gtkimmodule.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkimmodule.h
rename to libs/tk/ytk/ytk/gtkimmodule.h
index 794b36fcfc..e2482bcd01 100644
--- a/libs/tk/ytk/ytk/gtk/gtkimmodule.h
+++ b/libs/tk/ytk/ytk/gtkimmodule.h
@@ -20,7 +20,7 @@
 #ifndef __GTK_IM_MODULE_H__
 #define __GTK_IM_MODULE_H__
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkimmulticontext.h b/libs/tk/ytk/ytk/gtkimmulticontext.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkimmulticontext.h
rename to libs/tk/ytk/ytk/gtkimmulticontext.h
index e24f6ce80e..d00c1849b9 100644
--- a/libs/tk/ytk/ytk/gtk/gtkimmulticontext.h
+++ b/libs/tk/ytk/ytk/gtkimmulticontext.h
@@ -21,11 +21,11 @@
 #define __GTK_IM_MULTICONTEXT_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkimcontext.h>
-#include <gtk/gtkmenushell.h>
+#include <ytk/gtkimcontext.h>
+#include <ytk/gtkmenushell.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkinfobar.h b/libs/tk/ytk/ytk/gtkinfobar.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkinfobar.h
rename to libs/tk/ytk/ytk/gtkinfobar.h
index becbc33372..01c51bfae8 100644
--- a/libs/tk/ytk/ytk/gtk/gtkinfobar.h
+++ b/libs/tk/ytk/ytk/gtkinfobar.h
@@ -32,11 +32,11 @@
 #define __GTK_INFO_BAR_H__
 
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkenums.h>
+#include <ytk/gtkhbox.h>
+#include <ytk/gtkenums.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkintl.h b/libs/tk/ytk/ytk/gtkintl.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtkintl.h
rename to libs/tk/ytk/ytk/gtkintl.h
diff --git a/libs/tk/ytk/ytk/gtk/gtkinvisible.h b/libs/tk/ytk/ytk/gtkinvisible.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkinvisible.h
rename to libs/tk/ytk/ytk/gtkinvisible.h
index 6cc193d60d..6e192838c1 100644
--- a/libs/tk/ytk/ytk/gtk/gtkinvisible.h
+++ b/libs/tk/ytk/ytk/gtkinvisible.h
@@ -28,10 +28,10 @@
 #define __GTK_INVISIBLE_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkwidget.h>
+#include <ytk/gtkwidget.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkitem.h b/libs/tk/ytk/ytk/gtkitem.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkitem.h
rename to libs/tk/ytk/ytk/gtkitem.h
index 486aa1f26c..849cbc6eb3 100644
--- a/libs/tk/ytk/ytk/gtk/gtkitem.h
+++ b/libs/tk/ytk/ytk/gtkitem.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkbin.h>
+#include <ytk/gtkbin.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkkeyhash.h b/libs/tk/ytk/ytk/gtkkeyhash.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtkkeyhash.h
rename to libs/tk/ytk/ytk/gtkkeyhash.h
diff --git a/libs/tk/ytk/ytk/gtk/gtklabel.h b/libs/tk/ytk/ytk/gtklabel.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtklabel.h
rename to libs/tk/ytk/ytk/gtklabel.h
index 015108e632..44f3eda3b2 100644
--- a/libs/tk/ytk/ytk/gtk/gtklabel.h
+++ b/libs/tk/ytk/ytk/gtklabel.h
@@ -28,12 +28,12 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkmisc.h>
-#include <gtk/gtkwindow.h>
-#include <gtk/gtkmenu.h>
+#include <ytk/gtkmisc.h>
+#include <ytk/gtkwindow.h>
+#include <ytk/gtkmenu.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtklayout.h b/libs/tk/ytk/ytk/gtklayout.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtklayout.h
rename to libs/tk/ytk/ytk/gtklayout.h
index c1e404bb1d..521ce1e859 100644
--- a/libs/tk/ytk/ytk/gtk/gtklayout.h
+++ b/libs/tk/ytk/ytk/gtklayout.h
@@ -33,11 +33,11 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkadjustment.h>
+#include <ytk/gtkcontainer.h>
+#include <ytk/gtkadjustment.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtklinkbutton.h b/libs/tk/ytk/ytk/gtklinkbutton.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtklinkbutton.h
rename to libs/tk/ytk/ytk/gtklinkbutton.h
index 9a2e7a5c68..1580b6d095 100644
--- a/libs/tk/ytk/ytk/gtk/gtklinkbutton.h
+++ b/libs/tk/ytk/ytk/gtklinkbutton.h
@@ -26,10 +26,10 @@
 #define __GTK_LINK_BUTTON_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkbutton.h>
+#include <ytk/gtkbutton.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkliststore.h b/libs/tk/ytk/ytk/gtkliststore.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkliststore.h
rename to libs/tk/ytk/ytk/gtkliststore.h
index 89514016b8..f8b78df1ce 100644
--- a/libs/tk/ytk/ytk/gtk/gtkliststore.h
+++ b/libs/tk/ytk/ytk/gtkliststore.h
@@ -21,12 +21,12 @@
 #define __GTK_LIST_STORE_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <gdkconfig.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreesortable.h>
+#include <ytk/gtktreemodel.h>
+#include <ytk/gtktreesortable.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkmain.h b/libs/tk/ytk/ytk/gtkmain.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkmain.h
rename to libs/tk/ytk/ytk/gtkmain.h
index 48bd9bf7d9..fe6e1d1a0b 100644
--- a/libs/tk/ytk/ytk/gtk/gtkmain.h
+++ b/libs/tk/ytk/ytk/gtkmain.h
@@ -29,14 +29,14 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <ydk/gdk.h>
-#include <gtk/gtkwidget.h>
+#include <ytk/gtkwidget.h>
 #ifdef G_PLATFORM_WIN32
-#include <gtk/gtkbox.h>
-#include <gtk/gtkwindow.h>
+#include <ytk/gtkbox.h>
+#include <ytk/gtkwindow.h>
 #endif
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkmarshal.h b/libs/tk/ytk/ytk/gtkmarshal.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtkmarshal.h
rename to libs/tk/ytk/ytk/gtkmarshal.h
diff --git a/libs/tk/ytk/ytk/gtk/gtkmarshalers.h b/libs/tk/ytk/ytk/gtkmarshalers.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtkmarshalers.h
rename to libs/tk/ytk/ytk/gtkmarshalers.h
diff --git a/libs/tk/ytk/ytk/gtk/gtkmenu.h b/libs/tk/ytk/ytk/gtkmenu.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkmenu.h
rename to libs/tk/ytk/ytk/gtkmenu.h
index 60174e154e..e94b5444fe 100644
--- a/libs/tk/ytk/ytk/gtk/gtkmenu.h
+++ b/libs/tk/ytk/ytk/gtkmenu.h
@@ -29,11 +29,11 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkaccelgroup.h>
-#include <gtk/gtkmenushell.h>
+#include <ytk/gtkaccelgroup.h>
+#include <ytk/gtkmenushell.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkmenubar.h b/libs/tk/ytk/ytk/gtkmenubar.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkmenubar.h
rename to libs/tk/ytk/ytk/gtkmenubar.h
index 95479010a6..af9b4453e1 100644
--- a/libs/tk/ytk/ytk/gtk/gtkmenubar.h
+++ b/libs/tk/ytk/ytk/gtkmenubar.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkmenushell.h>
+#include <ytk/gtkmenushell.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkmenuitem.h b/libs/tk/ytk/ytk/gtkmenuitem.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkmenuitem.h
rename to libs/tk/ytk/ytk/gtkmenuitem.h
index 5de985d19f..16d45a4889 100644
--- a/libs/tk/ytk/ytk/gtk/gtkmenuitem.h
+++ b/libs/tk/ytk/ytk/gtkmenuitem.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkitem.h>
+#include <ytk/gtkitem.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkmenushell.h b/libs/tk/ytk/ytk/gtkmenushell.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkmenushell.h
rename to libs/tk/ytk/ytk/gtkmenushell.h
index 2d90c3388f..00d1a71941 100644
--- a/libs/tk/ytk/ytk/gtk/gtkmenushell.h
+++ b/libs/tk/ytk/ytk/gtkmenushell.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcontainer.h>
+#include <ytk/gtkcontainer.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkmenutoolbutton.h b/libs/tk/ytk/ytk/gtkmenutoolbutton.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkmenutoolbutton.h
rename to libs/tk/ytk/ytk/gtkmenutoolbutton.h
index 43ff845254..b3eec19990 100644
--- a/libs/tk/ytk/ytk/gtk/gtkmenutoolbutton.h
+++ b/libs/tk/ytk/ytk/gtkmenutoolbutton.h
@@ -23,11 +23,11 @@
 #define __GTK_MENU_TOOL_BUTTON_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkmenu.h>
-#include <gtk/gtktoolbutton.h>
+#include <ytk/gtkmenu.h>
+#include <ytk/gtktoolbutton.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkmessagedialog.h b/libs/tk/ytk/ytk/gtkmessagedialog.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkmessagedialog.h
rename to libs/tk/ytk/ytk/gtkmessagedialog.h
index 5fd15a9c61..a47558fe70 100644
--- a/libs/tk/ytk/ytk/gtk/gtkmessagedialog.h
+++ b/libs/tk/ytk/ytk/gtkmessagedialog.h
@@ -28,11 +28,11 @@
 #define __GTK_MESSAGE_DIALOG_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkenums.h>
+#include <ytk/gtkdialog.h>
+#include <ytk/gtkenums.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkmisc.h b/libs/tk/ytk/ytk/gtkmisc.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkmisc.h
rename to libs/tk/ytk/ytk/gtkmisc.h
index 4246f5388f..c319b781f4 100644
--- a/libs/tk/ytk/ytk/gtk/gtkmisc.h
+++ b/libs/tk/ytk/ytk/gtkmisc.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkwidget.h>
+#include <ytk/gtkwidget.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkmnemonichash.h b/libs/tk/ytk/ytk/gtkmnemonichash.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkmnemonichash.h
rename to libs/tk/ytk/ytk/gtkmnemonichash.h
index bb88fcce82..63d5135375 100644
--- a/libs/tk/ytk/ytk/gtk/gtkmnemonichash.h
+++ b/libs/tk/ytk/ytk/gtkmnemonichash.h
@@ -23,7 +23,7 @@
 #define __GTK_MNEMONIC_HASH_H__
 
 #include <ydk/gdk.h>
-#include <gtk/gtkwidget.h>
+#include <ytk/gtkwidget.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkmodules.h b/libs/tk/ytk/ytk/gtkmodules.h
similarity index 95%
rename from libs/tk/ytk/ytk/gtk/gtkmodules.h
rename to libs/tk/ytk/ytk/gtkmodules.h
index 7baf8c1083..4d9e2c32bf 100644
--- a/libs/tk/ytk/ytk/gtk/gtkmodules.h
+++ b/libs/tk/ytk/ytk/gtkmodules.h
@@ -22,10 +22,10 @@
 #define __GTK_MODULES_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtksettings.h>
+#include <ytk/gtksettings.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkmountoperation.h b/libs/tk/ytk/ytk/gtkmountoperation.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkmountoperation.h
rename to libs/tk/ytk/ytk/gtkmountoperation.h
index 085d885b52..3ba9e8fb88 100644
--- a/libs/tk/ytk/ytk/gtk/gtkmountoperation.h
+++ b/libs/tk/ytk/ytk/gtkmountoperation.h
@@ -28,7 +28,7 @@
 #define __GTK_MOUNT_OPERATION_H__
 
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkmountoperationprivate.h b/libs/tk/ytk/ytk/gtkmountoperationprivate.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtkmountoperationprivate.h
rename to libs/tk/ytk/ytk/gtkmountoperationprivate.h
diff --git a/libs/tk/ytk/ytk/gtk/gtknotebook.h b/libs/tk/ytk/ytk/gtknotebook.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtknotebook.h
rename to libs/tk/ytk/ytk/gtknotebook.h
index 6373e680b5..de883741a8 100644
--- a/libs/tk/ytk/ytk/gtk/gtknotebook.h
+++ b/libs/tk/ytk/ytk/gtknotebook.h
@@ -30,10 +30,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcontainer.h>
+#include <ytk/gtkcontainer.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkobject.h b/libs/tk/ytk/ytk/gtkobject.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkobject.h
rename to libs/tk/ytk/ytk/gtkobject.h
index 8b877b7910..b11043ee5e 100644
--- a/libs/tk/ytk/ytk/gtk/gtkobject.h
+++ b/libs/tk/ytk/ytk/gtkobject.h
@@ -29,13 +29,13 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <gdkconfig.h>
-#include <gtk/gtkenums.h>
-#include <gtk/gtktypeutils.h>
-#include <gtk/gtkdebug.h>
+#include <ytk/gtkenums.h>
+#include <ytk/gtktypeutils.h>
+#include <ytk/gtkdebug.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkoffscreenwindow.h b/libs/tk/ytk/ytk/gtkoffscreenwindow.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkoffscreenwindow.h
rename to libs/tk/ytk/ytk/gtkoffscreenwindow.h
index cb1c56e4df..794207f1d7 100644
--- a/libs/tk/ytk/ytk/gtk/gtkoffscreenwindow.h
+++ b/libs/tk/ytk/ytk/gtkoffscreenwindow.h
@@ -22,10 +22,10 @@
 #define __GTK_OFFSCREEN_WINDOW_H__
 
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkwindow.h>
+#include <ytk/gtkwindow.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkoptionmenu.h b/libs/tk/ytk/ytk/gtkoptionmenu.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtkoptionmenu.h
rename to libs/tk/ytk/ytk/gtkoptionmenu.h
index 8521020edd..3ec65678fb 100644
--- a/libs/tk/ytk/ytk/gtk/gtkoptionmenu.h
+++ b/libs/tk/ytk/ytk/gtkoptionmenu.h
@@ -29,7 +29,7 @@
 #ifndef __GTK_OPTION_MENU_H__
 #define __GTK_OPTION_MENU_H__
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkorientable.h b/libs/tk/ytk/ytk/gtkorientable.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkorientable.h
rename to libs/tk/ytk/ytk/gtkorientable.h
index f9014e72cb..9fef7676c5 100644
--- a/libs/tk/ytk/ytk/gtk/gtkorientable.h
+++ b/libs/tk/ytk/ytk/gtkorientable.h
@@ -25,10 +25,10 @@
 #define __GTK_ORIENTABLE_H__
 
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkwidget.h>
+#include <ytk/gtkwidget.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkpagesetupunixdialog.h b/libs/tk/ytk/ytk/gtkpagesetupunixdialog.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkpagesetupunixdialog.h
rename to libs/tk/ytk/ytk/gtkpagesetupunixdialog.h
index 4d889fe56e..765d639fc1 100644
--- a/libs/tk/ytk/ytk/gtk/gtkpagesetupunixdialog.h
+++ b/libs/tk/ytk/ytk/gtkpagesetupunixdialog.h
@@ -21,10 +21,10 @@
 #define __GTK_PAGE_SETUP_UNIX_DIALOG_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_UNIX_PRINT_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtkunixprint.h> can be included directly."
+#error "Only <ytk/gtkunixprint.h> can be included directly."
 #endif
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkpaned.h b/libs/tk/ytk/ytk/gtkpaned.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkpaned.h
rename to libs/tk/ytk/ytk/gtkpaned.h
index 7d361efa69..d6e7feec93 100644
--- a/libs/tk/ytk/ytk/gtk/gtkpaned.h
+++ b/libs/tk/ytk/ytk/gtkpaned.h
@@ -28,10 +28,10 @@
 #define __GTK_PANED_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcontainer.h>
+#include <ytk/gtkcontainer.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkpango.h b/libs/tk/ytk/ytk/gtkpango.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkpango.h
rename to libs/tk/ytk/ytk/gtkpango.h
index 51338da46b..1c6938fe0c 100644
--- a/libs/tk/ytk/ytk/gtk/gtkpango.h
+++ b/libs/tk/ytk/ytk/gtkpango.h
@@ -29,7 +29,7 @@
 
 
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <pango/pangocairo.h>
diff --git a/libs/tk/ytk/ytk/gtk/gtkpathbar.h b/libs/tk/ytk/ytk/gtkpathbar.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtkpathbar.h
rename to libs/tk/ytk/ytk/gtkpathbar.h
diff --git a/libs/tk/ytk/ytk/gtk/gtkplug.h b/libs/tk/ytk/ytk/gtkplug.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkplug.h
rename to libs/tk/ytk/ytk/gtkplug.h
index 69f90ba75f..89390cf6e8 100644
--- a/libs/tk/ytk/ytk/gtk/gtkplug.h
+++ b/libs/tk/ytk/ytk/gtkplug.h
@@ -28,11 +28,11 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtksocket.h>
-#include <gtk/gtkwindow.h>
+#include <ytk/gtksocket.h>
+#include <ytk/gtkwindow.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkplugprivate.h b/libs/tk/ytk/ytk/gtkplugprivate.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtkplugprivate.h
rename to libs/tk/ytk/ytk/gtkplugprivate.h
diff --git a/libs/tk/ytk/ytk/gtk/gtkprivate.h b/libs/tk/ytk/ytk/gtkprivate.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtkprivate.h
rename to libs/tk/ytk/ytk/gtkprivate.h
index e0f097d86e..f400eb472f 100644
--- a/libs/tk/ytk/ytk/gtk/gtkprivate.h
+++ b/libs/tk/ytk/ytk/gtkprivate.h
@@ -27,7 +27,7 @@
 #ifndef __GTK_PRIVATE_H__
 #define __GTK_PRIVATE_H__
 
-#include <gtk/gtkwidget.h>
+#include <ytk/gtkwidget.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkprogress.h b/libs/tk/ytk/ytk/gtkprogress.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkprogress.h
rename to libs/tk/ytk/ytk/gtkprogress.h
index b5f42e8518..941af79bbb 100644
--- a/libs/tk/ytk/ytk/gtk/gtkprogress.h
+++ b/libs/tk/ytk/ytk/gtkprogress.h
@@ -28,8 +28,8 @@
 #define __GTK_PROGRESS_H__
 
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkadjustment.h>
+#include <ytk/gtkwidget.h>
+#include <ytk/gtkadjustment.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkprogressbar.h b/libs/tk/ytk/ytk/gtkprogressbar.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkprogressbar.h
rename to libs/tk/ytk/ytk/gtkprogressbar.h
index 0086aa3f6b..49bf749dbe 100644
--- a/libs/tk/ytk/ytk/gtk/gtkprogressbar.h
+++ b/libs/tk/ytk/ytk/gtkprogressbar.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkprogress.h>
+#include <ytk/gtkprogress.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkquartz.h b/libs/tk/ytk/ytk/gtkquartz.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkquartz.h
rename to libs/tk/ytk/ytk/gtkquartz.h
index 41fa1ee2be..0909d51a64 100644
--- a/libs/tk/ytk/ytk/gtk/gtkquartz.h
+++ b/libs/tk/ytk/ytk/gtkquartz.h
@@ -22,7 +22,7 @@
 #define __GTK_QUARTZ_H__
 
 #import <Cocoa/Cocoa.h>
-#include <gtk/gtkselection.h>
+#include <ytk/gtkselection.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkquery.h b/libs/tk/ytk/ytk/gtkquery.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtkquery.h
rename to libs/tk/ytk/ytk/gtkquery.h
diff --git a/libs/tk/ytk/ytk/gtk/gtkradioaction.h b/libs/tk/ytk/ytk/gtkradioaction.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkradioaction.h
rename to libs/tk/ytk/ytk/gtkradioaction.h
index 03b04a8add..9224235821 100644
--- a/libs/tk/ytk/ytk/gtk/gtkradioaction.h
+++ b/libs/tk/ytk/ytk/gtkradioaction.h
@@ -32,10 +32,10 @@
 #define __GTK_RADIO_ACTION_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtktoggleaction.h>
+#include <ytk/gtktoggleaction.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkradiobutton.h b/libs/tk/ytk/ytk/gtkradiobutton.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkradiobutton.h
rename to libs/tk/ytk/ytk/gtkradiobutton.h
index 8f91d40f3e..23551df7f1 100644
--- a/libs/tk/ytk/ytk/gtk/gtkradiobutton.h
+++ b/libs/tk/ytk/ytk/gtkradiobutton.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcheckbutton.h>
+#include <ytk/gtkcheckbutton.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkradiomenuitem.h b/libs/tk/ytk/ytk/gtkradiomenuitem.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkradiomenuitem.h
rename to libs/tk/ytk/ytk/gtkradiomenuitem.h
index d08a97c932..51b02763f7 100644
--- a/libs/tk/ytk/ytk/gtk/gtkradiomenuitem.h
+++ b/libs/tk/ytk/ytk/gtkradiomenuitem.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcheckmenuitem.h>
+#include <ytk/gtkcheckmenuitem.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkradiotoolbutton.h b/libs/tk/ytk/ytk/gtkradiotoolbutton.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkradiotoolbutton.h
rename to libs/tk/ytk/ytk/gtkradiotoolbutton.h
index 6ea4caba51..716b693241 100644
--- a/libs/tk/ytk/ytk/gtk/gtkradiotoolbutton.h
+++ b/libs/tk/ytk/ytk/gtkradiotoolbutton.h
@@ -24,10 +24,10 @@
 #define __GTK_RADIO_TOOL_BUTTON_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtktoggletoolbutton.h>
+#include <ytk/gtktoggletoolbutton.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkrange.h b/libs/tk/ytk/ytk/gtkrange.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkrange.h
rename to libs/tk/ytk/ytk/gtkrange.h
index c672acb20f..579ec0231c 100644
--- a/libs/tk/ytk/ytk/gtk/gtkrange.h
+++ b/libs/tk/ytk/ytk/gtkrange.h
@@ -29,11 +29,11 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkwidget.h>
+#include <ytk/gtkadjustment.h>
+#include <ytk/gtkwidget.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkrbtree.h b/libs/tk/ytk/ytk/gtkrbtree.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtkrbtree.h
rename to libs/tk/ytk/ytk/gtkrbtree.h
diff --git a/libs/tk/ytk/ytk/gtk/gtkrc.h b/libs/tk/ytk/ytk/gtkrc.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtkrc.h
rename to libs/tk/ytk/ytk/gtkrc.h
index 46547c1bbb..56f7fb3d47 100644
--- a/libs/tk/ytk/ytk/gtk/gtkrc.h
+++ b/libs/tk/ytk/ytk/gtkrc.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkstyle.h>
+#include <ytk/gtkstyle.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkrecentaction.h b/libs/tk/ytk/ytk/gtkrecentaction.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkrecentaction.h
rename to libs/tk/ytk/ytk/gtkrecentaction.h
index c180e7b3ed..227e1ab26f 100644
--- a/libs/tk/ytk/ytk/gtk/gtkrecentaction.h
+++ b/libs/tk/ytk/ytk/gtkrecentaction.h
@@ -23,11 +23,11 @@
 #define __GTK_RECENT_ACTION_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkaction.h>
-#include <gtk/gtkrecentmanager.h>
+#include <ytk/gtkaction.h>
+#include <ytk/gtkrecentmanager.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkrecentchooser.h b/libs/tk/ytk/ytk/gtkrecentchooser.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkrecentchooser.h
rename to libs/tk/ytk/ytk/gtkrecentchooser.h
index 130084c4a6..31a8ee574e 100644
--- a/libs/tk/ytk/ytk/gtk/gtkrecentchooser.h
+++ b/libs/tk/ytk/ytk/gtkrecentchooser.h
@@ -23,12 +23,12 @@
 #define __GTK_RECENT_CHOOSER_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkrecentmanager.h>
-#include <gtk/gtkrecentfilter.h>
+#include <ytk/gtkwidget.h>
+#include <ytk/gtkrecentmanager.h>
+#include <ytk/gtkrecentfilter.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkrecentchooserdefault.h b/libs/tk/ytk/ytk/gtkrecentchooserdefault.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkrecentchooserdefault.h
rename to libs/tk/ytk/ytk/gtkrecentchooserdefault.h
index 71dec2a457..215b730be3 100644
--- a/libs/tk/ytk/ytk/gtk/gtkrecentchooserdefault.h
+++ b/libs/tk/ytk/ytk/gtkrecentchooserdefault.h
@@ -21,7 +21,7 @@
 #ifndef __GTK_RECENT_CHOOSER_DEFAULT_H__
 #define __GTK_RECENT_CHOOSER_DEFAULT_H__
 
-#include <gtk/gtkwidget.h>
+#include <ytk/gtkwidget.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkrecentchooserdialog.h b/libs/tk/ytk/ytk/gtkrecentchooserdialog.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkrecentchooserdialog.h
rename to libs/tk/ytk/ytk/gtkrecentchooserdialog.h
index c48e6b1002..751ecfc449 100644
--- a/libs/tk/ytk/ytk/gtk/gtkrecentchooserdialog.h
+++ b/libs/tk/ytk/ytk/gtkrecentchooserdialog.h
@@ -22,11 +22,11 @@
 #define __GTK_RECENT_CHOOSER_DIALOG_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkdialog.h>
-#include <gtk/gtkrecentchooser.h>
+#include <ytk/gtkdialog.h>
+#include <ytk/gtkrecentchooser.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkrecentchoosermenu.h b/libs/tk/ytk/ytk/gtkrecentchoosermenu.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkrecentchoosermenu.h
rename to libs/tk/ytk/ytk/gtkrecentchoosermenu.h
index 9fb99cd938..5fff652168 100644
--- a/libs/tk/ytk/ytk/gtk/gtkrecentchoosermenu.h
+++ b/libs/tk/ytk/ytk/gtkrecentchoosermenu.h
@@ -22,11 +22,11 @@
 #define __GTK_RECENT_CHOOSER_MENU_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkrecentchooser.h>
+#include <ytk/gtkmenu.h>
+#include <ytk/gtkrecentchooser.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkrecentchooserprivate.h b/libs/tk/ytk/ytk/gtkrecentchooserprivate.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtkrecentchooserprivate.h
rename to libs/tk/ytk/ytk/gtkrecentchooserprivate.h
diff --git a/libs/tk/ytk/ytk/gtk/gtkrecentchooserutils.h b/libs/tk/ytk/ytk/gtkrecentchooserutils.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtkrecentchooserutils.h
rename to libs/tk/ytk/ytk/gtkrecentchooserutils.h
diff --git a/libs/tk/ytk/ytk/gtk/gtkrecentchooserwidget.h b/libs/tk/ytk/ytk/gtkrecentchooserwidget.h
similarity index 95%
rename from libs/tk/ytk/ytk/gtk/gtkrecentchooserwidget.h
rename to libs/tk/ytk/ytk/gtkrecentchooserwidget.h
index 557f134c0d..cbf9f45a69 100644
--- a/libs/tk/ytk/ytk/gtk/gtkrecentchooserwidget.h
+++ b/libs/tk/ytk/ytk/gtkrecentchooserwidget.h
@@ -22,11 +22,11 @@
 #define __GTK_RECENT_CHOOSER_WIDGET_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkrecentchooser.h>
-#include <gtk/gtkvbox.h>
+#include <ytk/gtkrecentchooser.h>
+#include <ytk/gtkvbox.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkrecentfilter.h b/libs/tk/ytk/ytk/gtkrecentfilter.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkrecentfilter.h
rename to libs/tk/ytk/ytk/gtkrecentfilter.h
index 83cad90bc9..28f0e62227 100644
--- a/libs/tk/ytk/ytk/gtk/gtkrecentfilter.h
+++ b/libs/tk/ytk/ytk/gtkrecentfilter.h
@@ -22,7 +22,7 @@
 #define __GTK_RECENT_FILTER_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <glib-object.h>
diff --git a/libs/tk/ytk/ytk/gtk/gtkrecentmanager.h b/libs/tk/ytk/ytk/gtkrecentmanager.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtkrecentmanager.h
rename to libs/tk/ytk/ytk/gtkrecentmanager.h
index aabe9b28db..cdc0207fa6 100644
--- a/libs/tk/ytk/ytk/gtk/gtkrecentmanager.h
+++ b/libs/tk/ytk/ytk/gtkrecentmanager.h
@@ -22,7 +22,7 @@
 #define __GTK_RECENT_MANAGER_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <gdk-pixbuf/gdk-pixbuf.h>
diff --git a/libs/tk/ytk/ytk/gtk/gtkruler.h b/libs/tk/ytk/ytk/gtkruler.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkruler.h
rename to libs/tk/ytk/ytk/gtkruler.h
index b2260524dd..8f6a9288c4 100644
--- a/libs/tk/ytk/ytk/gtk/gtkruler.h
+++ b/libs/tk/ytk/ytk/gtkruler.h
@@ -35,7 +35,7 @@
  */
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #ifndef GTK_DISABLE_DEPRECATED
@@ -44,7 +44,7 @@
 #define __GTK_RULER_H__
 
 
-#include <gtk/gtkwidget.h>
+#include <ytk/gtkwidget.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkscale.h b/libs/tk/ytk/ytk/gtkscale.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkscale.h
rename to libs/tk/ytk/ytk/gtkscale.h
index 01b70e0c90..c61e8906c4 100644
--- a/libs/tk/ytk/ytk/gtk/gtkscale.h
+++ b/libs/tk/ytk/ytk/gtkscale.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkrange.h>
+#include <ytk/gtkrange.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkscalebutton.h b/libs/tk/ytk/ytk/gtkscalebutton.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkscalebutton.h
rename to libs/tk/ytk/ytk/gtkscalebutton.h
index 29ab8a8758..8cf69276d0 100644
--- a/libs/tk/ytk/ytk/gtk/gtkscalebutton.h
+++ b/libs/tk/ytk/ytk/gtkscalebutton.h
@@ -37,10 +37,10 @@
 #define __GTK_SCALE_BUTTON_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkbutton.h>
+#include <ytk/gtkbutton.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkscrollbar.h b/libs/tk/ytk/ytk/gtkscrollbar.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkscrollbar.h
rename to libs/tk/ytk/ytk/gtkscrollbar.h
index 8ce77d3ba9..334624c09b 100644
--- a/libs/tk/ytk/ytk/gtk/gtkscrollbar.h
+++ b/libs/tk/ytk/ytk/gtkscrollbar.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkrange.h>
+#include <ytk/gtkrange.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkscrolledwindow.h b/libs/tk/ytk/ytk/gtkscrolledwindow.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkscrolledwindow.h
rename to libs/tk/ytk/ytk/gtkscrolledwindow.h
index 5407547c1f..58cf557dab 100644
--- a/libs/tk/ytk/ytk/gtk/gtkscrolledwindow.h
+++ b/libs/tk/ytk/ytk/gtkscrolledwindow.h
@@ -29,12 +29,12 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkhscrollbar.h>
-#include <gtk/gtkvscrollbar.h>
-#include <gtk/gtkviewport.h>
+#include <ytk/gtkhscrollbar.h>
+#include <ytk/gtkvscrollbar.h>
+#include <ytk/gtkviewport.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtksearchengine.h b/libs/tk/ytk/ytk/gtksearchengine.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtksearchengine.h
rename to libs/tk/ytk/ytk/gtksearchengine.h
diff --git a/libs/tk/ytk/ytk/gtk/gtksearchenginequartz.h b/libs/tk/ytk/ytk/gtksearchenginequartz.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtksearchenginequartz.h
rename to libs/tk/ytk/ytk/gtksearchenginequartz.h
diff --git a/libs/tk/ytk/ytk/gtk/gtksearchenginesimple.h b/libs/tk/ytk/ytk/gtksearchenginesimple.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtksearchenginesimple.h
rename to libs/tk/ytk/ytk/gtksearchenginesimple.h
diff --git a/libs/tk/ytk/ytk/gtk/gtkselection.h b/libs/tk/ytk/ytk/gtkselection.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkselection.h
rename to libs/tk/ytk/ytk/gtkselection.h
index 012e7d4b4f..55e7e5b8f7 100644
--- a/libs/tk/ytk/ytk/gtk/gtkselection.h
+++ b/libs/tk/ytk/ytk/gtkselection.h
@@ -29,11 +29,11 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtktextiter.h>
+#include <ytk/gtkwidget.h>
+#include <ytk/gtktextiter.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkseparator.h b/libs/tk/ytk/ytk/gtkseparator.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkseparator.h
rename to libs/tk/ytk/ytk/gtkseparator.h
index 98441b6671..63885d19f3 100644
--- a/libs/tk/ytk/ytk/gtk/gtkseparator.h
+++ b/libs/tk/ytk/ytk/gtkseparator.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkwidget.h>
+#include <ytk/gtkwidget.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkseparatormenuitem.h b/libs/tk/ytk/ytk/gtkseparatormenuitem.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkseparatormenuitem.h
rename to libs/tk/ytk/ytk/gtkseparatormenuitem.h
index 2c99572d1e..46b4aab658 100644
--- a/libs/tk/ytk/ytk/gtk/gtkseparatormenuitem.h
+++ b/libs/tk/ytk/ytk/gtkseparatormenuitem.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkmenuitem.h>
+#include <ytk/gtkmenuitem.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkseparatortoolitem.h b/libs/tk/ytk/ytk/gtkseparatortoolitem.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkseparatortoolitem.h
rename to libs/tk/ytk/ytk/gtkseparatortoolitem.h
index 58b04bfde6..87bf049fc6 100644
--- a/libs/tk/ytk/ytk/gtk/gtkseparatortoolitem.h
+++ b/libs/tk/ytk/ytk/gtkseparatortoolitem.h
@@ -23,10 +23,10 @@
 #define __GTK_SEPARATOR_TOOL_ITEM_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtktoolitem.h>
+#include <ytk/gtktoolitem.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtksettings.h b/libs/tk/ytk/ytk/gtksettings.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtksettings.h
rename to libs/tk/ytk/ytk/gtksettings.h
index eb499e8338..4864e0e850 100644
--- a/libs/tk/ytk/ytk/gtk/gtksettings.h
+++ b/libs/tk/ytk/ytk/gtksettings.h
@@ -20,10 +20,10 @@
 #define __GTK_SETTINGS_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkrc.h>
+#include <ytk/gtkrc.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkshow.h b/libs/tk/ytk/ytk/gtkshow.h
similarity index 95%
rename from libs/tk/ytk/ytk/gtk/gtkshow.h
rename to libs/tk/ytk/ytk/gtkshow.h
index 91e4cb3534..43d4207cb9 100644
--- a/libs/tk/ytk/ytk/gtk/gtkshow.h
+++ b/libs/tk/ytk/ytk/gtkshow.h
@@ -24,7 +24,7 @@
 #define __GTK_SHOW_H__
 
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtksizegroup.h b/libs/tk/ytk/ytk/gtksizegroup.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtksizegroup.h
rename to libs/tk/ytk/ytk/gtksizegroup.h
index 87e68d3cf4..d67e0673cf 100644
--- a/libs/tk/ytk/ytk/gtk/gtksizegroup.h
+++ b/libs/tk/ytk/ytk/gtksizegroup.h
@@ -22,10 +22,10 @@
 #define __GTK_SIZE_GROUP_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkwidget.h>
+#include <ytk/gtkwidget.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtksocket.h b/libs/tk/ytk/ytk/gtksocket.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtksocket.h
rename to libs/tk/ytk/ytk/gtksocket.h
index c7bf32ddb2..a77ac3dbaf 100644
--- a/libs/tk/ytk/ytk/gtk/gtksocket.h
+++ b/libs/tk/ytk/ytk/gtksocket.h
@@ -27,10 +27,10 @@
 #define __GTK_SOCKET_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcontainer.h>
+#include <ytk/gtkcontainer.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtksocketprivate.h b/libs/tk/ytk/ytk/gtksocketprivate.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtksocketprivate.h
rename to libs/tk/ytk/ytk/gtksocketprivate.h
diff --git a/libs/tk/ytk/ytk/gtk/gtkspinbutton.h b/libs/tk/ytk/ytk/gtkspinbutton.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkspinbutton.h
rename to libs/tk/ytk/ytk/gtkspinbutton.h
index 3fc70d7a26..5eab2e117c 100644
--- a/libs/tk/ytk/ytk/gtk/gtkspinbutton.h
+++ b/libs/tk/ytk/ytk/gtkspinbutton.h
@@ -32,11 +32,11 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkentry.h>
-#include <gtk/gtkadjustment.h>
+#include <ytk/gtkentry.h>
+#include <ytk/gtkadjustment.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkspinner.h b/libs/tk/ytk/ytk/gtkspinner.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkspinner.h
rename to libs/tk/ytk/ytk/gtkspinner.h
index c0715be51a..61a153d804 100644
--- a/libs/tk/ytk/ytk/gtk/gtkspinner.h
+++ b/libs/tk/ytk/ytk/gtkspinner.h
@@ -26,10 +26,10 @@
 #define __GTK_SPINNER_H__
 
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkdrawingarea.h>
+#include <ytk/gtkdrawingarea.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkstatusbar.h b/libs/tk/ytk/ytk/gtkstatusbar.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtkstatusbar.h
rename to libs/tk/ytk/ytk/gtkstatusbar.h
index 398412c651..0f1aa00010 100644
--- a/libs/tk/ytk/ytk/gtk/gtkstatusbar.h
+++ b/libs/tk/ytk/ytk/gtkstatusbar.h
@@ -29,10 +29,10 @@
 #define __GTK_STATUSBAR_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkhbox.h>
+#include <ytk/gtkhbox.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkstock.h b/libs/tk/ytk/ytk/gtkstock.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtkstock.h
rename to libs/tk/ytk/ytk/gtkstock.h
index 61296fded7..aedbb42529 100644
--- a/libs/tk/ytk/ytk/gtk/gtkstock.h
+++ b/libs/tk/ytk/ytk/gtkstock.h
@@ -29,11 +29,11 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <ydk/gdk.h>
-#include <gtk/gtktypeutils.h> /* for GtkTranslateFunc */
+#include <ytk/gtktypeutils.h> /* for GtkTranslateFunc */
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkstyle.h b/libs/tk/ytk/ytk/gtkstyle.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtkstyle.h
rename to libs/tk/ytk/ytk/gtkstyle.h
index db889b6fcd..00cf894c7b 100644
--- a/libs/tk/ytk/ytk/gtk/gtkstyle.h
+++ b/libs/tk/ytk/ytk/gtkstyle.h
@@ -29,11 +29,11 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <ydk/gdk.h>
-#include <gtk/gtkenums.h>
+#include <ytk/gtkenums.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtktable.h b/libs/tk/ytk/ytk/gtktable.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtktable.h
rename to libs/tk/ytk/ytk/gtktable.h
index 0e2bb874fe..df534c5747 100644
--- a/libs/tk/ytk/ytk/gtk/gtktable.h
+++ b/libs/tk/ytk/ytk/gtktable.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcontainer.h>
+#include <ytk/gtkcontainer.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtktearoffmenuitem.h b/libs/tk/ytk/ytk/gtktearoffmenuitem.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtktearoffmenuitem.h
rename to libs/tk/ytk/ytk/gtktearoffmenuitem.h
index 3900fd0816..534f259cd9 100644
--- a/libs/tk/ytk/ytk/gtk/gtktearoffmenuitem.h
+++ b/libs/tk/ytk/ytk/gtktearoffmenuitem.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkmenuitem.h>
+#include <ytk/gtkmenuitem.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtktestutils.h b/libs/tk/ytk/ytk/gtktestutils.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtktestutils.h
rename to libs/tk/ytk/ytk/gtktestutils.h
index d4272cb026..e39de92a3e 100644
--- a/libs/tk/ytk/ytk/gtk/gtktestutils.h
+++ b/libs/tk/ytk/ytk/gtktestutils.h
@@ -22,7 +22,7 @@
 #define __GTK_TEST_UTILS_H__
 
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtktextbtree.h b/libs/tk/ytk/ytk/gtktextbtree.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtktextbtree.h
rename to libs/tk/ytk/ytk/gtktextbtree.h
index 627b2fc681..9e19470f5a 100644
--- a/libs/tk/ytk/ytk/gtk/gtktextbtree.h
+++ b/libs/tk/ytk/ytk/gtktextbtree.h
@@ -37,12 +37,12 @@
 #define DV(x)
 #endif
 
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtktexttag.h>
-#include <gtk/gtktextmark.h>
-#include <gtk/gtktextchild.h>
-#include <gtk/gtktextsegment.h>
-#include <gtk/gtktextiter.h>
+#include <ytk/gtktextbuffer.h>
+#include <ytk/gtktexttag.h>
+#include <ytk/gtktextmark.h>
+#include <ytk/gtktextchild.h>
+#include <ytk/gtktextsegment.h>
+#include <ytk/gtktextiter.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktextbuffer.h b/libs/tk/ytk/ytk/gtktextbuffer.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtktextbuffer.h
rename to libs/tk/ytk/ytk/gtktextbuffer.h
index 5b6e7bf7d7..eb4827eb95 100644
--- a/libs/tk/ytk/ytk/gtk/gtktextbuffer.h
+++ b/libs/tk/ytk/ytk/gtktextbuffer.h
@@ -28,15 +28,15 @@
 #define __GTK_TEXT_BUFFER_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkclipboard.h>
-#include <gtk/gtktexttagtable.h>
-#include <gtk/gtktextiter.h>
-#include <gtk/gtktextmark.h>
-#include <gtk/gtktextchild.h>
+#include <ytk/gtkwidget.h>
+#include <ytk/gtkclipboard.h>
+#include <ytk/gtktexttagtable.h>
+#include <ytk/gtktextiter.h>
+#include <ytk/gtktextmark.h>
+#include <ytk/gtktextchild.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktextbufferrichtext.h b/libs/tk/ytk/ytk/gtktextbufferrichtext.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtktextbufferrichtext.h
rename to libs/tk/ytk/ytk/gtktextbufferrichtext.h
index 7149f6c18c..b2dad9839f 100644
--- a/libs/tk/ytk/ytk/gtk/gtktextbufferrichtext.h
+++ b/libs/tk/ytk/ytk/gtktextbufferrichtext.h
@@ -23,10 +23,10 @@
 #define __GTK_TEXT_BUFFER_RICH_TEXT_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtktextbuffer.h>
+#include <ytk/gtktextbuffer.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktextbufferserialize.h b/libs/tk/ytk/ytk/gtktextbufferserialize.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtktextbufferserialize.h
rename to libs/tk/ytk/ytk/gtktextbufferserialize.h
index 63a749e662..c66488e06c 100644
--- a/libs/tk/ytk/ytk/gtk/gtktextbufferserialize.h
+++ b/libs/tk/ytk/ytk/gtktextbufferserialize.h
@@ -21,7 +21,7 @@
 #ifndef __GTK_TEXT_BUFFER_SERIALIZE_H__
 #define __GTK_TEXT_BUFFER_SERIALIZE_H__
 
-#include <gtk/gtktextbuffer.h>
+#include <ytk/gtktextbuffer.h>
 
 guint8 * _gtk_text_buffer_serialize_rich_text   (GtkTextBuffer     *register_buffer,
                                                  GtkTextBuffer     *content_buffer,
diff --git a/libs/tk/ytk/ytk/gtk/gtktextchild.h b/libs/tk/ytk/ytk/gtktextchild.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtktextchild.h
rename to libs/tk/ytk/ytk/gtktextchild.h
index 7a814cec3b..4918c0aa67 100644
--- a/libs/tk/ytk/ytk/gtk/gtktextchild.h
+++ b/libs/tk/ytk/ytk/gtktextchild.h
@@ -28,7 +28,7 @@
 #define __GTK_TEXT_CHILD_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <gdkconfig.h>
diff --git a/libs/tk/ytk/ytk/gtk/gtktextchildprivate.h b/libs/tk/ytk/ytk/gtktextchildprivate.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtktextchildprivate.h
rename to libs/tk/ytk/ytk/gtktextchildprivate.h
index 0c9b19c141..24681dd76b 100644
--- a/libs/tk/ytk/ytk/gtk/gtktextchildprivate.h
+++ b/libs/tk/ytk/ytk/gtktextchildprivate.h
@@ -50,7 +50,7 @@
 #ifndef __GTK_TEXT_CHILD_PRIVATE_H__
 #define __GTK_TEXT_CHILD_PRIVATE_H__
 
-#include <gtk/gtktexttypes.h>
+#include <ytk/gtktexttypes.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktextdisplay.h b/libs/tk/ytk/ytk/gtktextdisplay.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtktextdisplay.h
rename to libs/tk/ytk/ytk/gtktextdisplay.h
index b93a84c2b2..69fef6e4ed 100644
--- a/libs/tk/ytk/ytk/gtk/gtktextdisplay.h
+++ b/libs/tk/ytk/ytk/gtktextdisplay.h
@@ -77,7 +77,7 @@
 #ifndef __GTK_TEXT_DISPLAY_H__
 #define __GTK_TEXT_DISPLAY_H__
 
-#include <gtk/gtktextlayout.h>
+#include <ytk/gtktextlayout.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktextiter.h b/libs/tk/ytk/ytk/gtktextiter.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtktextiter.h
rename to libs/tk/ytk/ytk/gtktextiter.h
index 749af44155..489d1b20b9 100644
--- a/libs/tk/ytk/ytk/gtk/gtktextiter.h
+++ b/libs/tk/ytk/ytk/gtktextiter.h
@@ -28,11 +28,11 @@
 #define __GTK_TEXT_ITER_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtktexttag.h>
-#include <gtk/gtktextchild.h>
+#include <ytk/gtktexttag.h>
+#include <ytk/gtktextchild.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktextiterprivate.h b/libs/tk/ytk/ytk/gtktextiterprivate.h
similarity index 95%
rename from libs/tk/ytk/ytk/gtk/gtktextiterprivate.h
rename to libs/tk/ytk/ytk/gtktextiterprivate.h
index ff1893dfb3..aa40b0f45b 100644
--- a/libs/tk/ytk/ytk/gtk/gtktextiterprivate.h
+++ b/libs/tk/ytk/ytk/gtktextiterprivate.h
@@ -27,12 +27,12 @@
 #ifndef __GTK_TEXT_ITER_PRIVATE_H__
 #define __GTK_TEXT_ITER_PRIVATE_H__
 
-#include <gtk/gtktextiter.h>
+#include <ytk/gtktextiter.h>
 
 G_BEGIN_DECLS
 
-#include <gtk/gtktextiter.h>
-#include <gtk/gtktextbtree.h>
+#include <ytk/gtktextiter.h>
+#include <ytk/gtktextbtree.h>
 
 GtkTextLineSegment *_gtk_text_iter_get_indexable_segment      (const GtkTextIter *iter);
 GtkTextLineSegment *_gtk_text_iter_get_any_segment            (const GtkTextIter *iter);
diff --git a/libs/tk/ytk/ytk/gtk/gtktextlayout.h b/libs/tk/ytk/ytk/gtktextlayout.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtktextlayout.h
rename to libs/tk/ytk/ytk/gtktextlayout.h
index a2e8aa3a5d..99867a4d80 100644
--- a/libs/tk/ytk/ytk/gtk/gtktextlayout.h
+++ b/libs/tk/ytk/ytk/gtktextlayout.h
@@ -89,7 +89,7 @@
 #error "You are not supposed to be including this file; the equivalent public API is in gtktextview.h"
 #endif
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktextmark.h b/libs/tk/ytk/ytk/gtktextmark.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtktextmark.h
rename to libs/tk/ytk/ytk/gtktextmark.h
index 4eab445190..16b327ea2b 100644
--- a/libs/tk/ytk/ytk/gtk/gtktextmark.h
+++ b/libs/tk/ytk/ytk/gtktextmark.h
@@ -51,7 +51,7 @@
 #define __GTK_TEXT_MARK_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtktextmarkprivate.h b/libs/tk/ytk/ytk/gtktextmarkprivate.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtktextmarkprivate.h
rename to libs/tk/ytk/ytk/gtktextmarkprivate.h
index d2ff381371..fbd8571b8b 100644
--- a/libs/tk/ytk/ytk/gtk/gtktextmarkprivate.h
+++ b/libs/tk/ytk/ytk/gtktextmarkprivate.h
@@ -27,8 +27,8 @@
 #ifndef __GTK_TEXT_MARK_PRIVATE_H__
 #define __GTK_TEXT_MARK_PRIVATE_H__
 
-#include <gtk/gtktexttypes.h>
-#include <gtk/gtktextlayout.h>
+#include <ytk/gtktexttypes.h>
+#include <ytk/gtktextlayout.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktextsegment.h b/libs/tk/ytk/ytk/gtktextsegment.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtktextsegment.h
rename to libs/tk/ytk/ytk/gtktextsegment.h
index 394703b9d4..b181303e09 100644
--- a/libs/tk/ytk/ytk/gtk/gtktextsegment.h
+++ b/libs/tk/ytk/ytk/gtktextsegment.h
@@ -27,11 +27,11 @@
 #ifndef __GTK_TEXT_SEGMENT_H__
 #define __GTK_TEXT_SEGMENT_H__
 
-#include <gtk/gtktexttag.h>
-#include <gtk/gtktextiter.h>
-#include <gtk/gtktextmarkprivate.h>
-#include <gtk/gtktextchild.h>
-#include <gtk/gtktextchildprivate.h>
+#include <ytk/gtktexttag.h>
+#include <ytk/gtktextiter.h>
+#include <ytk/gtktextmarkprivate.h>
+#include <ytk/gtktextchild.h>
+#include <ytk/gtktextchildprivate.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktexttag.h b/libs/tk/ytk/ytk/gtktexttag.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtktexttag.h
rename to libs/tk/ytk/ytk/gtktexttag.h
index 50a9e95559..863d35e682 100644
--- a/libs/tk/ytk/ytk/gtk/gtktexttag.h
+++ b/libs/tk/ytk/ytk/gtktexttag.h
@@ -52,14 +52,14 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <ydk/gdk.h>
-#include <gtk/gtkenums.h>
+#include <ytk/gtkenums.h>
 
 /* Not needed, retained for compatibility -Yosh */
-#include <gtk/gtkobject.h>
+#include <ytk/gtkobject.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtktexttagprivate.h b/libs/tk/ytk/ytk/gtktexttagprivate.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtktexttagprivate.h
rename to libs/tk/ytk/ytk/gtktexttagprivate.h
index b3363d9250..2f46412b92 100644
--- a/libs/tk/ytk/ytk/gtk/gtktexttagprivate.h
+++ b/libs/tk/ytk/ytk/gtktexttagprivate.h
@@ -27,7 +27,7 @@
 #ifndef __GTK_TEXT_TAG_PRIVATE_H__
 #define __GTK_TEXT_TAG_PRIVATE_H__
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 typedef struct _GtkTextBTreeNode GtkTextBTreeNode;
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktexttagtable.h b/libs/tk/ytk/ytk/gtktexttagtable.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtktexttagtable.h
rename to libs/tk/ytk/ytk/gtktexttagtable.h
index aa7d985d90..40d62bbf16 100644
--- a/libs/tk/ytk/ytk/gtk/gtktexttagtable.h
+++ b/libs/tk/ytk/ytk/gtktexttagtable.h
@@ -28,10 +28,10 @@
 #define __GTK_TEXT_TAG_TABLE_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtktexttag.h>
+#include <ytk/gtktexttag.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktexttypes.h b/libs/tk/ytk/ytk/gtktexttypes.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtktexttypes.h
rename to libs/tk/ytk/ytk/gtktexttypes.h
index eb0db36e6d..634cc8ca07 100644
--- a/libs/tk/ytk/ytk/gtk/gtktexttypes.h
+++ b/libs/tk/ytk/ytk/gtktexttypes.h
@@ -27,8 +27,8 @@
 #ifndef __GTK_TEXT_TYPES_H__
 #define __GTK_TEXT_TYPES_H__
 
-#include <gtk/gtk.h>
-#include <gtk/gtktexttagprivate.h>
+#include <ytk/ytk.h>
+#include <ytk/gtktexttagprivate.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktextutil.h b/libs/tk/ytk/ytk/gtktextutil.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtktextutil.h
rename to libs/tk/ytk/ytk/gtktextutil.h
diff --git a/libs/tk/ytk/ytk/gtk/gtktextview.h b/libs/tk/ytk/ytk/gtktextview.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtktextview.h
rename to libs/tk/ytk/ytk/gtktextview.h
index 86c6c37a6e..1f726de9f9 100644
--- a/libs/tk/ytk/ytk/gtk/gtktextview.h
+++ b/libs/tk/ytk/ytk/gtktextview.h
@@ -28,13 +28,13 @@
 #define __GTK_TEXT_VIEW_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkimcontext.h>
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtkmenu.h>
+#include <ytk/gtkcontainer.h>
+#include <ytk/gtkimcontext.h>
+#include <ytk/gtktextbuffer.h>
+#include <ytk/gtkmenu.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkthemes.h b/libs/tk/ytk/ytk/gtkthemes.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkthemes.h
rename to libs/tk/ytk/ytk/gtkthemes.h
index 49d3e511dc..4d1b0d070f 100644
--- a/libs/tk/ytk/ytk/gtk/gtkthemes.h
+++ b/libs/tk/ytk/ytk/gtkthemes.h
@@ -29,8 +29,8 @@
 #define __GTK_THEMES_H__
 
 
-#include <gtk/gtkstyle.h>
-#include <gtk/gtkwidget.h>
+#include <ytk/gtkstyle.h>
+#include <ytk/gtkwidget.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtktoggleaction.h b/libs/tk/ytk/ytk/gtktoggleaction.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtktoggleaction.h
rename to libs/tk/ytk/ytk/gtktoggleaction.h
index 34210f5885..c89897e6e6 100644
--- a/libs/tk/ytk/ytk/gtk/gtktoggleaction.h
+++ b/libs/tk/ytk/ytk/gtktoggleaction.h
@@ -32,10 +32,10 @@
 #define __GTK_TOGGLE_ACTION_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkaction.h>
+#include <ytk/gtkaction.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktoggleactionprivate.h b/libs/tk/ytk/ytk/gtktoggleactionprivate.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtktoggleactionprivate.h
rename to libs/tk/ytk/ytk/gtktoggleactionprivate.h
diff --git a/libs/tk/ytk/ytk/gtk/gtktogglebutton.h b/libs/tk/ytk/ytk/gtktogglebutton.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtktogglebutton.h
rename to libs/tk/ytk/ytk/gtktogglebutton.h
index 931b013d04..3d66ec8260 100644
--- a/libs/tk/ytk/ytk/gtk/gtktogglebutton.h
+++ b/libs/tk/ytk/ytk/gtktogglebutton.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkbutton.h>
+#include <ytk/gtkbutton.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtktoggletoolbutton.h b/libs/tk/ytk/ytk/gtktoggletoolbutton.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtktoggletoolbutton.h
rename to libs/tk/ytk/ytk/gtktoggletoolbutton.h
index d90f6428f2..f25fc1ff37 100644
--- a/libs/tk/ytk/ytk/gtk/gtktoggletoolbutton.h
+++ b/libs/tk/ytk/ytk/gtktoggletoolbutton.h
@@ -24,10 +24,10 @@
 #define __GTK_TOGGLE_TOOL_BUTTON_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtktoolbutton.h>
+#include <ytk/gtktoolbutton.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktoolbar.h b/libs/tk/ytk/ytk/gtktoolbar.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtktoolbar.h
rename to libs/tk/ytk/ytk/gtktoolbar.h
index e519ec5343..81f7b82769 100644
--- a/libs/tk/ytk/ytk/gtk/gtktoolbar.h
+++ b/libs/tk/ytk/ytk/gtktoolbar.h
@@ -34,12 +34,12 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtktooltips.h>
-#include <gtk/gtktoolitem.h>
+#include <ytk/gtkcontainer.h>
+#include <ytk/gtktooltips.h>
+#include <ytk/gtktoolitem.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktoolbutton.h b/libs/tk/ytk/ytk/gtktoolbutton.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtktoolbutton.h
rename to libs/tk/ytk/ytk/gtktoolbutton.h
index fdb8273dbd..5477e7fe52 100644
--- a/libs/tk/ytk/ytk/gtk/gtktoolbutton.h
+++ b/libs/tk/ytk/ytk/gtktoolbutton.h
@@ -24,10 +24,10 @@
 #define __GTK_TOOL_BUTTON_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtktoolitem.h>
+#include <ytk/gtktoolitem.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktoolitem.h b/libs/tk/ytk/ytk/gtktoolitem.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtktoolitem.h
rename to libs/tk/ytk/ytk/gtktoolitem.h
index 0455ae58ac..95df1f2428 100644
--- a/libs/tk/ytk/ytk/gtk/gtktoolitem.h
+++ b/libs/tk/ytk/ytk/gtktoolitem.h
@@ -24,13 +24,13 @@
 #define __GTK_TOOL_ITEM_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkbin.h>
-#include <gtk/gtktooltips.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtksizegroup.h>
+#include <ytk/gtkbin.h>
+#include <ytk/gtktooltips.h>
+#include <ytk/gtkmenuitem.h>
+#include <ytk/gtksizegroup.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktoolitemgroup.h b/libs/tk/ytk/ytk/gtktoolitemgroup.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtktoolitemgroup.h
rename to libs/tk/ytk/ytk/gtktoolitemgroup.h
index 6b1c936ec6..c1e22b5275 100644
--- a/libs/tk/ytk/ytk/gtk/gtktoolitemgroup.h
+++ b/libs/tk/ytk/ytk/gtktoolitemgroup.h
@@ -23,11 +23,11 @@
 #define __GTK_TOOL_ITEM_GROUP_H__
 
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtktoolitem.h>
+#include <ytk/gtkcontainer.h>
+#include <ytk/gtktoolitem.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktoolpalette.h b/libs/tk/ytk/ytk/gtktoolpalette.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtktoolpalette.h
rename to libs/tk/ytk/ytk/gtktoolpalette.h
index 0959d45e2e..b62059039a 100644
--- a/libs/tk/ytk/ytk/gtk/gtktoolpalette.h
+++ b/libs/tk/ytk/ytk/gtktoolpalette.h
@@ -23,12 +23,12 @@
 #define __GTK_TOOL_PALETTE_H__
 
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtktoolitem.h>
+#include <ytk/gtkcontainer.h>
+#include <ytk/gtkdnd.h>
+#include <ytk/gtktoolitem.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktoolpaletteprivate.h b/libs/tk/ytk/ytk/gtktoolpaletteprivate.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtktoolpaletteprivate.h
rename to libs/tk/ytk/ytk/gtktoolpaletteprivate.h
index 6771d287c7..7752e3aa04 100644
--- a/libs/tk/ytk/ytk/gtk/gtktoolpaletteprivate.h
+++ b/libs/tk/ytk/ytk/gtktoolpaletteprivate.h
@@ -22,7 +22,7 @@
 #ifndef __GTK_TOOL_PALETTE_PRIVATE_H__
 #define __GTK_TOOL_PALETTE_PRIVATE_H__
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 void _gtk_tool_palette_get_item_size           (GtkToolPalette   *palette,
                                                 GtkRequisition   *item_size,
diff --git a/libs/tk/ytk/ytk/gtk/gtktoolshell.h b/libs/tk/ytk/ytk/gtktoolshell.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtktoolshell.h
rename to libs/tk/ytk/ytk/gtktoolshell.h
index c4c4d60fca..cff9228202 100644
--- a/libs/tk/ytk/ytk/gtk/gtktoolshell.h
+++ b/libs/tk/ytk/ytk/gtktoolshell.h
@@ -25,12 +25,12 @@
 
 
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkenums.h>
+#include <ytk/gtkenums.h>
 #include <pango/pango.h>
-#include <gtk/gtksizegroup.h>
+#include <ytk/gtksizegroup.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtktooltip.h b/libs/tk/ytk/ytk/gtktooltip.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtktooltip.h
rename to libs/tk/ytk/ytk/gtktooltip.h
index e65489e800..68b7f1b005 100644
--- a/libs/tk/ytk/ytk/gtk/gtktooltip.h
+++ b/libs/tk/ytk/ytk/gtktooltip.h
@@ -23,10 +23,10 @@
 #define __GTK_TOOLTIP_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkwindow.h>
+#include <ytk/gtkwindow.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktooltips.h b/libs/tk/ytk/ytk/gtktooltips.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtktooltips.h
rename to libs/tk/ytk/ytk/gtktooltips.h
index a86085652c..b44c9d7b21 100644
--- a/libs/tk/ytk/ytk/gtk/gtktooltips.h
+++ b/libs/tk/ytk/ytk/gtktooltips.h
@@ -29,8 +29,8 @@
 #ifndef __GTK_TOOLTIPS_H__
 #define __GTK_TOOLTIPS_H__
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkwindow.h>
+#include <ytk/gtkwidget.h>
+#include <ytk/gtkwindow.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtktrayicon.h b/libs/tk/ytk/ytk/gtktrayicon.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtktrayicon.h
rename to libs/tk/ytk/ytk/gtktrayicon.h
diff --git a/libs/tk/ytk/ytk/gtk/gtktreedatalist.h b/libs/tk/ytk/ytk/gtktreedatalist.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtktreedatalist.h
rename to libs/tk/ytk/ytk/gtktreedatalist.h
index cfd81b57d5..174a7e490c 100644
--- a/libs/tk/ytk/ytk/gtk/gtktreedatalist.h
+++ b/libs/tk/ytk/ytk/gtktreedatalist.h
@@ -20,7 +20,7 @@
 #ifndef __GTK_TREE_DATA_LIST_H__
 #define __GTK_TREE_DATA_LIST_H__
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 typedef struct _GtkTreeDataList GtkTreeDataList;
 struct _GtkTreeDataList
diff --git a/libs/tk/ytk/ytk/gtk/gtktreednd.h b/libs/tk/ytk/ytk/gtktreednd.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtktreednd.h
rename to libs/tk/ytk/ytk/gtktreednd.h
index aa0684f0b5..915f5748fd 100644
--- a/libs/tk/ytk/ytk/gtk/gtktreednd.h
+++ b/libs/tk/ytk/ytk/gtktreednd.h
@@ -21,11 +21,11 @@
 #define __GTK_TREE_DND_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtkdnd.h>
+#include <ytk/gtktreemodel.h>
+#include <ytk/gtkdnd.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktreemodel.h b/libs/tk/ytk/ytk/gtktreemodel.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtktreemodel.h
rename to libs/tk/ytk/ytk/gtktreemodel.h
index 1faff6468f..651d22b7ad 100644
--- a/libs/tk/ytk/ytk/gtk/gtktreemodel.h
+++ b/libs/tk/ytk/ytk/gtktreemodel.h
@@ -21,13 +21,13 @@
 #define __GTK_TREE_MODEL_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <glib-object.h>
 
 /* Not needed, retained for compatibility -Yosh */
-#include <gtk/gtkobject.h>
+#include <ytk/gtkobject.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktreemodelfilter.h b/libs/tk/ytk/ytk/gtktreemodelfilter.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtktreemodelfilter.h
rename to libs/tk/ytk/ytk/gtktreemodelfilter.h
index d8887584fe..f131c5d76a 100644
--- a/libs/tk/ytk/ytk/gtk/gtktreemodelfilter.h
+++ b/libs/tk/ytk/ytk/gtktreemodelfilter.h
@@ -22,11 +22,11 @@
 #define __GTK_TREE_MODEL_FILTER_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <gdkconfig.h>
-#include <gtk/gtktreemodel.h>
+#include <ytk/gtktreemodel.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktreemodelsort.h b/libs/tk/ytk/ytk/gtktreemodelsort.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtktreemodelsort.h
rename to libs/tk/ytk/ytk/gtktreemodelsort.h
index ca3dcc94fe..986c7ee6ab 100644
--- a/libs/tk/ytk/ytk/gtk/gtktreemodelsort.h
+++ b/libs/tk/ytk/ytk/gtktreemodelsort.h
@@ -21,12 +21,12 @@
 #define __GTK_TREE_MODEL_SORT_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <gdkconfig.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreesortable.h>
+#include <ytk/gtktreemodel.h>
+#include <ytk/gtktreesortable.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktreeprivate.h b/libs/tk/ytk/ytk/gtktreeprivate.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtktreeprivate.h
rename to libs/tk/ytk/ytk/gtktreeprivate.h
index 82c52da3e7..42139b69fc 100644
--- a/libs/tk/ytk/ytk/gtk/gtktreeprivate.h
+++ b/libs/tk/ytk/ytk/gtktreeprivate.h
@@ -24,9 +24,9 @@
 G_BEGIN_DECLS
 
 
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtkrbtree.h>
+#include <ytk/gtktreeview.h>
+#include <ytk/gtktreeselection.h>
+#include <ytk/gtkrbtree.h>
 
 #define TREE_VIEW_DRAG_WIDTH 6
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktreeselection.h b/libs/tk/ytk/ytk/gtktreeselection.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtktreeselection.h
rename to libs/tk/ytk/ytk/gtktreeselection.h
index 32038dcafa..7993439e97 100644
--- a/libs/tk/ytk/ytk/gtk/gtktreeselection.h
+++ b/libs/tk/ytk/ytk/gtktreeselection.h
@@ -21,10 +21,10 @@
 #define __GTK_TREE_SELECTION_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtktreeview.h>
+#include <ytk/gtktreeview.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktreesortable.h b/libs/tk/ytk/ytk/gtktreesortable.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtktreesortable.h
rename to libs/tk/ytk/ytk/gtktreesortable.h
index 968c42fb80..90c87cf95a 100644
--- a/libs/tk/ytk/ytk/gtk/gtktreesortable.h
+++ b/libs/tk/ytk/ytk/gtktreesortable.h
@@ -22,11 +22,11 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktypeutils.h>
+#include <ytk/gtktreemodel.h>
+#include <ytk/gtktypeutils.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtktreestore.h b/libs/tk/ytk/ytk/gtktreestore.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtktreestore.h
rename to libs/tk/ytk/ytk/gtktreestore.h
index 9e4f13dbc3..838f3de039 100644
--- a/libs/tk/ytk/ytk/gtk/gtktreestore.h
+++ b/libs/tk/ytk/ytk/gtktreestore.h
@@ -21,12 +21,12 @@
 #define __GTK_TREE_STORE_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <gdkconfig.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreesortable.h>
+#include <ytk/gtktreemodel.h>
+#include <ytk/gtktreesortable.h>
 #include <stdarg.h>
 
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktreeview.h b/libs/tk/ytk/ytk/gtktreeview.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtktreeview.h
rename to libs/tk/ytk/ytk/gtktreeview.h
index 23d8055f41..a49c6b7d40 100644
--- a/libs/tk/ytk/ytk/gtk/gtktreeview.h
+++ b/libs/tk/ytk/ytk/gtktreeview.h
@@ -21,14 +21,14 @@
 #define __GTK_TREE_VIEW_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcontainer.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreeviewcolumn.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtkentry.h>
+#include <ytk/gtkcontainer.h>
+#include <ytk/gtktreemodel.h>
+#include <ytk/gtktreeviewcolumn.h>
+#include <ytk/gtkdnd.h>
+#include <ytk/gtkentry.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtktreeviewcolumn.h b/libs/tk/ytk/ytk/gtktreeviewcolumn.h
similarity index 98%
rename from libs/tk/ytk/ytk/gtk/gtktreeviewcolumn.h
rename to libs/tk/ytk/ytk/gtktreeviewcolumn.h
index d36f6077f9..c34fa3b5ff 100644
--- a/libs/tk/ytk/ytk/gtk/gtktreeviewcolumn.h
+++ b/libs/tk/ytk/ytk/gtktreeviewcolumn.h
@@ -21,15 +21,15 @@
 #define __GTK_TREE_VIEW_COLUMN_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkcellrenderer.h>
-#include <gtk/gtktreemodel.h>
-#include <gtk/gtktreesortable.h>
+#include <ytk/gtkcellrenderer.h>
+#include <ytk/gtktreemodel.h>
+#include <ytk/gtktreesortable.h>
 
 /* Not needed, retained for compatibility -Yosh */
-#include <gtk/gtkobject.h>
+#include <ytk/gtkobject.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtktypebuiltins.h b/libs/tk/ytk/ytk/gtktypebuiltins.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtktypebuiltins.h
rename to libs/tk/ytk/ytk/gtktypebuiltins.h
index 06d75797b3..b0128ad51a 100644
--- a/libs/tk/ytk/ytk/gtk/gtktypebuiltins.h
+++ b/libs/tk/ytk/ytk/gtktypebuiltins.h
@@ -2,7 +2,7 @@
 /* This file is generated by glib-mkenums, do not modify it. This code is licensed under the same license as the containing project. Note that it links to GLib, so must comply with the LGPL linking clauses. */
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #ifndef __GTK_TYPE_BUILTINS_H__
diff --git a/libs/tk/ytk/ytk/gtk/gtktypeutils.h b/libs/tk/ytk/ytk/gtktypeutils.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtktypeutils.h
rename to libs/tk/ytk/ytk/gtktypeutils.h
index a8dcb72204..1019a434a8 100644
--- a/libs/tk/ytk/ytk/gtk/gtktypeutils.h
+++ b/libs/tk/ytk/ytk/gtktypeutils.h
@@ -28,12 +28,12 @@
 #define __GTK_TYPE_UTILS_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 /* enum types generated by glib-mkenums
  */
-#include <gtk/gtktypebuiltins.h>
+#include <ytk/gtktypebuiltins.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkuimanager.h b/libs/tk/ytk/ytk/gtkuimanager.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkuimanager.h
rename to libs/tk/ytk/ytk/gtkuimanager.h
index 5faa53c4a5..9ca40354be 100644
--- a/libs/tk/ytk/ytk/gtk/gtkuimanager.h
+++ b/libs/tk/ytk/ytk/gtkuimanager.h
@@ -32,13 +32,13 @@
 #define __GTK_UI_MANAGER_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkaccelgroup.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkaction.h>
-#include <gtk/gtkactiongroup.h>
+#include <ytk/gtkaccelgroup.h>
+#include <ytk/gtkwidget.h>
+#include <ytk/gtkaction.h>
+#include <ytk/gtkactiongroup.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkvbbox.h b/libs/tk/ytk/ytk/gtkvbbox.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkvbbox.h
rename to libs/tk/ytk/ytk/gtkvbbox.h
index 26f6990936..3b4083af11 100644
--- a/libs/tk/ytk/ytk/gtk/gtkvbbox.h
+++ b/libs/tk/ytk/ytk/gtkvbbox.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkbbox.h>
+#include <ytk/gtkbbox.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkvbox.h b/libs/tk/ytk/ytk/gtkvbox.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkvbox.h
rename to libs/tk/ytk/ytk/gtkvbox.h
index 7b6af6dbc2..b3416c3932 100644
--- a/libs/tk/ytk/ytk/gtk/gtkvbox.h
+++ b/libs/tk/ytk/ytk/gtkvbox.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkbox.h>
+#include <ytk/gtkbox.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkversion.h b/libs/tk/ytk/ytk/gtkversion.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkversion.h
rename to libs/tk/ytk/ytk/gtkversion.h
index 9d3eb91e13..b82bd7a726 100644
--- a/libs/tk/ytk/ytk/gtk/gtkversion.h
+++ b/libs/tk/ytk/ytk/gtkversion.h
@@ -25,7 +25,7 @@
  */
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #ifndef __GTK_VERSION_H__
diff --git a/libs/tk/ytk/ytk/gtk/gtkviewport.h b/libs/tk/ytk/ytk/gtkviewport.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkviewport.h
rename to libs/tk/ytk/ytk/gtkviewport.h
index ee74e34a95..995b2a4968 100644
--- a/libs/tk/ytk/ytk/gtk/gtkviewport.h
+++ b/libs/tk/ytk/ytk/gtkviewport.h
@@ -29,11 +29,11 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkbin.h>
+#include <ytk/gtkadjustment.h>
+#include <ytk/gtkbin.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkvpaned.h b/libs/tk/ytk/ytk/gtkvpaned.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkvpaned.h
rename to libs/tk/ytk/ytk/gtkvpaned.h
index 9f210f7144..3b8a3dda6e 100644
--- a/libs/tk/ytk/ytk/gtk/gtkvpaned.h
+++ b/libs/tk/ytk/ytk/gtkvpaned.h
@@ -28,10 +28,10 @@
 #define __GTK_VPANED_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkpaned.h>
+#include <ytk/gtkpaned.h>
 
 G_BEGIN_DECLS
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkvruler.h b/libs/tk/ytk/ytk/gtkvruler.h
similarity index 97%
rename from libs/tk/ytk/ytk/gtk/gtkvruler.h
rename to libs/tk/ytk/ytk/gtkvruler.h
index 9bff47c15e..186966a743 100644
--- a/libs/tk/ytk/ytk/gtk/gtkvruler.h
+++ b/libs/tk/ytk/ytk/gtkvruler.h
@@ -35,7 +35,7 @@
  */
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #ifndef GTK_DISABLE_DEPRECATED
@@ -44,7 +44,7 @@
 #define __GTK_VRULER_H__
 
 
-#include <gtk/gtkruler.h>
+#include <ytk/gtkruler.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkvscale.h b/libs/tk/ytk/ytk/gtkvscale.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkvscale.h
rename to libs/tk/ytk/ytk/gtkvscale.h
index b5d5d85d65..0dd7c98f06 100644
--- a/libs/tk/ytk/ytk/gtk/gtkvscale.h
+++ b/libs/tk/ytk/ytk/gtkvscale.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkscale.h>
+#include <ytk/gtkscale.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkvscrollbar.h b/libs/tk/ytk/ytk/gtkvscrollbar.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkvscrollbar.h
rename to libs/tk/ytk/ytk/gtkvscrollbar.h
index e7692af095..da19229747 100644
--- a/libs/tk/ytk/ytk/gtk/gtkvscrollbar.h
+++ b/libs/tk/ytk/ytk/gtkvscrollbar.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkscrollbar.h>
+#include <ytk/gtkscrollbar.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkvseparator.h b/libs/tk/ytk/ytk/gtkvseparator.h
similarity index 96%
rename from libs/tk/ytk/ytk/gtk/gtkvseparator.h
rename to libs/tk/ytk/ytk/gtkvseparator.h
index f41d491cc8..b603ec2d3b 100644
--- a/libs/tk/ytk/ytk/gtk/gtkvseparator.h
+++ b/libs/tk/ytk/ytk/gtkvseparator.h
@@ -29,10 +29,10 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkseparator.h>
+#include <ytk/gtkseparator.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkwidget.h b/libs/tk/ytk/ytk/gtkwidget.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtkwidget.h
rename to libs/tk/ytk/ytk/gtkwidget.h
index 6b7c520831..03909d9346 100644
--- a/libs/tk/ytk/ytk/gtk/gtkwidget.h
+++ b/libs/tk/ytk/ytk/gtkwidget.h
@@ -28,15 +28,15 @@
 #define __GTK_WIDGET_H__
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
 #include <ydk/gdk.h>
-#include <gtk/gtkaccelgroup.h>
-#include <gtk/gtkobject.h>
-#include <gtk/gtkadjustment.h>
-#include <gtk/gtkstyle.h>
-#include <gtk/gtksettings.h>
+#include <ytk/gtkaccelgroup.h>
+#include <ytk/gtkobject.h>
+#include <ytk/gtkadjustment.h>
+#include <ytk/gtkstyle.h>
+#include <ytk/gtksettings.h>
 #include <ztk/atk.h>
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkwin32embed.h b/libs/tk/ytk/ytk/gtkwin32embed.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtkwin32embed.h
rename to libs/tk/ytk/ytk/gtkwin32embed.h
diff --git a/libs/tk/ytk/ytk/gtk/gtkwin32embedwidget.h b/libs/tk/ytk/ytk/gtkwin32embedwidget.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtkwin32embedwidget.h
rename to libs/tk/ytk/ytk/gtkwin32embedwidget.h
index e07261c539..023f93bfe0 100644
--- a/libs/tk/ytk/ytk/gtk/gtkwin32embedwidget.h
+++ b/libs/tk/ytk/ytk/gtkwin32embedwidget.h
@@ -27,7 +27,7 @@
 #define __GTK_WIN32_EMBED_WIDGET_H__
 
 
-#include <gtk/gtkwindow.h>
+#include <ytk/gtkwindow.h>
 #include "ydk/gdkwin32.h"
 
 
diff --git a/libs/tk/ytk/ytk/gtk/gtkwindow-decorate.h b/libs/tk/ytk/ytk/gtkwindow-decorate.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtkwindow-decorate.h
rename to libs/tk/ytk/ytk/gtkwindow-decorate.h
diff --git a/libs/tk/ytk/ytk/gtk/gtkwindow.h b/libs/tk/ytk/ytk/gtkwindow.h
similarity index 99%
rename from libs/tk/ytk/ytk/gtk/gtkwindow.h
rename to libs/tk/ytk/ytk/gtkwindow.h
index 720be9d7a0..65ae25c9ce 100644
--- a/libs/tk/ytk/ytk/gtk/gtkwindow.h
+++ b/libs/tk/ytk/ytk/gtkwindow.h
@@ -29,11 +29,11 @@
 
 
 #if defined(GTK_DISABLE_SINGLE_INCLUDES) && !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gtk/gtk.h> can be included directly."
+#error "Only <ytk/ytk.h> can be included directly."
 #endif
 
-#include <gtk/gtkaccelgroup.h>
-#include <gtk/gtkbin.h>
+#include <ytk/gtkaccelgroup.h>
+#include <ytk/gtkbin.h>
 
 
 G_BEGIN_DECLS
diff --git a/libs/tk/ytk/ytk/gtk/gtkxembed.h b/libs/tk/ytk/ytk/gtkxembed.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/gtkxembed.h
rename to libs/tk/ytk/ytk/gtkxembed.h
diff --git a/libs/tk/ytk/ytk/gtk/stamp-gtkmarshal.h b/libs/tk/ytk/ytk/stamp-gtkmarshal.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/stamp-gtkmarshal.h
rename to libs/tk/ytk/ytk/stamp-gtkmarshal.h
diff --git a/libs/tk/ytk/ytk/gtk/stamp-gtkmarshalers.h b/libs/tk/ytk/ytk/stamp-gtkmarshalers.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/stamp-gtkmarshalers.h
rename to libs/tk/ytk/ytk/stamp-gtkmarshalers.h
diff --git a/libs/tk/ytk/ytk/gtk/stamp-gtktypebuiltins.h b/libs/tk/ytk/ytk/stamp-gtktypebuiltins.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/stamp-gtktypebuiltins.h
rename to libs/tk/ytk/ytk/stamp-gtktypebuiltins.h
diff --git a/libs/tk/ytk/ytk/gtk/xembed.h b/libs/tk/ytk/ytk/xembed.h
similarity index 100%
rename from libs/tk/ytk/ytk/gtk/xembed.h
rename to libs/tk/ytk/ytk/xembed.h
diff --git a/libs/tk/ytk/ytk/ytk.h b/libs/tk/ytk/ytk/ytk.h
new file mode 100644
index 0000000000..ccaf3a6bb3
--- /dev/null
+++ b/libs/tk/ytk/ytk/ytk.h
@@ -0,0 +1,219 @@
+/* GTK - The GIMP Toolkit
+ * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GTK+ Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
+#ifndef __GTK_H__
+#define __GTK_H__
+
+#define __GTK_H_INSIDE__
+
+#include <ydk/gdk.h>
+#include <ytk/gtkaboutdialog.h>
+#include <ytk/gtkaccelgroup.h>
+#include <ytk/gtkaccellabel.h>
+#include <ytk/gtkaccelmap.h>
+#include <ytk/gtkaccessible.h>
+#include <ytk/gtkaction.h>
+#include <ytk/gtkactiongroup.h>
+#include <ytk/gtkactivatable.h>
+#include <ytk/gtkadjustment.h>
+#include <ytk/gtkalignment.h>
+#include <ytk/gtkarrow.h>
+#include <ytk/gtkaspectframe.h>
+#include <ytk/gtkassistant.h>
+#include <ytk/gtkbbox.h>
+#include <ytk/gtkbin.h>
+#include <ytk/gtkbindings.h>
+#include <ytk/gtkbox.h>
+#include <ytk/gtkbuildable.h>
+#include <ytk/gtkbuilder.h>
+#include <ytk/gtkbutton.h>
+#include <ytk/gtkcelleditable.h>
+#include <ytk/gtkcelllayout.h>
+#include <ytk/gtkcellrenderer.h>
+#include <ytk/gtkcellrendereraccel.h>
+#include <ytk/gtkcellrenderercombo.h>
+#include <ytk/gtkcellrendererpixbuf.h>
+#include <ytk/gtkcellrendererprogress.h>
+#include <ytk/gtkcellrendererspin.h>
+#include <ytk/gtkcellrendererspinner.h>
+#include <ytk/gtkcellrenderertext.h>
+#include <ytk/gtkcellrenderertoggle.h>
+#include <ytk/gtkcellview.h>
+#include <ytk/gtkcheckbutton.h>
+#include <ytk/gtkcheckmenuitem.h>
+#include <ytk/gtkclipboard.h>
+#include <ytk/gtkcolorbutton.h>
+#include <ytk/gtkcolorsel.h>
+#include <ytk/gtkcolorseldialog.h>
+#include <ytk/gtkcombobox.h>
+#include <ytk/gtkcomboboxentry.h>
+#include <ytk/gtkcomboboxtext.h>
+#include <ytk/gtkcontainer.h>
+#include <ytk/gtkdebug.h>
+#include <ytk/gtkdialog.h>
+#include <ytk/gtkdnd.h>
+#include <ytk/gtkdrawingarea.h>
+#include <ytk/gtkeditable.h>
+#include <ytk/gtkentry.h>
+#include <ytk/gtkentrybuffer.h>
+#include <ytk/gtkentrycompletion.h>
+#include <ytk/gtkenums.h>
+#include <ytk/gtkeventbox.h>
+#include <ytk/gtkexpander.h>
+#include <ytk/gtkfixed.h>
+#include <ytk/gtkfilechooser.h>
+#include <ytk/gtkfilechooserbutton.h>
+#include <ytk/gtkfilechooserdialog.h>
+#include <ytk/gtkfilechooserwidget.h>
+#include <ytk/gtkfilefilter.h>
+#include <ytk/gtkfontbutton.h>
+#include <ytk/gtkfontsel.h>
+#include <ytk/gtkframe.h>
+#include <ytk/gtkgc.h>
+#include <ytk/gtkhandlebox.h>
+#include <ytk/gtkhbbox.h>
+#include <ytk/gtkhbox.h>
+#include <ytk/gtkhpaned.h>
+#include <ytk/gtkhruler.h>
+#include <ytk/gtkhscale.h>
+#include <ytk/gtkhscrollbar.h>
+#include <ytk/gtkhseparator.h>
+#include <ytk/gtkhsv.h>
+#include <ytk/gtkiconfactory.h>
+#include <ytk/gtkicontheme.h>
+#include <ytk/gtkiconview.h>
+#include <ytk/gtkimage.h>
+#include <ytk/gtkimagemenuitem.h>
+#include <ytk/gtkimcontext.h>
+#include <ytk/gtkimcontextsimple.h>
+#include <ytk/gtkimmulticontext.h>
+#include <ytk/gtkinfobar.h>
+#include <ytk/gtkinvisible.h>
+#include <ytk/gtkitem.h>
+#include <ytk/gtklabel.h>
+#include <ytk/gtklayout.h>
+#include <ytk/gtklinkbutton.h>
+#include <ytk/gtkliststore.h>
+#include <ytk/gtkmain.h>
+#include <ytk/gtkmenu.h>
+#include <ytk/gtkmenubar.h>
+#include <ytk/gtkmenuitem.h>
+#include <ytk/gtkmenushell.h>
+#include <ytk/gtkmenutoolbutton.h>
+#include <ytk/gtkmessagedialog.h>
+#include <ytk/gtkmisc.h>
+#include <ytk/gtkmodules.h>
+#include <ytk/gtkmountoperation.h>
+#include <ytk/gtknotebook.h>
+#include <ytk/gtkobject.h>
+#include <ytk/gtkoffscreenwindow.h>
+#include <ytk/gtkorientable.h>
+#include <ytk/gtkpaned.h>
+#include <ytk/gtkplug.h>
+#include <ytk/gtkprogressbar.h>
+#include <ytk/gtkradioaction.h>
+#include <ytk/gtkradiobutton.h>
+#include <ytk/gtkradiomenuitem.h>
+#include <ytk/gtkradiotoolbutton.h>
+#include <ytk/gtkrange.h>
+#include <ytk/gtkrc.h>
+#include <ytk/gtkrecentaction.h>
+#include <ytk/gtkrecentchooser.h>
+#include <ytk/gtkrecentchooserdialog.h>
+#include <ytk/gtkrecentchoosermenu.h>
+#include <ytk/gtkrecentchooserwidget.h>
+#include <ytk/gtkrecentfilter.h>
+#include <ytk/gtkrecentmanager.h>
+#include <ytk/gtkruler.h>
+#include <ytk/gtkscale.h>
+#include <ytk/gtkscalebutton.h>
+#include <ytk/gtkscrollbar.h>
+#include <ytk/gtkscrolledwindow.h>
+#include <ytk/gtkselection.h>
+#include <ytk/gtkseparator.h>
+#include <ytk/gtkseparatormenuitem.h>
+#include <ytk/gtkseparatortoolitem.h>
+#include <ytk/gtksettings.h>
+#include <ytk/gtkshow.h>
+#include <ytk/gtksizegroup.h>
+#include <ytk/gtksocket.h>
+#include <ytk/gtkspinbutton.h>
+#include <ytk/gtkspinner.h>
+#include <ytk/gtkstatusbar.h>
+#include <ytk/gtkstock.h>
+#include <ytk/gtkstyle.h>
+#include <ytk/gtktable.h>
+#include <ytk/gtktearoffmenuitem.h>
+#include <ytk/gtktextbuffer.h>
+#include <ytk/gtktextbufferrichtext.h>
+#include <ytk/gtktextchild.h>
+#include <ytk/gtktextiter.h>
+#include <ytk/gtktextmark.h>
+#include <ytk/gtktexttag.h>
+#include <ytk/gtktexttagtable.h>
+#include <ytk/gtktextview.h>
+#include <ytk/gtktoggleaction.h>
+#include <ytk/gtktogglebutton.h>
+#include <ytk/gtktoggletoolbutton.h>
+#include <ytk/gtktoolbar.h>
+#include <ytk/gtktoolbutton.h>
+#include <ytk/gtktoolitem.h>
+#include <ytk/gtktoolitemgroup.h>
+#include <ytk/gtktoolpalette.h>
+#include <ytk/gtktoolshell.h>
+#include <ytk/gtktooltip.h>
+#include <ytk/gtktestutils.h>
+#include <ytk/gtktreednd.h>
+#include <ytk/gtktreemodel.h>
+#include <ytk/gtktreemodelfilter.h>
+#include <ytk/gtktreemodelsort.h>
+#include <ytk/gtktreeselection.h>
+#include <ytk/gtktreesortable.h>
+#include <ytk/gtktreestore.h>
+#include <ytk/gtktreeview.h>
+#include <ytk/gtktreeviewcolumn.h>
+#include <ytk/gtktypeutils.h>
+#include <ytk/gtkuimanager.h>
+#include <ytk/gtkvbbox.h>
+#include <ytk/gtkvbox.h>
+#include <ytk/gtkversion.h>
+#include <ytk/gtkviewport.h>
+#include <ytk/gtkvpaned.h>
+#include <ytk/gtkvruler.h>
+#include <ytk/gtkvscale.h>
+#include <ytk/gtkvscrollbar.h>
+#include <ytk/gtkvseparator.h>
+#include <ytk/gtkwidget.h>
+#include <ytk/gtkwindow.h>
+
+/* Deprecated */
+#include <ytk/gtkoptionmenu.h>
+#include <ytk/gtkprogress.h>
+#include <ytk/gtktooltips.h>
+
+#undef __GTK_H_INSIDE__
+
+#endif /* __GTK_H__ */
diff --git a/libs/tk/ytkmm/aboutdialog.cc b/libs/tk/ytkmm/aboutdialog.cc
index bc289583ed..f3a001ded9 100644
--- a/libs/tk/ytkmm/aboutdialog.cc
+++ b/libs/tk/ytkmm/aboutdialog.cc
@@ -31,7 +31,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 #ifndef GTKMM_DISABLE_DEPRECATED
 
diff --git a/libs/tk/ytkmm/accelgroup.cc b/libs/tk/ytkmm/accelgroup.cc
index b4262cbaca..7da2d843d9 100644
--- a/libs/tk/ytkmm/accelgroup.cc
+++ b/libs/tk/ytkmm/accelgroup.cc
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/accellabel.cc b/libs/tk/ytkmm/accellabel.cc
index 5bbb2e5170..57455aad6f 100644
--- a/libs/tk/ytkmm/accellabel.cc
+++ b/libs/tk/ytkmm/accellabel.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <glibmm/wrap.h>
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/accelmap.cc b/libs/tk/ytkmm/accelmap.cc
index 6b998e0b69..f26a0781b3 100644
--- a/libs/tk/ytkmm/accelmap.cc
+++ b/libs/tk/ytkmm/accelmap.cc
@@ -22,7 +22,7 @@
 #include <glibmm/arrayhandle.h>
 #include <glibmm/listhandle.h>
 #include <gtkmm/accelmap.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/action.cc b/libs/tk/ytkmm/action.cc
index 2559533295..d946a90817 100644
--- a/libs/tk/ytkmm/action.cc
+++ b/libs/tk/ytkmm/action.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 #include <gtkmm/menu.h>
 #include <gtkmm/menuitem.h>
diff --git a/libs/tk/ytkmm/actiongroup.cc b/libs/tk/ytkmm/actiongroup.cc
index 56b28d2f21..b32a4e3754 100644
--- a/libs/tk/ytkmm/actiongroup.cc
+++ b/libs/tk/ytkmm/actiongroup.cc
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <gtkmm/accelmap.h>
 
 
diff --git a/libs/tk/ytkmm/activatable.cc b/libs/tk/ytkmm/activatable.cc
index 7652af0eb5..876646468f 100644
--- a/libs/tk/ytkmm/activatable.cc
+++ b/libs/tk/ytkmm/activatable.cc
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace
diff --git a/libs/tk/ytkmm/adjustment.cc b/libs/tk/ytkmm/adjustment.cc
index 4a2c9c059a..318a334f8a 100644
--- a/libs/tk/ytkmm/adjustment.cc
+++ b/libs/tk/ytkmm/adjustment.cc
@@ -28,7 +28,7 @@
  * License along with this library; if not, write to the Free
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/alignment.cc b/libs/tk/ytkmm/alignment.cc
index 61cb28f8f8..c2d6c238c7 100644
--- a/libs/tk/ytkmm/alignment.cc
+++ b/libs/tk/ytkmm/alignment.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/arrow.cc b/libs/tk/ytkmm/arrow.cc
index 08525ef05e..a0af67fbdb 100644
--- a/libs/tk/ytkmm/arrow.cc
+++ b/libs/tk/ytkmm/arrow.cc
@@ -28,7 +28,7 @@
  * License along with this library; if not, write to the Free
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/aspectframe.cc b/libs/tk/ytkmm/aspectframe.cc
index 6e9e9815df..05c6829bbf 100644
--- a/libs/tk/ytkmm/aspectframe.cc
+++ b/libs/tk/ytkmm/aspectframe.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace
 {
diff --git a/libs/tk/ytkmm/assistant.cc b/libs/tk/ytkmm/assistant.cc
index 820c79358c..7e2e969ce0 100644
--- a/libs/tk/ytkmm/assistant.cc
+++ b/libs/tk/ytkmm/assistant.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 static gint SignalProxy_SlotForwardPage_gtk_callback(gint current_page, gpointer data)
diff --git a/libs/tk/ytkmm/bin.cc b/libs/tk/ytkmm/bin.cc
index b986a0f22d..6f0be4b1f4 100644
--- a/libs/tk/ytkmm/bin.cc
+++ b/libs/tk/ytkmm/bin.cc
@@ -37,7 +37,7 @@
 #include <gtkmm/adjustment.h>
 #include <gtkmm/label.h>
 #include <gtkmm/image.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/box.cc b/libs/tk/ytkmm/box.cc
index fa1ded2b88..8da66b1b9a 100644
--- a/libs/tk/ytkmm/box.cc
+++ b/libs/tk/ytkmm/box.cc
@@ -33,7 +33,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <glibmm/wrap.h>
 
 
diff --git a/libs/tk/ytkmm/builder.cc b/libs/tk/ytkmm/builder.cc
index f07cef4855..d386d96953 100644
--- a/libs/tk/ytkmm/builder.cc
+++ b/libs/tk/ytkmm/builder.cc
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 // Allow GtkBuilder to instantiate a gtkmm derived GType instead of the regular 
 // GTK+ GType, so we can, for instance, use our vfuncs and default signal handlers.
diff --git a/libs/tk/ytkmm/button.cc b/libs/tk/ytkmm/button.cc
index 1c2d564432..0089e21541 100644
--- a/libs/tk/ytkmm/button.cc
+++ b/libs/tk/ytkmm/button.cc
@@ -33,7 +33,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <gtkmm/stock.h>
 
 
diff --git a/libs/tk/ytkmm/buttonbox.cc b/libs/tk/ytkmm/buttonbox.cc
index 96181aca8f..76682fcea6 100644
--- a/libs/tk/ytkmm/buttonbox.cc
+++ b/libs/tk/ytkmm/buttonbox.cc
@@ -34,7 +34,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/celleditable.cc b/libs/tk/ytkmm/celleditable.cc
index 3dc3d2087d..e692c057d8 100644
--- a/libs/tk/ytkmm/celleditable.cc
+++ b/libs/tk/ytkmm/celleditable.cc
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace
diff --git a/libs/tk/ytkmm/celllayout.cc b/libs/tk/ytkmm/celllayout.cc
index 48958cef46..7408defc81 100644
--- a/libs/tk/ytkmm/celllayout.cc
+++ b/libs/tk/ytkmm/celllayout.cc
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 static void SignalProxy_CellData_gtk_callback(GtkCellLayout* /* cell_layout */, GtkCellRenderer* /* cell */, GtkTreeModel* tree_model, GtkTreeIter* iter, gpointer data)
diff --git a/libs/tk/ytkmm/cellrenderer.cc b/libs/tk/ytkmm/cellrenderer.cc
index 375c9659d8..67312e78bb 100644
--- a/libs/tk/ytkmm/cellrenderer.cc
+++ b/libs/tk/ytkmm/cellrenderer.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/cellrendereraccel.cc b/libs/tk/ytkmm/cellrendereraccel.cc
index c3d219b8ac..0d715a99b5 100644
--- a/libs/tk/ytkmm/cellrendereraccel.cc
+++ b/libs/tk/ytkmm/cellrendereraccel.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
  
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/cellrenderercombo.cc b/libs/tk/ytkmm/cellrenderercombo.cc
index 2a3ccdabae..0d11f9c5a2 100644
--- a/libs/tk/ytkmm/cellrenderercombo.cc
+++ b/libs/tk/ytkmm/cellrenderercombo.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
  
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 ///This is used only by signal_changed's generated implementation.
 static GtkTreeModel* _get_model(GtkCellRendererCombo* renderer)
diff --git a/libs/tk/ytkmm/cellrendererpixbuf.cc b/libs/tk/ytkmm/cellrendererpixbuf.cc
index 37982e5964..4724aabd44 100644
--- a/libs/tk/ytkmm/cellrendererpixbuf.cc
+++ b/libs/tk/ytkmm/cellrendererpixbuf.cc
@@ -28,7 +28,7 @@
  * License along with this library; if not, write to the Free
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/cellrendererprogress.cc b/libs/tk/ytkmm/cellrendererprogress.cc
index 11f771db99..eb16037f08 100644
--- a/libs/tk/ytkmm/cellrendererprogress.cc
+++ b/libs/tk/ytkmm/cellrendererprogress.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
  
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/cellrendererspin.cc b/libs/tk/ytkmm/cellrendererspin.cc
index 96952f8250..c2d3ae803e 100644
--- a/libs/tk/ytkmm/cellrendererspin.cc
+++ b/libs/tk/ytkmm/cellrendererspin.cc
@@ -24,7 +24,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/cellrendererspinner.cc b/libs/tk/ytkmm/cellrendererspinner.cc
index b90b4c48a0..ef3329cd65 100644
--- a/libs/tk/ytkmm/cellrendererspinner.cc
+++ b/libs/tk/ytkmm/cellrendererspinner.cc
@@ -6,7 +6,7 @@
 #include <gtkmm/cellrendererspinner.h>
 #include <gtkmm/private/cellrendererspinner_p.h>
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 // -*- c++ -*-
 
diff --git a/libs/tk/ytkmm/cellrenderertext.cc b/libs/tk/ytkmm/cellrenderertext.cc
index 15df92de30..81392d4bda 100644
--- a/libs/tk/ytkmm/cellrenderertext.cc
+++ b/libs/tk/ytkmm/cellrenderertext.cc
@@ -28,7 +28,7 @@
  * License along with this library; if not, write to the Free
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/cellrenderertoggle.cc b/libs/tk/ytkmm/cellrenderertoggle.cc
index a3b060f635..539f31cee4 100644
--- a/libs/tk/ytkmm/cellrenderertoggle.cc
+++ b/libs/tk/ytkmm/cellrenderertoggle.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/cellview.cc b/libs/tk/ytkmm/cellview.cc
index 79acdbf5a0..35d6595ea3 100644
--- a/libs/tk/ytkmm/cellview.cc
+++ b/libs/tk/ytkmm/cellview.cc
@@ -33,7 +33,7 @@
 
 #include <gtkmm/cellrenderertext.h>
 #include <gtkmm/cellrendererpixbuf.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/checkbutton.cc b/libs/tk/ytkmm/checkbutton.cc
index 80f3438e56..fca6e8cc05 100644
--- a/libs/tk/ytkmm/checkbutton.cc
+++ b/libs/tk/ytkmm/checkbutton.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/checkmenuitem.cc b/libs/tk/ytkmm/checkmenuitem.cc
index 4bcf831271..75afd986dd 100644
--- a/libs/tk/ytkmm/checkmenuitem.cc
+++ b/libs/tk/ytkmm/checkmenuitem.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <gtkmm/misc.h>
 #include <gtkmm/label.h>
 
diff --git a/libs/tk/ytkmm/clipboard.cc b/libs/tk/ytkmm/clipboard.cc
index 650b60eaeb..22ccf62e7f 100644
--- a/libs/tk/ytkmm/clipboard.cc
+++ b/libs/tk/ytkmm/clipboard.cc
@@ -28,7 +28,7 @@
 
 #include <gtkmm/textbuffer.h>
 #include <gtkmm/selectiondata_private.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace
 {
diff --git a/libs/tk/ytkmm/colorbutton.cc b/libs/tk/ytkmm/colorbutton.cc
index 786e52015d..9db046a4c6 100644
--- a/libs/tk/ytkmm/colorbutton.cc
+++ b/libs/tk/ytkmm/colorbutton.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <gdkmm/color.h>
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/colorselection.cc b/libs/tk/ytkmm/colorselection.cc
index 9a5bf224d9..a678d685ff 100644
--- a/libs/tk/ytkmm/colorselection.cc
+++ b/libs/tk/ytkmm/colorselection.cc
@@ -31,7 +31,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace
diff --git a/libs/tk/ytkmm/combobox.cc b/libs/tk/ytkmm/combobox.cc
index 66165843c9..7e1383a77c 100644
--- a/libs/tk/ytkmm/combobox.cc
+++ b/libs/tk/ytkmm/combobox.cc
@@ -32,7 +32,7 @@
 #include <gtkmm/liststore.h>
 #include <gtkmm/cellrenderertext.h>
 #include <gtkmm/treeview_private.h> //For SignalProxy_RowSeparator.
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/comboboxentry.cc b/libs/tk/ytkmm/comboboxentry.cc
index fca5ce2683..3769c4a799 100644
--- a/libs/tk/ytkmm/comboboxentry.cc
+++ b/libs/tk/ytkmm/comboboxentry.cc
@@ -33,7 +33,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/comboboxentrytext.cc b/libs/tk/ytkmm/comboboxentrytext.cc
index 6515c2b184..3a596f5c2c 100644
--- a/libs/tk/ytkmm/comboboxentrytext.cc
+++ b/libs/tk/ytkmm/comboboxentrytext.cc
@@ -31,7 +31,7 @@
 
 #include <gtkmm/liststore.h>
 #include <gtkmm/cellrenderertext.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/comboboxtext.cc b/libs/tk/ytkmm/comboboxtext.cc
index 680321047c..55ebd915e5 100644
--- a/libs/tk/ytkmm/comboboxtext.cc
+++ b/libs/tk/ytkmm/comboboxtext.cc
@@ -28,7 +28,7 @@
 
 #include <gtkmm/liststore.h>
 #include <gtkmm/cellrenderertext.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/container.cc b/libs/tk/ytkmm/container.cc
index 6b5ddbd99c..35b8b5ad31 100644
--- a/libs/tk/ytkmm/container.cc
+++ b/libs/tk/ytkmm/container.cc
@@ -28,7 +28,7 @@
  */
 
 #include <gtkmm/adjustment.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace
diff --git a/libs/tk/ytkmm/dialog.cc b/libs/tk/ytkmm/dialog.cc
index acd20cdefb..00d08c1705 100644
--- a/libs/tk/ytkmm/dialog.cc
+++ b/libs/tk/ytkmm/dialog.cc
@@ -6,7 +6,7 @@
 #include <gtkmm/dialog.h>
 #include <gtkmm/private/dialog_p.h>
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 // -*- c++ -*-
 /* $Id: dialog.ccg,v 1.3 2004/11/21 20:54:20 murrayc Exp $ */
@@ -28,7 +28,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/drawingarea.cc b/libs/tk/ytkmm/drawingarea.cc
index daa5c78dd5..b096d4c056 100644
--- a/libs/tk/ytkmm/drawingarea.cc
+++ b/libs/tk/ytkmm/drawingarea.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace
diff --git a/libs/tk/ytkmm/editable.cc b/libs/tk/ytkmm/editable.cc
index 4fbc46b0dc..7a5cd235e9 100644
--- a/libs/tk/ytkmm/editable.cc
+++ b/libs/tk/ytkmm/editable.cc
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace
diff --git a/libs/tk/ytkmm/entry.cc b/libs/tk/ytkmm/entry.cc
index 376ce1507b..893963858b 100644
--- a/libs/tk/ytkmm/entry.cc
+++ b/libs/tk/ytkmm/entry.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/entrybuffer.cc b/libs/tk/ytkmm/entrybuffer.cc
index 5040f291cb..f7c96bd2ff 100644
--- a/libs/tk/ytkmm/entrybuffer.cc
+++ b/libs/tk/ytkmm/entrybuffer.cc
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <glib.h>
 
 
diff --git a/libs/tk/ytkmm/entrycompletion.cc b/libs/tk/ytkmm/entrycompletion.cc
index 62f000fc46..fb0de904e5 100644
--- a/libs/tk/ytkmm/entrycompletion.cc
+++ b/libs/tk/ytkmm/entrycompletion.cc
@@ -29,7 +29,7 @@
 
 #include <gtkmm/treeiter.h>
 #include <gtkmm/entry.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 static gboolean SignalProxy_Match_gtk_callback(GtkEntryCompletion* completion, const gchar* key, GtkTreeIter* iter, gpointer user_data)
diff --git a/libs/tk/ytkmm/enums.cc b/libs/tk/ytkmm/enums.cc
index 736b66a194..9ccfc985c2 100644
--- a/libs/tk/ytkmm/enums.cc
+++ b/libs/tk/ytkmm/enums.cc
@@ -6,7 +6,7 @@
 #include <gtkmm/enums.h>
 #include <gtkmm/private/enums_p.h>
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 // -*- c++ -*-
 /* $Id: enums.ccg,v 1.1 2003/01/21 13:38:48 murrayc Exp $ */
diff --git a/libs/tk/ytkmm/eventbox.cc b/libs/tk/ytkmm/eventbox.cc
index 3c912baebb..279f719618 100644
--- a/libs/tk/ytkmm/eventbox.cc
+++ b/libs/tk/ytkmm/eventbox.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace
 {
diff --git a/libs/tk/ytkmm/expander.cc b/libs/tk/ytkmm/expander.cc
index 524f5c51e6..e23ead070c 100644
--- a/libs/tk/ytkmm/expander.cc
+++ b/libs/tk/ytkmm/expander.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/filechooser.cc b/libs/tk/ytkmm/filechooser.cc
index 4eb2a63e17..b600fecebc 100644
--- a/libs/tk/ytkmm/filechooser.cc
+++ b/libs/tk/ytkmm/filechooser.cc
@@ -27,8 +27,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
-//#include <gtk/gtkfilesystem.h> //We include this semi-private header just to get GTK_FILE_SYSTEM_ERROR.
+#include <ytk/ytk.h>
+//#include <ytk/gtkfilesystem.h> //We include this semi-private header just to get GTK_FILE_SYSTEM_ERROR.
 
 
 namespace
diff --git a/libs/tk/ytkmm/filechooserbutton.cc b/libs/tk/ytkmm/filechooserbutton.cc
index 74945ddf30..caf3788d57 100644
--- a/libs/tk/ytkmm/filechooserbutton.cc
+++ b/libs/tk/ytkmm/filechooserbutton.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/filechooserdialog.cc b/libs/tk/ytkmm/filechooserdialog.cc
index 9d91c6975d..8dd2e648d3 100644
--- a/libs/tk/ytkmm/filechooserdialog.cc
+++ b/libs/tk/ytkmm/filechooserdialog.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/filechooserwidget.cc b/libs/tk/ytkmm/filechooserwidget.cc
index 692e58ce68..af520c3469 100644
--- a/libs/tk/ytkmm/filechooserwidget.cc
+++ b/libs/tk/ytkmm/filechooserwidget.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/filefilter.cc b/libs/tk/ytkmm/filefilter.cc
index aa55634579..d8aa37ce9b 100644
--- a/libs/tk/ytkmm/filefilter.cc
+++ b/libs/tk/ytkmm/filefilter.cc
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h> //For gtk_file_filter_flags_get_type().
+#include <ytk/ytk.h> //For gtk_file_filter_flags_get_type().
 
 static gboolean SignalProxy_Custom_gtk_callback(const GtkFileFilterInfo* filter_info, gpointer data)
 {
diff --git a/libs/tk/ytkmm/fixed.cc b/libs/tk/ytkmm/fixed.cc
index ba5b3f6c0b..4fd24de461 100644
--- a/libs/tk/ytkmm/fixed.cc
+++ b/libs/tk/ytkmm/fixed.cc
@@ -32,7 +32,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/fontbutton.cc b/libs/tk/ytkmm/fontbutton.cc
index 284998f6d1..d4cf915ff1 100644
--- a/libs/tk/ytkmm/fontbutton.cc
+++ b/libs/tk/ytkmm/fontbutton.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/fontselection.cc b/libs/tk/ytkmm/fontselection.cc
index 2221d95678..8b98428e83 100644
--- a/libs/tk/ytkmm/fontselection.cc
+++ b/libs/tk/ytkmm/fontselection.cc
@@ -37,7 +37,7 @@
 #include <gtkmm/entry.h>
 #include <gtkmm/radiobutton.h>
 #include <gtkmm/treeview.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace
diff --git a/libs/tk/ytkmm/frame.cc b/libs/tk/ytkmm/frame.cc
index 7fa317da06..8e5d44171d 100644
--- a/libs/tk/ytkmm/frame.cc
+++ b/libs/tk/ytkmm/frame.cc
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/handlebox.cc b/libs/tk/ytkmm/handlebox.cc
index bd11b3b78b..246790b623 100644
--- a/libs/tk/ytkmm/handlebox.cc
+++ b/libs/tk/ytkmm/handlebox.cc
@@ -33,7 +33,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <gdkmm/window.h>
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/iconfactory.cc b/libs/tk/ytkmm/iconfactory.cc
index f0a2cbcc4a..873f22b38b 100644
--- a/libs/tk/ytkmm/iconfactory.cc
+++ b/libs/tk/ytkmm/iconfactory.cc
@@ -30,7 +30,7 @@
  */
 
 #include <gtkmm/settings.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/iconinfo.cc b/libs/tk/ytkmm/iconinfo.cc
index d780719c01..b288c1d593 100644
--- a/libs/tk/ytkmm/iconinfo.cc
+++ b/libs/tk/ytkmm/iconinfo.cc
@@ -25,7 +25,7 @@
  */
 
 #include <gtkmm/icontheme.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/iconset.cc b/libs/tk/ytkmm/iconset.cc
index 2a76597add..881058ab91 100644
--- a/libs/tk/ytkmm/iconset.cc
+++ b/libs/tk/ytkmm/iconset.cc
@@ -31,7 +31,7 @@
 
 #include <gtkmm/widget.h>
 #include <gtkmm/style.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/iconsource.cc b/libs/tk/ytkmm/iconsource.cc
index 11fcd9980e..6edf8e00b0 100644
--- a/libs/tk/ytkmm/iconsource.cc
+++ b/libs/tk/ytkmm/iconsource.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace
 {
diff --git a/libs/tk/ytkmm/icontheme.cc b/libs/tk/ytkmm/icontheme.cc
index 17f26c996e..75bfdc91bb 100644
--- a/libs/tk/ytkmm/icontheme.cc
+++ b/libs/tk/ytkmm/icontheme.cc
@@ -24,7 +24,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h> //For gtk_icon_theme_error_get_type().
+#include <ytk/ytk.h> //For gtk_icon_theme_error_get_type().
 
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/iconview.cc b/libs/tk/ytkmm/iconview.cc
index c2b568e313..cf4d16f25f 100644
--- a/libs/tk/ytkmm/iconview.cc
+++ b/libs/tk/ytkmm/iconview.cc
@@ -28,7 +28,7 @@
  */
 
 #include <gtkmm/adjustment.h> 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace //anonymous namespace
 {
diff --git a/libs/tk/ytkmm/image.cc b/libs/tk/ytkmm/image.cc
index 99c0445064..3779ccacc6 100644
--- a/libs/tk/ytkmm/image.cc
+++ b/libs/tk/ytkmm/image.cc
@@ -6,7 +6,7 @@
 #include <gtkmm/image.h>
 #include <gtkmm/private/image_p.h>
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 // -*- c++ -*-
 /* $Id: image.ccg,v 1.3 2005/07/10 19:24:22 murrayc Exp $ */
@@ -30,7 +30,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <gdkmm/image.h>
 #include <gdkmm/bitmap.h>
 #include <gdkmm/pixmap.h>
diff --git a/libs/tk/ytkmm/imagemenuitem.cc b/libs/tk/ytkmm/imagemenuitem.cc
index b883b301fd..7b0a0398bf 100644
--- a/libs/tk/ytkmm/imagemenuitem.cc
+++ b/libs/tk/ytkmm/imagemenuitem.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 #include <gtkmm/image.h>
 #include <gtkmm/stock.h>
diff --git a/libs/tk/ytkmm/infobar.cc b/libs/tk/ytkmm/infobar.cc
index 338c173325..142100bb44 100644
--- a/libs/tk/ytkmm/infobar.cc
+++ b/libs/tk/ytkmm/infobar.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/invisible.cc b/libs/tk/ytkmm/invisible.cc
index f09c9574db..9296081f21 100644
--- a/libs/tk/ytkmm/invisible.cc
+++ b/libs/tk/ytkmm/invisible.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/item.cc b/libs/tk/ytkmm/item.cc
index f3f465f69a..141ad2c70b 100644
--- a/libs/tk/ytkmm/item.cc
+++ b/libs/tk/ytkmm/item.cc
@@ -31,7 +31,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace
diff --git a/libs/tk/ytkmm/label.cc b/libs/tk/ytkmm/label.cc
index 9110b576f7..2e72ee77f6 100644
--- a/libs/tk/ytkmm/label.cc
+++ b/libs/tk/ytkmm/label.cc
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <gtkmm/menu.h>
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/layout.cc b/libs/tk/ytkmm/layout.cc
index de1153256a..a2d91b71c6 100644
--- a/libs/tk/ytkmm/layout.cc
+++ b/libs/tk/ytkmm/layout.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/linkbutton.cc b/libs/tk/ytkmm/linkbutton.cc
index abcbeef42f..e4e2fd4724 100644
--- a/libs/tk/ytkmm/linkbutton.cc
+++ b/libs/tk/ytkmm/linkbutton.cc
@@ -31,7 +31,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 #ifndef GTKMM_DISABLE_DEPRECATED
 
diff --git a/libs/tk/ytkmm/liststore.cc b/libs/tk/ytkmm/liststore.cc
index 3e9f44a354..579f8e9775 100644
--- a/libs/tk/ytkmm/liststore.cc
+++ b/libs/tk/ytkmm/liststore.cc
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/menu.cc b/libs/tk/ytkmm/menu.cc
index a24ebdecb4..274cef4051 100644
--- a/libs/tk/ytkmm/menu.cc
+++ b/libs/tk/ytkmm/menu.cc
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <gtkmm/accelgroup.h>
 
 
diff --git a/libs/tk/ytkmm/menu_elems.cc b/libs/tk/ytkmm/menu_elems.cc
index 7fd8083522..148d8cba05 100644
--- a/libs/tk/ytkmm/menu_elems.cc
+++ b/libs/tk/ytkmm/menu_elems.cc
@@ -22,7 +22,7 @@
 
 #include <gtkmm/menu_elems.h>
 #include <gtkmm/label.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 #ifndef GLIBMM_WIN32
diff --git a/libs/tk/ytkmm/menubar.cc b/libs/tk/ytkmm/menubar.cc
index 950c4e97ad..88ef066156 100644
--- a/libs/tk/ytkmm/menubar.cc
+++ b/libs/tk/ytkmm/menubar.cc
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/menuitem.cc b/libs/tk/ytkmm/menuitem.cc
index 51f549740c..b9e437274e 100644
--- a/libs/tk/ytkmm/menuitem.cc
+++ b/libs/tk/ytkmm/menuitem.cc
@@ -31,7 +31,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <gtkmm/label.h>
 #include <gtkmm/misc.h>
 #include <gtkmm/menu.h>
diff --git a/libs/tk/ytkmm/menushell.cc b/libs/tk/ytkmm/menushell.cc
index ec00e2dc8d..14a11d735e 100644
--- a/libs/tk/ytkmm/menushell.cc
+++ b/libs/tk/ytkmm/menushell.cc
@@ -31,7 +31,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/menutoolbutton.cc b/libs/tk/ytkmm/menutoolbutton.cc
index 8236a427a2..63507a2b22 100644
--- a/libs/tk/ytkmm/menutoolbutton.cc
+++ b/libs/tk/ytkmm/menutoolbutton.cc
@@ -31,7 +31,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/messagedialog.cc b/libs/tk/ytkmm/messagedialog.cc
index 88906e9a05..9c98b30b7d 100644
--- a/libs/tk/ytkmm/messagedialog.cc
+++ b/libs/tk/ytkmm/messagedialog.cc
@@ -6,7 +6,7 @@
 #include <gtkmm/messagedialog.h>
 #include <gtkmm/private/messagedialog_p.h>
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 // -*- c++ -*-
 /* $Id: messagedialog.ccg,v 1.7 2005/02/15 10:52:44 murrayc Exp $ */
@@ -30,7 +30,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/misc.cc b/libs/tk/ytkmm/misc.cc
index 9023bf8778..3e5525d317 100644
--- a/libs/tk/ytkmm/misc.cc
+++ b/libs/tk/ytkmm/misc.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/notebook.cc b/libs/tk/ytkmm/notebook.cc
index df2f8adf39..8cf799ad5e 100644
--- a/libs/tk/ytkmm/notebook.cc
+++ b/libs/tk/ytkmm/notebook.cc
@@ -11,7 +11,7 @@
 #include <gtkmm/notebook.h>
 #include <gtkmm/private/notebook_p.h>
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 // -*- c++ -*-
 /* $Id: notebook.ccg,v 1.6 2006/06/16 21:40:01 murrayc Exp $ */
@@ -33,7 +33,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <gtkmm/label.h>
 #include <algorithm>
 
diff --git a/libs/tk/ytkmm/object.cc b/libs/tk/ytkmm/object.cc
index 0f62c3273b..26214cefab 100644
--- a/libs/tk/ytkmm/object.cc
+++ b/libs/tk/ytkmm/object.cc
@@ -27,7 +27,7 @@
  */
 
 #include <glibmm/quark.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/offscreenwindow.cc b/libs/tk/ytkmm/offscreenwindow.cc
index 42a20f4bcf..fa1cf07528 100644
--- a/libs/tk/ytkmm/offscreenwindow.cc
+++ b/libs/tk/ytkmm/offscreenwindow.cc
@@ -31,7 +31,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/optionmenu.cc b/libs/tk/ytkmm/optionmenu.cc
index 43f80c51da..a422518bcc 100644
--- a/libs/tk/ytkmm/optionmenu.cc
+++ b/libs/tk/ytkmm/optionmenu.cc
@@ -35,7 +35,7 @@
 
 #include <gtkmm/menu.h>
 #include <gtkmm/window.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/orientable.cc b/libs/tk/ytkmm/orientable.cc
index 9224058a29..42de8dc52c 100644
--- a/libs/tk/ytkmm/orientable.cc
+++ b/libs/tk/ytkmm/orientable.cc
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace
diff --git a/libs/tk/ytkmm/paned.cc b/libs/tk/ytkmm/paned.cc
index adcfeef72d..da331e6fbb 100644
--- a/libs/tk/ytkmm/paned.cc
+++ b/libs/tk/ytkmm/paned.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/plug.cc b/libs/tk/ytkmm/plug.cc
index b0a6e46f44..1d950c679b 100644
--- a/libs/tk/ytkmm/plug.cc
+++ b/libs/tk/ytkmm/plug.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/progressbar.cc b/libs/tk/ytkmm/progressbar.cc
index bb0f7776da..eb9dee52eb 100644
--- a/libs/tk/ytkmm/progressbar.cc
+++ b/libs/tk/ytkmm/progressbar.cc
@@ -6,7 +6,7 @@
 #include <gtkmm/progressbar.h>
 #include <gtkmm/private/progressbar_p.h>
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 // -*- c++ -*-
 /* $Id: progressbar.ccg,v 1.1 2003/01/21 13:40:34 murrayc Exp $ */
@@ -31,7 +31,7 @@
  */
 
 #include <gtkmm/adjustment.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace
 {
diff --git a/libs/tk/ytkmm/radioaction.cc b/libs/tk/ytkmm/radioaction.cc
index 1214628152..3960137c85 100644
--- a/libs/tk/ytkmm/radioaction.cc
+++ b/libs/tk/ytkmm/radioaction.cc
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 typedef Gtk::RadioAction::Group Group; //So that the generate get_group return type is parsed.
diff --git a/libs/tk/ytkmm/radiobutton.cc b/libs/tk/ytkmm/radiobutton.cc
index ed55af8ac7..b80b95befb 100644
--- a/libs/tk/ytkmm/radiobutton.cc
+++ b/libs/tk/ytkmm/radiobutton.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 typedef Gtk::RadioButton::Group Group; //So that the generate get_group return type is parsed.
 
diff --git a/libs/tk/ytkmm/radiobuttongroup.cc b/libs/tk/ytkmm/radiobuttongroup.cc
index c435006c25..2abe2f3688 100644
--- a/libs/tk/ytkmm/radiobuttongroup.cc
+++ b/libs/tk/ytkmm/radiobuttongroup.cc
@@ -23,7 +23,7 @@
 #include <gtkmm/radiomenuitem.h>
 #include <gtkmm/radioaction.h>
 #include <gtkmm/radiotoolbutton.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/radiomenuitem.cc b/libs/tk/ytkmm/radiomenuitem.cc
index a64382c3f1..83b7f160c1 100644
--- a/libs/tk/ytkmm/radiomenuitem.cc
+++ b/libs/tk/ytkmm/radiomenuitem.cc
@@ -31,7 +31,7 @@
 
 #include <gtkmm/misc.h>
 #include <gtkmm/label.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 typedef Gtk::RadioMenuItem::Group Group; //So that the generate get_group return type is parsed.
 
diff --git a/libs/tk/ytkmm/radiotoolbutton.cc b/libs/tk/ytkmm/radiotoolbutton.cc
index c0283d2f04..ba910570d9 100644
--- a/libs/tk/ytkmm/radiotoolbutton.cc
+++ b/libs/tk/ytkmm/radiotoolbutton.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 typedef Gtk::RadioToolButton::Group Group; //So that the generate get_group return type is parsed.
 
diff --git a/libs/tk/ytkmm/range.cc b/libs/tk/ytkmm/range.cc
index 90afe6d282..f611094c63 100644
--- a/libs/tk/ytkmm/range.cc
+++ b/libs/tk/ytkmm/range.cc
@@ -30,7 +30,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <gtkmm/adjustment.h>
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/rc.cc b/libs/tk/ytkmm/rc.cc
index 560bb47f60..e9ca2c6ae9 100644
--- a/libs/tk/ytkmm/rc.cc
+++ b/libs/tk/ytkmm/rc.cc
@@ -6,7 +6,7 @@
 #include <gtkmm/rc.h>
 #include <gtkmm/private/rc_p.h>
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 // -*- c++ -*-
 /* $Id: rc.ccg,v 1.3 2004/03/02 21:49:58 murrayc Exp $ */
@@ -31,7 +31,7 @@
 #include <gtkmm/settings.h>
 #include <gtkmm/widget.h>
 #include <gtkmm/style.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/recentaction.cc b/libs/tk/ytkmm/recentaction.cc
index 36a9d6fef2..2e9511a71b 100644
--- a/libs/tk/ytkmm/recentaction.cc
+++ b/libs/tk/ytkmm/recentaction.cc
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/recentchooser.cc b/libs/tk/ytkmm/recentchooser.cc
index 9ca91c1b13..fb4fe47af2 100644
--- a/libs/tk/ytkmm/recentchooser.cc
+++ b/libs/tk/ytkmm/recentchooser.cc
@@ -24,7 +24,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 // This Signal Proxy allows the C++ coder to specify a sigc::slot instead of a static function.
 
diff --git a/libs/tk/ytkmm/recentchooserdialog.cc b/libs/tk/ytkmm/recentchooserdialog.cc
index c03888e115..31f1389026 100644
--- a/libs/tk/ytkmm/recentchooserdialog.cc
+++ b/libs/tk/ytkmm/recentchooserdialog.cc
@@ -24,7 +24,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/recentchoosermenu.cc b/libs/tk/ytkmm/recentchoosermenu.cc
index 466dbbec32..bfc60537fc 100644
--- a/libs/tk/ytkmm/recentchoosermenu.cc
+++ b/libs/tk/ytkmm/recentchoosermenu.cc
@@ -24,7 +24,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/recentchooserwidget.cc b/libs/tk/ytkmm/recentchooserwidget.cc
index a8fb20fa51..3f51858295 100644
--- a/libs/tk/ytkmm/recentchooserwidget.cc
+++ b/libs/tk/ytkmm/recentchooserwidget.cc
@@ -24,7 +24,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/recentfilter.cc b/libs/tk/ytkmm/recentfilter.cc
index a469c38f29..0226abd338 100644
--- a/libs/tk/ytkmm/recentfilter.cc
+++ b/libs/tk/ytkmm/recentfilter.cc
@@ -24,7 +24,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 #include <glibmm/ustring.h>
 
diff --git a/libs/tk/ytkmm/recentinfo.cc b/libs/tk/ytkmm/recentinfo.cc
index 67bed8dd2e..58f23d2063 100644
--- a/libs/tk/ytkmm/recentinfo.cc
+++ b/libs/tk/ytkmm/recentinfo.cc
@@ -24,7 +24,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/recentmanager.cc b/libs/tk/ytkmm/recentmanager.cc
index de6a010b40..84e77730b1 100644
--- a/libs/tk/ytkmm/recentmanager.cc
+++ b/libs/tk/ytkmm/recentmanager.cc
@@ -26,7 +26,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/ruler.cc b/libs/tk/ytkmm/ruler.cc
index 4ac4e5d0bf..c6de5b6d59 100644
--- a/libs/tk/ytkmm/ruler.cc
+++ b/libs/tk/ytkmm/ruler.cc
@@ -36,7 +36,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/scale.cc b/libs/tk/ytkmm/scale.cc
index 9bfda144a2..ca98f19b49 100644
--- a/libs/tk/ytkmm/scale.cc
+++ b/libs/tk/ytkmm/scale.cc
@@ -31,7 +31,7 @@
 
 #include <gtkmm/adjustment.h>
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <math.h>
 #include <cstring> //For strlen()
 #include <memory>
diff --git a/libs/tk/ytkmm/scalebutton.cc b/libs/tk/ytkmm/scalebutton.cc
index 029a88f17d..e9f42d96e5 100644
--- a/libs/tk/ytkmm/scalebutton.cc
+++ b/libs/tk/ytkmm/scalebutton.cc
@@ -31,7 +31,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/scrollbar.cc b/libs/tk/ytkmm/scrollbar.cc
index 9feb093ba1..7cbec7d705 100644
--- a/libs/tk/ytkmm/scrollbar.cc
+++ b/libs/tk/ytkmm/scrollbar.cc
@@ -31,7 +31,7 @@
 
 #include <gtkmm/adjustment.h>
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/scrolledwindow.cc b/libs/tk/ytkmm/scrolledwindow.cc
index 1219fa808e..0f4fcfc47e 100644
--- a/libs/tk/ytkmm/scrolledwindow.cc
+++ b/libs/tk/ytkmm/scrolledwindow.cc
@@ -36,7 +36,7 @@
 #include <gtkmm/scrollbar.h>
 #include <gtkmm/viewport.h>
 #include <gtkmm/adjustment.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/selectiondata.cc b/libs/tk/ytkmm/selectiondata.cc
index 596329610f..f60152189a 100644
--- a/libs/tk/ytkmm/selectiondata.cc
+++ b/libs/tk/ytkmm/selectiondata.cc
@@ -30,7 +30,7 @@
 #include <gtkmm/textbuffer.h>
 #include <gdkmm/pixbuf.h>
 #include <glibmm/utility.h> //For ScopedPtr<>.
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/separator.cc b/libs/tk/ytkmm/separator.cc
index 43e6750e18..e5edf52e8e 100644
--- a/libs/tk/ytkmm/separator.cc
+++ b/libs/tk/ytkmm/separator.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace
 {
diff --git a/libs/tk/ytkmm/separatormenuitem.cc b/libs/tk/ytkmm/separatormenuitem.cc
index 0d1b09d6ce..4d8a0473dd 100644
--- a/libs/tk/ytkmm/separatormenuitem.cc
+++ b/libs/tk/ytkmm/separatormenuitem.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace
 {
diff --git a/libs/tk/ytkmm/separatortoolitem.cc b/libs/tk/ytkmm/separatortoolitem.cc
index a6ac97c5a3..11d52ce3c4 100644
--- a/libs/tk/ytkmm/separatortoolitem.cc
+++ b/libs/tk/ytkmm/separatortoolitem.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/settings.cc b/libs/tk/ytkmm/settings.cc
index 9740a5e3bb..d83269e5ee 100644
--- a/libs/tk/ytkmm/settings.cc
+++ b/libs/tk/ytkmm/settings.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/sizegroup.cc b/libs/tk/ytkmm/sizegroup.cc
index d62730db92..8183e72337 100644
--- a/libs/tk/ytkmm/sizegroup.cc
+++ b/libs/tk/ytkmm/sizegroup.cc
@@ -6,7 +6,7 @@
 #include <gtkmm/sizegroup.h>
 #include <gtkmm/private/sizegroup_p.h>
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 // -*- c++ -*-
 /* $Id: sizegroup.ccg,v 1.1 2003/01/21 13:40:37 murrayc Exp $ */
@@ -30,7 +30,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/socket.cc b/libs/tk/ytkmm/socket.cc
index 23fbb51edd..06416d7977 100644
--- a/libs/tk/ytkmm/socket.cc
+++ b/libs/tk/ytkmm/socket.cc
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace
diff --git a/libs/tk/ytkmm/spinbutton.cc b/libs/tk/ytkmm/spinbutton.cc
index 9096a96b8e..63c8da78c7 100644
--- a/libs/tk/ytkmm/spinbutton.cc
+++ b/libs/tk/ytkmm/spinbutton.cc
@@ -6,7 +6,7 @@
 #include <gtkmm/spinbutton.h>
 #include <gtkmm/private/spinbutton_p.h>
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 // -*- c++ -*-
 /* $Id: spinbutton.ccg,v 1.1 2003/01/21 13:40:38 murrayc Exp $ */
@@ -29,7 +29,7 @@
  */
 
 #include <gtkmm/adjustment.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/spinner.cc b/libs/tk/ytkmm/spinner.cc
index 92c6a87c47..8d9d3a28e7 100644
--- a/libs/tk/ytkmm/spinner.cc
+++ b/libs/tk/ytkmm/spinner.cc
@@ -6,7 +6,7 @@
 #include <gtkmm/spinner.h>
 #include <gtkmm/private/spinner_p.h>
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 // -*- c++ -*-
 
diff --git a/libs/tk/ytkmm/statusbar.cc b/libs/tk/ytkmm/statusbar.cc
index 91691549d6..fc1166aa55 100644
--- a/libs/tk/ytkmm/statusbar.cc
+++ b/libs/tk/ytkmm/statusbar.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/stock.cc b/libs/tk/ytkmm/stock.cc
index 45c39ae8e0..5192d8fc55 100644
--- a/libs/tk/ytkmm/stock.cc
+++ b/libs/tk/ytkmm/stock.cc
@@ -19,7 +19,7 @@
  */
 
 #include <gtkmm/stock.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 // Get rid of macro DELETE (from winnt.h).  We have some macro
 // shadowing magic in stock.h, but it's safer to get rid of it
diff --git a/libs/tk/ytkmm/stockitem.cc b/libs/tk/ytkmm/stockitem.cc
index 9e3a1ec2ce..3250abdc65 100644
--- a/libs/tk/ytkmm/stockitem.cc
+++ b/libs/tk/ytkmm/stockitem.cc
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
  
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/style.cc b/libs/tk/ytkmm/style.cc
index 9d9513fdc5..854acc6ee1 100644
--- a/libs/tk/ytkmm/style.cc
+++ b/libs/tk/ytkmm/style.cc
@@ -29,7 +29,7 @@
 
 #include <gtkmm/widget.h>
 #include <gtkmm/rc.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/table.cc b/libs/tk/ytkmm/table.cc
index 5fa344785c..b70f952202 100644
--- a/libs/tk/ytkmm/table.cc
+++ b/libs/tk/ytkmm/table.cc
@@ -33,7 +33,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/targetlist.cc b/libs/tk/ytkmm/targetlist.cc
index 6ef39c5a35..5492d84dae 100644
--- a/libs/tk/ytkmm/targetlist.cc
+++ b/libs/tk/ytkmm/targetlist.cc
@@ -6,7 +6,7 @@
 #include <gtkmm/targetlist.h>
 #include <gtkmm/private/targetlist_p.h>
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 /* Copyright 2002 The gtkmm Development Team
  *
diff --git a/libs/tk/ytkmm/tearoffmenuitem.cc b/libs/tk/ytkmm/tearoffmenuitem.cc
index 7f5c490f4f..bb4d994633 100644
--- a/libs/tk/ytkmm/tearoffmenuitem.cc
+++ b/libs/tk/ytkmm/tearoffmenuitem.cc
@@ -33,7 +33,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/textattributes.cc b/libs/tk/ytkmm/textattributes.cc
index f16dc90a84..a344013d0e 100644
--- a/libs/tk/ytkmm/textattributes.cc
+++ b/libs/tk/ytkmm/textattributes.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace
diff --git a/libs/tk/ytkmm/textbuffer.cc b/libs/tk/ytkmm/textbuffer.cc
index 4b5ddfef14..8c6cc59fcc 100644
--- a/libs/tk/ytkmm/textbuffer.cc
+++ b/libs/tk/ytkmm/textbuffer.cc
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <glib.h>
 #include <gtkmm/textmark.h>
 #include <gtkmm/textiter.h>
diff --git a/libs/tk/ytkmm/textchildanchor.cc b/libs/tk/ytkmm/textchildanchor.cc
index 1ea44d2dae..4ce1c62be7 100644
--- a/libs/tk/ytkmm/textchildanchor.cc
+++ b/libs/tk/ytkmm/textchildanchor.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace
 {
diff --git a/libs/tk/ytkmm/textiter.cc b/libs/tk/ytkmm/textiter.cc
index 44f361b6f7..49e19b793e 100644
--- a/libs/tk/ytkmm/textiter.cc
+++ b/libs/tk/ytkmm/textiter.cc
@@ -6,7 +6,7 @@
 #include <gtkmm/textiter.h>
 #include <gtkmm/private/textiter_p.h>
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <cstring> // std::memset()
 
 // -*- c++ -*-
diff --git a/libs/tk/ytkmm/textmark.cc b/libs/tk/ytkmm/textmark.cc
index 6e952e128e..b3d8dffe51 100644
--- a/libs/tk/ytkmm/textmark.cc
+++ b/libs/tk/ytkmm/textmark.cc
@@ -32,7 +32,7 @@
 
 #include <gtkmm/textmark.h>
 #include <gtkmm/textbuffer.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/texttag.cc b/libs/tk/ytkmm/texttag.cc
index 4bf057e1ea..6124a6511f 100644
--- a/libs/tk/ytkmm/texttag.cc
+++ b/libs/tk/ytkmm/texttag.cc
@@ -31,7 +31,7 @@
 
 #include <gtkmm/textbuffer.h>
 #include <gtkmm/textiter.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace
 {
diff --git a/libs/tk/ytkmm/texttagtable.cc b/libs/tk/ytkmm/texttagtable.cc
index 1abf17964c..361b13dd59 100644
--- a/libs/tk/ytkmm/texttagtable.cc
+++ b/libs/tk/ytkmm/texttagtable.cc
@@ -30,7 +30,7 @@
  */
 
 #include <gtkmm/texttag.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 static void SignalProxy_ForEach_gtk_callback(GtkTextTag* texttag, gpointer data)
diff --git a/libs/tk/ytkmm/textview.cc b/libs/tk/ytkmm/textview.cc
index 207e2aea4a..2b8bfd38e3 100644
--- a/libs/tk/ytkmm/textview.cc
+++ b/libs/tk/ytkmm/textview.cc
@@ -6,7 +6,7 @@
 #include <gtkmm/textview.h>
 #include <gtkmm/private/textview_p.h>
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 // -*- c++ -*-
 /* $Id: textview.ccg,v 1.3 2005/11/29 16:38:10 murrayc Exp $ */
@@ -28,7 +28,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/toggleaction.cc b/libs/tk/ytkmm/toggleaction.cc
index cea0df1259..c731740c81 100644
--- a/libs/tk/ytkmm/toggleaction.cc
+++ b/libs/tk/ytkmm/toggleaction.cc
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/togglebutton.cc b/libs/tk/ytkmm/togglebutton.cc
index c761f6571f..43508bcda4 100644
--- a/libs/tk/ytkmm/togglebutton.cc
+++ b/libs/tk/ytkmm/togglebutton.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/toggletoolbutton.cc b/libs/tk/ytkmm/toggletoolbutton.cc
index 50d8f7a065..d5176abbc7 100644
--- a/libs/tk/ytkmm/toggletoolbutton.cc
+++ b/libs/tk/ytkmm/toggletoolbutton.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/toolbar.cc b/libs/tk/ytkmm/toolbar.cc
index ed1cf34658..07219d1cb7 100644
--- a/libs/tk/ytkmm/toolbar.cc
+++ b/libs/tk/ytkmm/toolbar.cc
@@ -38,7 +38,7 @@
 #include <gtkmm/tooltips.h>
 //#include <gtkmm/image.h>
 #include <gtkmm/label.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/toolbutton.cc b/libs/tk/ytkmm/toolbutton.cc
index a87f72c16b..5b0b6c7957 100644
--- a/libs/tk/ytkmm/toolbutton.cc
+++ b/libs/tk/ytkmm/toolbutton.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/toolitem.cc b/libs/tk/ytkmm/toolitem.cc
index 0a12bf8b15..ffc027c523 100644
--- a/libs/tk/ytkmm/toolitem.cc
+++ b/libs/tk/ytkmm/toolitem.cc
@@ -31,7 +31,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/toolitemgroup.cc b/libs/tk/ytkmm/toolitemgroup.cc
index 44c47f5511..9d9917f0bd 100644
--- a/libs/tk/ytkmm/toolitemgroup.cc
+++ b/libs/tk/ytkmm/toolitemgroup.cc
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/toolpalette.cc b/libs/tk/ytkmm/toolpalette.cc
index 0ff998289e..5f8de212ab 100644
--- a/libs/tk/ytkmm/toolpalette.cc
+++ b/libs/tk/ytkmm/toolpalette.cc
@@ -30,7 +30,7 @@
  */
 
 #include <glib.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/toolshell.cc b/libs/tk/ytkmm/toolshell.cc
index 03e66f93d9..0a841c872e 100644
--- a/libs/tk/ytkmm/toolshell.cc
+++ b/libs/tk/ytkmm/toolshell.cc
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace
diff --git a/libs/tk/ytkmm/tooltip.cc b/libs/tk/ytkmm/tooltip.cc
index 26b4bac0dd..771e36028d 100644
--- a/libs/tk/ytkmm/tooltip.cc
+++ b/libs/tk/ytkmm/tooltip.cc
@@ -26,7 +26,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/tooltips.cc b/libs/tk/ytkmm/tooltips.cc
index 632d2c0b18..d0e12d150c 100644
--- a/libs/tk/ytkmm/tooltips.cc
+++ b/libs/tk/ytkmm/tooltips.cc
@@ -33,7 +33,7 @@
 
 #include <gdkmm/color.h>
 #include <gtkmm/widget.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/treedragdest.cc b/libs/tk/ytkmm/treedragdest.cc
index eb5d5ad683..27f560e71b 100644
--- a/libs/tk/ytkmm/treedragdest.cc
+++ b/libs/tk/ytkmm/treedragdest.cc
@@ -29,7 +29,7 @@
 
 #include <gtkmm/treepath.h>
 #include <gtkmm/selectiondata_private.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace
diff --git a/libs/tk/ytkmm/treedragsource.cc b/libs/tk/ytkmm/treedragsource.cc
index f9e063fbb1..fdcd0a1f69 100644
--- a/libs/tk/ytkmm/treedragsource.cc
+++ b/libs/tk/ytkmm/treedragsource.cc
@@ -29,7 +29,7 @@
 
 #include <gtkmm/treepath.h>
 #include <gtkmm/selectiondata_private.h> //For SelectionData_WithoutOwnership
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/treemodel.cc b/libs/tk/ytkmm/treemodel.cc
index 3bf43dbf30..77cc80e4d3 100644
--- a/libs/tk/ytkmm/treemodel.cc
+++ b/libs/tk/ytkmm/treemodel.cc
@@ -11,7 +11,7 @@
 #include <gtkmm/treemodel.h>
 #include <gtkmm/private/treemodel_p.h>
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 // -*- c++ -*-
 /* $Id: treemodel.ccg,v 1.13 2006/05/11 11:40:24 murrayc Exp $ */
diff --git a/libs/tk/ytkmm/treemodelsort.cc b/libs/tk/ytkmm/treemodelsort.cc
index 2b9d8fccd9..c3e2dccdf0 100644
--- a/libs/tk/ytkmm/treemodelsort.cc
+++ b/libs/tk/ytkmm/treemodelsort.cc
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 typedef Gtk::TreeModel::Path Path; //So that the generated method implemenations can use this a return type.
diff --git a/libs/tk/ytkmm/treepath.cc b/libs/tk/ytkmm/treepath.cc
index 10e7f9ee9c..d0f22629ab 100644
--- a/libs/tk/ytkmm/treepath.cc
+++ b/libs/tk/ytkmm/treepath.cc
@@ -29,7 +29,7 @@
 
 #include <gtkmm/treemodel.h>
 #include <glibmm/utility.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/treerowreference.cc b/libs/tk/ytkmm/treerowreference.cc
index 872f1fc365..dd331a457c 100644
--- a/libs/tk/ytkmm/treerowreference.cc
+++ b/libs/tk/ytkmm/treerowreference.cc
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/treeselection.cc b/libs/tk/ytkmm/treeselection.cc
index 6a0c05c77f..c884814ec8 100644
--- a/libs/tk/ytkmm/treeselection.cc
+++ b/libs/tk/ytkmm/treeselection.cc
@@ -28,7 +28,7 @@
  */
 
 #include <gtkmm/treeview.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 static void proxy_foreach_selection_iter_callback(GtkTreeModel* model, GtkTreePath*, GtkTreeIter* iter, void* data)
diff --git a/libs/tk/ytkmm/treestore.cc b/libs/tk/ytkmm/treestore.cc
index 4f75359b36..85782387d1 100644
--- a/libs/tk/ytkmm/treestore.cc
+++ b/libs/tk/ytkmm/treestore.cc
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/treeview.cc b/libs/tk/ytkmm/treeview.cc
index 67682825a3..9af846a050 100644
--- a/libs/tk/ytkmm/treeview.cc
+++ b/libs/tk/ytkmm/treeview.cc
@@ -8,7 +8,7 @@
 #include <gtkmm/treeview.h>
 #include <gtkmm/private/treeview_p.h>
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 // -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
 /* $Id: treeview.ccg,v 1.24 2006/06/19 17:28:12 murrayc Exp $ */
@@ -35,7 +35,7 @@
 #include <gtkmm/treemodel.h>
 #include <gtkmm/treemodelfilter.h>
 #include <gtkmm/entry.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace
 {
diff --git a/libs/tk/ytkmm/treeviewcolumn.cc b/libs/tk/ytkmm/treeviewcolumn.cc
index 1fb76fd6d3..169ec69d71 100644
--- a/libs/tk/ytkmm/treeviewcolumn.cc
+++ b/libs/tk/ytkmm/treeviewcolumn.cc
@@ -8,7 +8,7 @@
 #include <gtkmm/treeviewcolumn.h>
 #include <gtkmm/private/treeviewcolumn_p.h>
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 // -*- c++ -*-
 /* $Id: treeviewcolumn.ccg,v 1.6 2006/05/10 20:59:28 murrayc Exp $ */
@@ -30,7 +30,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 #include <gtkmm/treeview_private.h>
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/uimanager.cc b/libs/tk/ytkmm/uimanager.cc
index 8ff61d8fc7..526a52f65f 100644
--- a/libs/tk/ytkmm/uimanager.cc
+++ b/libs/tk/ytkmm/uimanager.cc
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/viewport.cc b/libs/tk/ytkmm/viewport.cc
index 11bc88772b..9a7c3101cd 100644
--- a/libs/tk/ytkmm/viewport.cc
+++ b/libs/tk/ytkmm/viewport.cc
@@ -31,7 +31,7 @@
 
 #include <gtkmm/viewport.h>
 #include <gtkmm/adjustment.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 namespace
 {
diff --git a/libs/tk/ytkmm/widget.cc b/libs/tk/ytkmm/widget.cc
index 02850fded1..de24721f81 100644
--- a/libs/tk/ytkmm/widget.cc
+++ b/libs/tk/ytkmm/widget.cc
@@ -11,7 +11,7 @@
 #include <gtkmm/widget.h>
 #include <gtkmm/private/widget_p.h>
 
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 // -*- c++ -*-
 /* $Id: widget.ccg,v 1.23 2006/07/19 16:58:50 murrayc Exp $ */
@@ -42,7 +42,7 @@
 #include <gtkmm/selectiondata_private.h>
 #include <gtkmm/action.h>
 #include <gtkmm/tooltip.h>
-#include <gtk/gtk.h> //For gtk_widget_get_action().
+#include <ytk/ytk.h> //For gtk_widget_get_action().
 
 
 namespace //anonymous
diff --git a/libs/tk/ytkmm/window.cc b/libs/tk/ytkmm/window.cc
index 5a776a14d8..91b07b0e41 100644
--- a/libs/tk/ytkmm/window.cc
+++ b/libs/tk/ytkmm/window.cc
@@ -37,7 +37,7 @@
 
 #include <gtkmm/accelgroup.h>
 #include <gdkmm/cursor.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/border.h b/libs/tk/ytkmm/ytkmm/gtkmm/border.h
index b48017e3da..e9725c41d6 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/border.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/border.h
@@ -22,7 +22,7 @@
  */
 
 #include <glibmm/value.h>
-#include <gtk/gtk.h>  /* For GtkBorder */
+#include <ytk/ytk.h>  /* For GtkBorder */
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/box.h b/libs/tk/ytkmm/ytkmm/gtkmm/box.h
index 01709c7a6f..9965dcb6bd 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/box.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/box.h
@@ -41,7 +41,7 @@
 #define GTKMM_GDK_DISABLE_DEPRECATED_UNDEFED 1
 #endif
 
-#include <gtk/gtk.h>  /* For _GtkBoxChild */
+#include <ytk/ytk.h>  /* For _GtkBoxChild */
 
 // Redefine GTK_DISABLE_DEPRECATED if it was defined before we temporarily undefed it:
 #if defined(GTKMM_GTK_DISABLE_DEPRECATED_UNDEFED)
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/iconinfo.h b/libs/tk/ytkmm/ytkmm/gtkmm/iconinfo.h
index bcda05950c..f1347b69b7 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/iconinfo.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/iconinfo.h
@@ -28,7 +28,7 @@
 #include <gdkmm/rectangle.h>
 #include <gdkmm/types.h>
 
-//#include <gtk/gtkicontheme.h>
+//#include <ytk/gtkicontheme.h>
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/menu.h b/libs/tk/ytkmm/ytkmm/gtkmm/menu.h
index caefff2143..e4853500cc 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/menu.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/menu.h
@@ -27,7 +27,7 @@
  */
 
 
-//#include <gtk/gtkmenu.h>
+//#include <ytk/gtkmenu.h>
 #include <gtkmm/menushell.h>
 #include <gtkmm/menuitem.h>
 
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/notebook.h b/libs/tk/ytkmm/ytkmm/gtkmm/notebook.h
index 765353319f..12b36ce426 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/notebook.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/notebook.h
@@ -30,7 +30,7 @@
  
 #include <gtkmm/container.h>
 #include <gtkmm/label.h>
-//#include <gtk/gtknotebook.h>
+//#include <ytk/gtknotebook.h>
 #include <glibmm/helperlist.h>
 
 
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/private/cellrenderer_p.h b/libs/tk/ytkmm/ytkmm/gtkmm/private/cellrenderer_p.h
index 987e5c8d7b..85665ff2e3 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/private/cellrenderer_p.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/private/cellrenderer_p.h
@@ -5,7 +5,7 @@
 
 
 #include <gtkmm/private/object_p.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 #include <glibmm/class.h>
 
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/private/label_p.h b/libs/tk/ytkmm/ytkmm/gtkmm/private/label_p.h
index 5369375844..dc1018cd72 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/private/label_p.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/private/label_p.h
@@ -5,7 +5,7 @@
 
 
 #include <gtkmm/private/misc_p.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 #include <glibmm/class.h>
 
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/private/printoperation_p.h b/libs/tk/ytkmm/ytkmm/gtkmm/private/printoperation_p.h
index 29002be0f9..c7af7a6fe7 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/private/printoperation_p.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/private/printoperation_p.h
@@ -5,7 +5,7 @@
 
 
 #include <glibmm/private/object_p.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 #include <glibmm/class.h>
 
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/private/progressbar_p.h b/libs/tk/ytkmm/ytkmm/gtkmm/private/progressbar_p.h
index e165a34181..53b81a1a08 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/private/progressbar_p.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/private/progressbar_p.h
@@ -5,7 +5,7 @@
 
 
 #include <gtkmm/private/widget_p.h>
-#include <gtk/gtkprogress.h>
+#include <ytk/gtkprogress.h>
 
 #include <glibmm/class.h>
 
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/private/style_p.h b/libs/tk/ytkmm/ytkmm/gtkmm/private/style_p.h
index a0c86db81b..77c8a18acc 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/private/style_p.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/private/style_p.h
@@ -5,7 +5,7 @@
 
 
 #include <glibmm/private/object_p.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 #include <glibmm/class.h>
 
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/private/texttag_p.h b/libs/tk/ytkmm/ytkmm/gtkmm/private/texttag_p.h
index dcfe43bd63..72e4aec5e3 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/private/texttag_p.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/private/texttag_p.h
@@ -5,7 +5,7 @@
 
 
 #include <glibmm/private/object_p.h>
-#include <gtk/gtk.h>
+#include <ytk/ytk.h>
 
 #include <glibmm/class.h>
 
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/table.h b/libs/tk/ytkmm/ytkmm/gtkmm/table.h
index 5e874ec133..a4bb203ffd 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/table.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/table.h
@@ -33,7 +33,7 @@
 //TODO: Careful of including this before box.h,
 //because we need to undef some things first.
 //TODO: Maybe do all includes of gtk.h in a single file.
-#include <gtk/gtk.h> /* for GtkTableChild */
+#include <ytk/ytk.h> /* for GtkTableChild */
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/targetentry.h b/libs/tk/ytkmm/ytkmm/gtkmm/targetentry.h
index 16622bd603..afa109cfdc 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/targetentry.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/targetentry.h
@@ -27,7 +27,7 @@
 #include <glibmm/ustring.h>
 #include <glibmm/arrayhandle.h>
 #include <gtkmm/enums.h>
-#include <gtk/gtk.h> //For GtkTargetEntry.
+#include <ytk/ytk.h> //For GtkTargetEntry.
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
 extern "C"
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/treeiter.h b/libs/tk/ytkmm/ytkmm/gtkmm/treeiter.h
index 225d526f45..8a0758a158 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/treeiter.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/treeiter.h
@@ -31,7 +31,7 @@
 
 #include <gtkmm/treemodelcolumn.h>
 #include <iterator>
-#include <gtk/gtk.h> /* for GtkTreeIter */
+#include <ytk/ytk.h> /* for GtkTreeIter */
 
 namespace Gtk
 {