diff --git a/gtk2_ardour/axis_view.h b/gtk2_ardour/axis_view.h
index 5a59959355..40b2bfb09b 100644
--- a/gtk2_ardour/axis_view.h
+++ b/gtk2_ardour/axis_view.h
@@ -28,7 +28,7 @@
 
 #include <gtkmm/label.h>
 #include <gtkmm/table.h>
-#include <gdkmm/color.h>
+#include <ydkmm/color.h>
 
 #include "pbd/xml++.h"
 #include "pbd/signals.h"
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 1517659065..a1d5acf039 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -61,8 +61,8 @@
 #include <glibmm/miscutils.h>
 #include <glibmm/uriutils.h>
 #include <gtkmm/image.h>
-#include <gdkmm/color.h>
-#include <gdkmm/bitmap.h>
+#include <ydkmm/color.h>
+#include <ydkmm/bitmap.h>
 
 #include <gtkmm/menu.h>
 #include <gtkmm/menuitem.h>
diff --git a/gtk2_ardour/fft_graph.cc b/gtk2_ardour/fft_graph.cc
index 8917bb0371..0382b7aa5a 100644
--- a/gtk2_ardour/fft_graph.cc
+++ b/gtk2_ardour/fft_graph.cc
@@ -24,7 +24,7 @@
 #include <glibmm.h>
 #include <glibmm/refptr.h>
 
-#include <gdkmm/gc.h>
+#include <ydkmm/gc.h>
 
 #include <gtkmm/widget.h>
 #include <gtkmm/style.h>
diff --git a/gtk2_ardour/fft_graph.h b/gtk2_ardour/fft_graph.h
index b20ede9a6a..38c0cb67a6 100644
--- a/gtk2_ardour/fft_graph.h
+++ b/gtk2_ardour/fft_graph.h
@@ -26,7 +26,7 @@
 
 #include <gtkmm/drawingarea.h>
 #include <gtkmm/treemodel.h>
-#include <gdkmm/color.h>
+#include <ydkmm/color.h>
 
 #include <glibmm/refptr.h>
 
diff --git a/gtk2_ardour/fft_result.h b/gtk2_ardour/fft_result.h
index cb5d65db48..3efb624c48 100644
--- a/gtk2_ardour/fft_result.h
+++ b/gtk2_ardour/fft_result.h
@@ -23,7 +23,7 @@
 #include <math.h>
 #include <fftw3.h>
 
-#include <gdkmm/color.h>
+#include <ydkmm/color.h>
 
 #include <string>
 #include <vector>
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 4818c7e41e..1da5d83135 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -30,7 +30,7 @@
 #include <pangomm.h>
 
 #include <gtkmm/alignment.h>
-#include <gdkmm/color.h>
+#include <ydkmm/color.h>
 #include <gtkmm/style.h>
 
 #include "ardour/amp.h"
diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h
index b80f8da828..0e15f3b513 100644
--- a/gtk2_ardour/gain_meter.h
+++ b/gtk2_ardour/gain_meter.h
@@ -37,7 +37,7 @@
 #include <gtkmm/frame.h>
 #include <gtkmm/table.h>
 
-//#include <gdkmm/colormap.h>
+//#include <ydkmm/colormap.h>
 
 #include "pbd/signals.h"
 
diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc
index 618d9a5ea1..6625189cca 100644
--- a/gtk2_ardour/group_tabs.cc
+++ b/gtk2_ardour/group_tabs.cc
@@ -20,6 +20,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <ydkmm/cursor.h>
 #include <gtkmm/stock.h>
 
 #include "ardour/session.h"
diff --git a/gtk2_ardour/monitor_section.cc b/gtk2_ardour/monitor_section.cc
index daeabc583a..312c886107 100644
--- a/gtk2_ardour/monitor_section.cc
+++ b/gtk2_ardour/monitor_section.cc
@@ -21,7 +21,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <gdkmm/pixbuf.h>
+#include <ydkmm/pixbuf.h>
 
 #include "pbd/compose.h"
 #include "pbd/error.h"
diff --git a/gtk2_ardour/mouse_cursors.cc b/gtk2_ardour/mouse_cursors.cc
index 406d431747..13467a23e4 100644
--- a/gtk2_ardour/mouse_cursors.cc
+++ b/gtk2_ardour/mouse_cursors.cc
@@ -18,7 +18,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <gdkmm/cursor.h>
+#include <ydkmm/cursor.h>
 
 #include "gtkmm2ext/cursors.h"
 
diff --git a/gtk2_ardour/mouse_cursors.h b/gtk2_ardour/mouse_cursors.h
index 4457e5d754..4f289d7bb1 100644
--- a/gtk2_ardour/mouse_cursors.h
+++ b/gtk2_ardour/mouse_cursors.h
@@ -26,7 +26,7 @@
  *  Held centrally by the Editor because some cursors are used in several places.
  */
 
-#include <gdkmm/cursor.h>
+#include <ydkmm/cursor.h>
 
 #include <string>
 
diff --git a/gtk2_ardour/port_matrix_row_labels.h b/gtk2_ardour/port_matrix_row_labels.h
index c2d6fc069a..89897ed6a7 100644
--- a/gtk2_ardour/port_matrix_row_labels.h
+++ b/gtk2_ardour/port_matrix_row_labels.h
@@ -20,7 +20,7 @@
 
 #include <memory>
 
-#include <gdkmm/color.h>
+#include <ydkmm/color.h>
 #include "port_matrix_labels.h"
 
 class PortMatrix;
diff --git a/gtk2_ardour/session_dialog.h b/gtk2_ardour/session_dialog.h
index 5e8a12ce81..ce92f240c6 100644
--- a/gtk2_ardour/session_dialog.h
+++ b/gtk2_ardour/session_dialog.h
@@ -23,7 +23,7 @@
 
 #include <string>
 
-#include <gdkmm/pixbuf.h>
+#include <ydkmm/pixbuf.h>
 #include <gtkmm/label.h>
 #include <gtkmm/drawingarea.h>
 #include <gtkmm/expander.h>
diff --git a/gtk2_ardour/splash.h b/gtk2_ardour/splash.h
index 30b488486a..46970b8934 100644
--- a/gtk2_ardour/splash.h
+++ b/gtk2_ardour/splash.h
@@ -26,7 +26,7 @@
 #include <gtkmm/drawingarea.h>
 #include <gtkmm/box.h>
 #include <gtkmm/label.h>
-#include <gdkmm/pixbuf.h>
+#include <ydkmm/pixbuf.h>
 
 #include "pbd/signals.h"
 
diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h
index 8d77d930d7..b1a24c0991 100644
--- a/gtk2_ardour/time_axis_view_item.h
+++ b/gtk2_ardour/time_axis_view_item.h
@@ -26,7 +26,7 @@
 
 #include <string>
 #include <ydk/gdk.h>
-#include <gdkmm/color.h>
+#include <ydkmm/color.h>
 #include <pangomm/fontdescription.h>
 #include "ardour/types.h"
 #include "pbd/signals.h"
diff --git a/gtk2_ardour/utils.h b/gtk2_ardour/utils.h
index ed378e49cd..76bca0a638 100644
--- a/gtk2_ardour/utils.h
+++ b/gtk2_ardour/utils.h
@@ -35,7 +35,7 @@
 
 #include "ardour/types.h"
 
-#include <gdkmm/types.h>
+#include <ydkmm/types.h>
 #include <gtkmm/menushell.h>
 
 #include "canvas/types.h"
diff --git a/libs/canvas/canvas/canvas.h b/libs/canvas/canvas/canvas.h
index ff1cdf669e..a7d18564a7 100644
--- a/libs/canvas/canvas/canvas.h
+++ b/libs/canvas/canvas/canvas.h
@@ -31,7 +31,7 @@
 
 #include <gtkmm/alignment.h>
 #include <gtkmm/eventbox.h>
-#include <gdkmm/window.h>
+#include <ydkmm/window.h>
 
 #include <cairomm/context.h>
 #include <cairomm/surface.h>
diff --git a/libs/canvas/pixbuf.cc b/libs/canvas/pixbuf.cc
index 1f96946466..602ecd2b77 100644
--- a/libs/canvas/pixbuf.cc
+++ b/libs/canvas/pixbuf.cc
@@ -19,7 +19,7 @@
  */
 
 #include <cairomm/cairomm.h>
-#include <gdkmm/general.h>
+#include <ydkmm/general.h>
 
 #include "canvas/pixbuf.h"
 
diff --git a/libs/gtkmm2ext/colors.cc b/libs/gtkmm2ext/colors.cc
index d44bcaec3f..269d3dd899 100644
--- a/libs/gtkmm2ext/colors.cc
+++ b/libs/gtkmm2ext/colors.cc
@@ -25,7 +25,7 @@
 
 #include <glib.h>
 
-#include <gdkmm/color.h>
+#include <ydkmm/color.h>
 
 #include "pbd/failed_constructor.h"
 #include "pbd/string_convert.h"
diff --git a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_color_selector.h b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_color_selector.h
index 0958010492..a190487bb4 100644
--- a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_color_selector.h
+++ b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_color_selector.h
@@ -22,7 +22,6 @@
 #include <gtkmm/drawingarea.h>
 #include <gtkmm/widget.h>
 #include <gtkmm/cellrenderer.h>
-#include <gdkmm.h>
 
 #include "gtkmm2ext/visibility.h"
 
diff --git a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_multi.h b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_multi.h
index 57fdfdd3e8..806f8cd1c2 100644
--- a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_multi.h
+++ b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_multi.h
@@ -26,7 +26,6 @@
 #include <gtkmm/adjustment.h>
 #include <gtkmm/widget.h>
 #include <gtkmm/cellrenderer.h>
-#include <gdkmm.h>
 
 #include "gtkmm2ext/visibility.h"
 
diff --git a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h
index 1af13bd84b..bd65d25c4f 100644
--- a/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h
+++ b/libs/gtkmm2ext/gtkmm2ext/cell_renderer_pixbuf_toggle.h
@@ -23,7 +23,6 @@
 #include <gtkmm/adjustment.h>
 #include <gtkmm/widget.h>
 #include <gtkmm/cellrenderer.h>
-#include <gdkmm.h>
 
 #include "gtkmm2ext/visibility.h"
 
diff --git a/libs/gtkmm2ext/gtkmm2ext/colors.h b/libs/gtkmm2ext/gtkmm2ext/colors.h
index b89aa3cd1f..4cece0b604 100644
--- a/libs/gtkmm2ext/gtkmm2ext/colors.h
+++ b/libs/gtkmm2ext/gtkmm2ext/colors.h
@@ -22,7 +22,7 @@
 
 #include<stdint.h>
 
-#include <gdkmm/types.h>
+#include <ydkmm/types.h>
 #include <cairomm/context.h>
 
 #include "gtkmm2ext/visibility.h"
diff --git a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h
index 1d6b36088b..26b1f5df82 100644
--- a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h
+++ b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h
@@ -43,7 +43,7 @@
 #endif
 #include <gtkmm/textbuffer.h>
 #include <gtkmm/main.h>
-#include <gdkmm/color.h>
+#include <ydkmm/color.h>
 
 #ifndef ABSTRACT_UI_EXPORTS
 #define ABSTRACT_UI_EXPORTS
diff --git a/libs/gtkmm2ext/gtkmm2ext/utils.h b/libs/gtkmm2ext/gtkmm2ext/utils.h
index 2686a8d7e0..373a79cc89 100644
--- a/libs/gtkmm2ext/gtkmm2ext/utils.h
+++ b/libs/gtkmm2ext/gtkmm2ext/utils.h
@@ -36,8 +36,8 @@
 #include <gtkmm/filechooser.h>
 #include <gtkmm/menu.h>
 #include <gtkmm/treeview.h>
-#include <gdkmm/window.h> /* for WMDecoration */
-#include <gdkmm/pixbuf.h>
+#include <ydkmm/window.h> /* for WMDecoration */
+#include <ydkmm/pixbuf.h>
 
 #include "gtkmm2ext/visibility.h"
 
diff --git a/libs/gtkmm2ext/gtkmm2ext/window_proxy.h b/libs/gtkmm2ext/gtkmm2ext/window_proxy.h
index f613ad4b6f..26f5e54705 100644
--- a/libs/gtkmm2ext/gtkmm2ext/window_proxy.h
+++ b/libs/gtkmm2ext/gtkmm2ext/window_proxy.h
@@ -20,7 +20,7 @@
 #define __gtkmm2ext_window_proxy_h__
 
 #include <string>
-#include <gdkmm/event.h>
+#include <ydkmm/event.h>
 #include <glibmm/refptr.h>
 #include <sigc++/trackable.h>
 
diff --git a/libs/tk/ydkmm/bitmap.cc b/libs/tk/ydkmm/bitmap.cc
index bd5ac4935c..ce76b623f7 100644
--- a/libs/tk/ydkmm/bitmap.cc
+++ b/libs/tk/ydkmm/bitmap.cc
@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <gdkmm/bitmap.h>
-#include <gdkmm/private/bitmap_p.h>
+#include <ydkmm/bitmap.h>
+#include <ydkmm/private/bitmap_p.h>
 
 
 // -*- c++ -*-
@@ -27,7 +27,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdkmm/window.h>
+#include <ydkmm/window.h>
 #include <ydk/gdk.h>
 
 namespace Gdk
diff --git a/libs/tk/ydkmm/color.cc b/libs/tk/ydkmm/color.cc
index 4ccedba611..c42ac7e02d 100644
--- a/libs/tk/ydkmm/color.cc
+++ b/libs/tk/ydkmm/color.cc
@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <gdkmm/color.h>
-#include <gdkmm/private/color_p.h>
+#include <ydkmm/color.h>
+#include <ydkmm/private/color_p.h>
 
 
 // -*- c++ -*-
@@ -29,7 +29,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdkmm/colormap.h>
+#include <ydkmm/colormap.h>
 #include <ydk/gdk.h>
 
 namespace Gdk
diff --git a/libs/tk/ydkmm/colormap.cc b/libs/tk/ydkmm/colormap.cc
index 2253219174..9a8d54aa83 100644
--- a/libs/tk/ydkmm/colormap.cc
+++ b/libs/tk/ydkmm/colormap.cc
@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <gdkmm/colormap.h>
-#include <gdkmm/private/colormap_p.h>
+#include <ydkmm/colormap.h>
+#include <ydkmm/private/colormap_p.h>
 
 
 // -*- c++ -*-
diff --git a/libs/tk/ydkmm/cursor.cc b/libs/tk/ydkmm/cursor.cc
index bc1c980170..f312d9c8ef 100644
--- a/libs/tk/ydkmm/cursor.cc
+++ b/libs/tk/ydkmm/cursor.cc
@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <gdkmm/cursor.h>
-#include <gdkmm/private/cursor_p.h>
+#include <ydkmm/cursor.h>
+#include <ydkmm/private/cursor_p.h>
 
 
 // -*- c++ -*-
diff --git a/libs/tk/ydkmm/device.cc b/libs/tk/ydkmm/device.cc
index 2062984751..55e8f1b2f9 100644
--- a/libs/tk/ydkmm/device.cc
+++ b/libs/tk/ydkmm/device.cc
@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <gdkmm/device.h>
-#include <gdkmm/private/device_p.h>
+#include <ydkmm/device.h>
+#include <ydkmm/private/device_p.h>
 
 
 // -*- c++ -*-
@@ -28,8 +28,8 @@
  */
 
 #include <ydk/gdk.h>
-#include <gdkmm/cursor.h>
-#include <gdkmm/display.h>
+#include <ydkmm/cursor.h>
+#include <ydkmm/display.h>
 
 namespace Gdk
 {
diff --git a/libs/tk/ydkmm/display.cc b/libs/tk/ydkmm/display.cc
index 7b29577715..26c2b47382 100644
--- a/libs/tk/ydkmm/display.cc
+++ b/libs/tk/ydkmm/display.cc
@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <gdkmm/display.h>
-#include <gdkmm/private/display_p.h>
+#include <ydkmm/display.h>
+#include <ydkmm/private/display_p.h>
 
 #include <ydk/gdk.h>
 
@@ -30,7 +30,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdkmm/window.h>
+#include <ydkmm/window.h>
 #include <ydk/gdk.h>
 
 namespace Gdk
diff --git a/libs/tk/ydkmm/displaymanager.cc b/libs/tk/ydkmm/displaymanager.cc
index ba0400f099..835b3e82ac 100644
--- a/libs/tk/ydkmm/displaymanager.cc
+++ b/libs/tk/ydkmm/displaymanager.cc
@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <gdkmm/displaymanager.h>
-#include <gdkmm/private/displaymanager_p.h>
+#include <ydkmm/displaymanager.h>
+#include <ydkmm/private/displaymanager_p.h>
 
 
 // -*- c++ -*-
diff --git a/libs/tk/ydkmm/dragcontext.cc b/libs/tk/ydkmm/dragcontext.cc
index e37a4c1e8b..b8481de251 100644
--- a/libs/tk/ydkmm/dragcontext.cc
+++ b/libs/tk/ydkmm/dragcontext.cc
@@ -5,8 +5,8 @@
 
 #include <glibmm.h>
 
-#include <gdkmm/dragcontext.h>
-#include <gdkmm/private/dragcontext_p.h>
+#include <ydkmm/dragcontext.h>
+#include <ydkmm/private/dragcontext_p.h>
 
 
 // -*- c++ -*-
@@ -31,7 +31,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdkmm/window.h>
+#include <ydkmm/window.h>
 #include <ytk/ytk.h>
 #include <ydk/gdk.h>
 #include <glibmm/utility.h> //For ScopedPtr<>.
diff --git a/libs/tk/ydkmm/drawable.cc b/libs/tk/ydkmm/drawable.cc
index 592a9f7054..41f4b32964 100644
--- a/libs/tk/ydkmm/drawable.cc
+++ b/libs/tk/ydkmm/drawable.cc
@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <gdkmm/drawable.h>
-#include <gdkmm/private/drawable_p.h>
+#include <ydkmm/drawable.h>
+#include <ydkmm/private/drawable_p.h>
 
 
 // -*- c++ -*-
@@ -27,9 +27,9 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdkmm/gc.h>
-#include <gdkmm/display.h>
-#include <gdkmm/pixbuf.h>
+#include <ydkmm/gc.h>
+#include <ydkmm/display.h>
+#include <ydkmm/pixbuf.h>
 #include <ydk/gdk.h>
 
 namespace Gdk
diff --git a/libs/tk/ydkmm/event.cc b/libs/tk/ydkmm/event.cc
index 5a60a50e41..e45fb70039 100644
--- a/libs/tk/ydkmm/event.cc
+++ b/libs/tk/ydkmm/event.cc
@@ -5,8 +5,8 @@
 
 #include <glibmm.h>
 
-#include <gdkmm/event.h>
-#include <gdkmm/private/event_p.h>
+#include <ydkmm/event.h>
+#include <ydkmm/private/event_p.h>
 
 #include <ydk/gdk.h>
 
@@ -32,7 +32,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdkmm/display.h>
+#include <ydkmm/display.h>
 
 namespace Gdk
 {
diff --git a/libs/tk/ydkmm/gc.cc b/libs/tk/ydkmm/gc.cc
index 0eaa51cabc..4505908bc0 100644
--- a/libs/tk/ydkmm/gc.cc
+++ b/libs/tk/ydkmm/gc.cc
@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <gdkmm/gc.h>
-#include <gdkmm/private/gc_p.h>
+#include <ydkmm/gc.h>
+#include <ydkmm/private/gc_p.h>
 
 
 // -*- c++ -*-
@@ -30,11 +30,11 @@
  */
 
 #include <ydk/gdk.h>
-#include <gdkmm/color.h>
-//#include <gdkmm/font.h>
-//#include <gdkmm/pixmap.h>
-#include <gdkmm/bitmap.h>
-#include <gdkmm/colormap.h>
+#include <ydkmm/color.h>
+//#include <ydkmm/font.h>
+//#include <ydkmm/pixmap.h>
+#include <ydkmm/bitmap.h>
+#include <ydkmm/colormap.h>
 
 namespace Gdk
 {
diff --git a/libs/tk/ydkmm/general.cc b/libs/tk/ydkmm/general.cc
index 0b3a9d3d4f..937e186b6a 100644
--- a/libs/tk/ydkmm/general.cc
+++ b/libs/tk/ydkmm/general.cc
@@ -18,7 +18,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdkmm/general.h>
+#include <ydkmm/general.h>
 #include <ydk/gdk.h>
 
 namespace Gdk
diff --git a/libs/tk/ydkmm/image.cc b/libs/tk/ydkmm/image.cc
index cebd6bcb0f..0f86056d72 100644
--- a/libs/tk/ydkmm/image.cc
+++ b/libs/tk/ydkmm/image.cc
@@ -5,8 +5,8 @@
 
 #include <glibmm.h>
 
-#include <gdkmm/image.h>
-#include <gdkmm/private/image_p.h>
+#include <ydkmm/image.h>
+#include <ydkmm/private/image_p.h>
 
 
 // -*- c++ -*-
diff --git a/libs/tk/ydkmm/pixbuf.cc b/libs/tk/ydkmm/pixbuf.cc
index 24cd3af5f4..1ec02e3eb1 100644
--- a/libs/tk/ydkmm/pixbuf.cc
+++ b/libs/tk/ydkmm/pixbuf.cc
@@ -8,8 +8,8 @@
 
 #include <glibmm.h>
 
-#include <gdkmm/pixbuf.h>
-#include <gdkmm/private/pixbuf_p.h>
+#include <ydkmm/pixbuf.h>
+#include <ydkmm/private/pixbuf_p.h>
 
 #include <ydk-pixbuf/ydk-pixbuf.h>
 
diff --git a/libs/tk/ydkmm/pixbufanimation.cc b/libs/tk/ydkmm/pixbufanimation.cc
index 2cabc11368..bd432386df 100644
--- a/libs/tk/ydkmm/pixbufanimation.cc
+++ b/libs/tk/ydkmm/pixbufanimation.cc
@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <gdkmm/pixbufanimation.h>
-#include <gdkmm/private/pixbufanimation_p.h>
+#include <ydkmm/pixbufanimation.h>
+#include <ydkmm/private/pixbufanimation_p.h>
 
 
 // -*- c++ -*-
diff --git a/libs/tk/ydkmm/pixbufanimationiter.cc b/libs/tk/ydkmm/pixbufanimationiter.cc
index c9da71ebbe..f111558b52 100644
--- a/libs/tk/ydkmm/pixbufanimationiter.cc
+++ b/libs/tk/ydkmm/pixbufanimationiter.cc
@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <gdkmm/pixbufanimationiter.h>
-#include <gdkmm/private/pixbufanimationiter_p.h>
+#include <ydkmm/pixbufanimationiter.h>
+#include <ydkmm/private/pixbufanimationiter_p.h>
 
 
 // -*- c++ -*-
diff --git a/libs/tk/ydkmm/pixbufformat.cc b/libs/tk/ydkmm/pixbufformat.cc
index 9151aafada..6299b8cfdf 100644
--- a/libs/tk/ydkmm/pixbufformat.cc
+++ b/libs/tk/ydkmm/pixbufformat.cc
@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <gdkmm/pixbufformat.h>
-#include <gdkmm/private/pixbufformat_p.h>
+#include <ydkmm/pixbufformat.h>
+#include <ydkmm/private/pixbufformat_p.h>
 
 
 // -*- c++ -*-
diff --git a/libs/tk/ydkmm/pixbufloader.cc b/libs/tk/ydkmm/pixbufloader.cc
index 4fe47a27c0..bf0f8ae172 100644
--- a/libs/tk/ydkmm/pixbufloader.cc
+++ b/libs/tk/ydkmm/pixbufloader.cc
@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <gdkmm/pixbufloader.h>
-#include <gdkmm/private/pixbufloader_p.h>
+#include <ydkmm/pixbufloader.h>
+#include <ydkmm/private/pixbufloader_p.h>
 
 
 // -*- c++ -*-
diff --git a/libs/tk/ydkmm/pixmap.cc b/libs/tk/ydkmm/pixmap.cc
index d5942bdc5f..43a3e7066c 100644
--- a/libs/tk/ydkmm/pixmap.cc
+++ b/libs/tk/ydkmm/pixmap.cc
@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <gdkmm/pixmap.h>
-#include <gdkmm/private/pixmap_p.h>
+#include <ydkmm/pixmap.h>
+#include <ydkmm/private/pixmap_p.h>
 
 
 // -*- c++ -*-
@@ -27,8 +27,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdkmm/window.h>
-#include <gdkmm/display.h>
+#include <ydkmm/window.h>
+#include <ydkmm/display.h>
 #include <ydk/gdk.h>
 
 
diff --git a/libs/tk/ydkmm/rectangle.cc b/libs/tk/ydkmm/rectangle.cc
index 0f0458ea7f..128697dfc2 100644
--- a/libs/tk/ydkmm/rectangle.cc
+++ b/libs/tk/ydkmm/rectangle.cc
@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <gdkmm/rectangle.h>
-#include <gdkmm/private/rectangle_p.h>
+#include <ydkmm/rectangle.h>
+#include <ydkmm/private/rectangle_p.h>
 
 #include <cstring> // std::memset()
 
diff --git a/libs/tk/ydkmm/region.cc b/libs/tk/ydkmm/region.cc
index 04c2ac44e0..93472b2802 100644
--- a/libs/tk/ydkmm/region.cc
+++ b/libs/tk/ydkmm/region.cc
@@ -5,8 +5,8 @@
 
 #include <glibmm.h>
 
-#include <gdkmm/region.h>
-#include <gdkmm/private/region_p.h>
+#include <ydkmm/region.h>
+#include <ydkmm/private/region_p.h>
 
 #include <ydk/gdk.h>
 
diff --git a/libs/tk/ydkmm/rgb.cc b/libs/tk/ydkmm/rgb.cc
index 49d71754fd..dec650f59f 100644
--- a/libs/tk/ydkmm/rgb.cc
+++ b/libs/tk/ydkmm/rgb.cc
@@ -19,7 +19,7 @@
  */
 
 #include <glibmm/listhandle.h>
-#include <gdkmm/rgb.h>
+#include <ydkmm/rgb.h>
 #include <ydk/gdk.h>
 
 namespace Gdk
diff --git a/libs/tk/ydkmm/rgbcmap.cc b/libs/tk/ydkmm/rgbcmap.cc
index bea0e570dd..54d965e48f 100644
--- a/libs/tk/ydkmm/rgbcmap.cc
+++ b/libs/tk/ydkmm/rgbcmap.cc
@@ -5,8 +5,8 @@
 
 #include <glibmm.h>
 
-#include <gdkmm/rgbcmap.h>
-#include <gdkmm/private/rgbcmap_p.h>
+#include <ydkmm/rgbcmap.h>
+#include <ydkmm/private/rgbcmap_p.h>
 
 
 // -*- c++ -*-
diff --git a/libs/tk/ydkmm/screen.cc b/libs/tk/ydkmm/screen.cc
index 6d5574727e..3ded7a197c 100644
--- a/libs/tk/ydkmm/screen.cc
+++ b/libs/tk/ydkmm/screen.cc
@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <gdkmm/screen.h>
-#include <gdkmm/private/screen_p.h>
+#include <ydkmm/screen.h>
+#include <ydkmm/private/screen_p.h>
 
 
 // -*- c++ -*-
@@ -29,10 +29,10 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdkmm/display.h>
-#include <gdkmm/visual.h>
-#include <gdkmm/window.h>
-#include <gdkmm/rectangle.h>
+#include <ydkmm/display.h>
+#include <ydkmm/visual.h>
+#include <ydkmm/window.h>
+#include <ydkmm/rectangle.h>
 #include <ydk/gdk.h>
 
 namespace Gdk
diff --git a/libs/tk/ydkmm/types.cc b/libs/tk/ydkmm/types.cc
index 7a3d7ad7e1..6f303ec803 100644
--- a/libs/tk/ydkmm/types.cc
+++ b/libs/tk/ydkmm/types.cc
@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <gdkmm/types.h>
-#include <gdkmm/private/types_p.h>
+#include <ydkmm/types.h>
+#include <ydkmm/private/types_p.h>
 
 
 // -*- c++ -*-
diff --git a/libs/tk/ydkmm/visual.cc b/libs/tk/ydkmm/visual.cc
index 67036fd19e..6cf152ca60 100644
--- a/libs/tk/ydkmm/visual.cc
+++ b/libs/tk/ydkmm/visual.cc
@@ -3,8 +3,8 @@
 
 #include <glibmm.h>
 
-#include <gdkmm/visual.h>
-#include <gdkmm/private/visual_p.h>
+#include <ydkmm/visual.h>
+#include <ydkmm/private/visual_p.h>
 
 
 // -*- c++ -*-
diff --git a/libs/tk/ydkmm/window.cc b/libs/tk/ydkmm/window.cc
index 8f319c27ef..865799dbf9 100644
--- a/libs/tk/ydkmm/window.cc
+++ b/libs/tk/ydkmm/window.cc
@@ -5,8 +5,8 @@
 
 #include <glibmm.h>
 
-#include <gdkmm/window.h>
-#include <gdkmm/private/window_p.h>
+#include <ydkmm/window.h>
+#include <ydkmm/private/window_p.h>
 
 
 // -*- c++ -*-
@@ -30,9 +30,9 @@
  */
 
 #include <ydk/gdk.h>
-#include <gdkmm/pixmap.h>
-#include <gdkmm/cursor.h>
-#include <gdkmm/types.h>
+#include <ydkmm/pixmap.h>
+#include <ydkmm/cursor.h>
+#include <ydkmm/types.h>
 
 
 namespace Gdk
diff --git a/libs/tk/ydkmm/wrap_init.cc b/libs/tk/ydkmm/wrap_init.cc
index 28c7fc63d1..aa8b0aa3c8 100644
--- a/libs/tk/ydkmm/wrap_init.cc
+++ b/libs/tk/ydkmm/wrap_init.cc
@@ -8,36 +8,36 @@
 #undef  G_GNUC_CONST
 #define G_GNUC_CONST /* empty */
 
-#include <gdkmm/wrap_init.h>
+#include <ydkmm/wrap_init.h>
 #include <glibmm/error.h>
 #include <glibmm/object.h>
 
 // #include the widget headers so that we can call the get_type() static methods:
-#include "gdkmm/bitmap.h"
-#include "gdkmm/color.h"
-#include "gdkmm/colormap.h"
-#include "gdkmm/cursor.h"
-#include "gdkmm/device.h"
-#include "gdkmm/display.h"
-#include "gdkmm/displaymanager.h"
-#include "gdkmm/dragcontext.h"
-#include "gdkmm/drawable.h"
-#include "gdkmm/event.h"
-#include "gdkmm/gc.h"
-#include "gdkmm/image.h"
-#include "gdkmm/pixbuf.h"
-#include "gdkmm/pixbufanimation.h"
-#include "gdkmm/pixbufanimationiter.h"
-#include "gdkmm/pixbufformat.h"
-#include "gdkmm/pixbufloader.h"
-#include "gdkmm/pixmap.h"
-#include "gdkmm/rectangle.h"
-#include "gdkmm/region.h"
-#include "gdkmm/rgbcmap.h"
-#include "gdkmm/screen.h"
-#include "gdkmm/types.h"
-#include "gdkmm/visual.h"
-#include "gdkmm/window.h"
+#include "ydkmm/bitmap.h"
+#include "ydkmm/color.h"
+#include "ydkmm/colormap.h"
+#include "ydkmm/cursor.h"
+#include "ydkmm/device.h"
+#include "ydkmm/display.h"
+#include "ydkmm/displaymanager.h"
+#include "ydkmm/dragcontext.h"
+#include "ydkmm/drawable.h"
+#include "ydkmm/event.h"
+#include "ydkmm/gc.h"
+#include "ydkmm/image.h"
+#include "ydkmm/pixbuf.h"
+#include "ydkmm/pixbufanimation.h"
+#include "ydkmm/pixbufanimationiter.h"
+#include "ydkmm/pixbufformat.h"
+#include "ydkmm/pixbufloader.h"
+#include "ydkmm/pixmap.h"
+#include "ydkmm/rectangle.h"
+#include "ydkmm/region.h"
+#include "ydkmm/rgbcmap.h"
+#include "ydkmm/screen.h"
+#include "ydkmm/types.h"
+#include "ydkmm/visual.h"
+#include "ydkmm/window.h"
 
 extern "C"
 {
diff --git a/libs/tk/ydkmm/wscript b/libs/tk/ydkmm/wscript
index aaee30aaf6..b1dc925890 100644
--- a/libs/tk/ydkmm/wscript
+++ b/libs/tk/ydkmm/wscript
@@ -54,8 +54,8 @@ def build(bld):
     obj = bld.shlib(features = 'cxx cxxshlib', source=libydkmm_sources)
     obj.cxxflags        = [ bld.env['compiler_flags_dict']['pic'] ]
     obj.cflags          = [ bld.env['compiler_flags_dict']['pic'] ]
-    obj.export_includes = ['ydkmm']
-    obj.includes        = ['.', 'ydkmm']
+    obj.export_includes = ['.']
+    obj.includes        = ['.']
     obj.name            = 'libydkmm'
     obj.target          = 'ydkmm'
     obj.use             = 'libztkmm libytk'
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/bitmap.h b/libs/tk/ydkmm/ydkmm/bitmap.h
similarity index 98%
rename from libs/tk/ydkmm/ydkmm/gdkmm/bitmap.h
rename to libs/tk/ydkmm/ydkmm/bitmap.h
index 8d09be1639..db19194964 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/bitmap.h
+++ b/libs/tk/ydkmm/ydkmm/bitmap.h
@@ -26,7 +26,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdkmm/pixmap.h>
+#include <ydkmm/pixmap.h>
 
 
 namespace Gdk
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/color.h b/libs/tk/ydkmm/ydkmm/color.h
similarity index 99%
rename from libs/tk/ydkmm/ydkmm/gdkmm/color.h
rename to libs/tk/ydkmm/ydkmm/color.h
index 608955ed53..5865826f11 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/color.h
+++ b/libs/tk/ydkmm/ydkmm/color.h
@@ -3,7 +3,7 @@
 #ifndef _GDKMM_COLOR_H
 #define _GDKMM_COLOR_H
 
-#include <gdkmmconfig.h>
+#include <ydkmm/ydkmmconfig.h>
 
 
 #include <glibmm/ustring.h>
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/colormap.h b/libs/tk/ydkmm/ydkmm/colormap.h
similarity index 98%
rename from libs/tk/ydkmm/ydkmm/gdkmm/colormap.h
rename to libs/tk/ydkmm/ydkmm/colormap.h
index e9a641cfd4..b0b922978f 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/colormap.h
+++ b/libs/tk/ydkmm/ydkmm/colormap.h
@@ -3,7 +3,7 @@
 #ifndef _GDKMM_COLORMAP_H
 #define _GDKMM_COLORMAP_H
 
-#include <gdkmmconfig.h>
+#include <ydkmm/ydkmmconfig.h>
 
 
 #include <glibmm/ustring.h>
@@ -35,8 +35,8 @@
 
 
 #include <glibmm/object.h>
-#include <gdkmm/visual.h>
-#include <gdkmm/color.h>
+#include <ydkmm/visual.h>
+#include <ydkmm/color.h>
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/cursor.h b/libs/tk/ydkmm/ydkmm/cursor.h
similarity index 98%
rename from libs/tk/ydkmm/ydkmm/gdkmm/cursor.h
rename to libs/tk/ydkmm/ydkmm/cursor.h
index 9270fa2dc5..4a5df4850b 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/cursor.h
+++ b/libs/tk/ydkmm/ydkmm/cursor.h
@@ -28,10 +28,10 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdkmm/bitmap.h>
-#include <gdkmm/display.h>
-#include <gdkmm/pixbuf.h>
-#include <gdkmm/color.h>
+#include <ydkmm/bitmap.h>
+#include <ydkmm/display.h>
+#include <ydkmm/pixbuf.h>
+#include <ydkmm/color.h>
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/device.h b/libs/tk/ydkmm/ydkmm/device.h
similarity index 98%
rename from libs/tk/ydkmm/ydkmm/gdkmm/device.h
rename to libs/tk/ydkmm/ydkmm/device.h
index b8d5566211..45825448e5 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/device.h
+++ b/libs/tk/ydkmm/ydkmm/device.h
@@ -26,10 +26,10 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdkmm/window.h>
-#include <gdkmm/event.h>
+#include <ydkmm/window.h>
+#include <ydkmm/event.h>
 
-//#include <gdkmm/display.h>
+//#include <ydkmm/display.h>
 #include <ydk/gdk.h>
 
 
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/display.h b/libs/tk/ydkmm/ydkmm/display.h
similarity index 99%
rename from libs/tk/ydkmm/ydkmm/gdkmm/display.h
rename to libs/tk/ydkmm/ydkmm/display.h
index db9a4d3567..5eebba18ff 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/display.h
+++ b/libs/tk/ydkmm/ydkmm/display.h
@@ -28,9 +28,9 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdkmm/screen.h>
-#include <gdkmm/device.h>
-#include <gdkmm/types.h> //For ModifierType
+#include <ydkmm/screen.h>
+#include <ydkmm/device.h>
+#include <ydkmm/types.h> //For ModifierType
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/displaymanager.h b/libs/tk/ydkmm/ydkmm/displaymanager.h
similarity index 99%
rename from libs/tk/ydkmm/ydkmm/gdkmm/displaymanager.h
rename to libs/tk/ydkmm/ydkmm/displaymanager.h
index b902474c51..9df7f5bdd3 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/displaymanager.h
+++ b/libs/tk/ydkmm/ydkmm/displaymanager.h
@@ -29,7 +29,7 @@
  */
 
 #include <glibmm/object.h>
-#include <gdkmm/display.h>
+#include <ydkmm/display.h>
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/dragcontext.h b/libs/tk/ydkmm/ydkmm/dragcontext.h
similarity index 99%
rename from libs/tk/ydkmm/ydkmm/gdkmm/dragcontext.h
rename to libs/tk/ydkmm/ydkmm/dragcontext.h
index d480ae2142..b6d0b0678d 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/dragcontext.h
+++ b/libs/tk/ydkmm/ydkmm/dragcontext.h
@@ -30,9 +30,9 @@
 
 
 #include <glibmm/object.h>
-#include <gdkmm/pixbuf.h>
-//#include <gdkmm/bitmap.h>
-#include <gdkmm/colormap.h>
+#include <ydkmm/pixbuf.h>
+//#include <ydkmm/bitmap.h>
+#include <ydkmm/colormap.h>
 #include <glibmm/listhandle.h>
 
 
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/drawable.h b/libs/tk/ydkmm/ydkmm/drawable.h
similarity index 99%
rename from libs/tk/ydkmm/ydkmm/gdkmm/drawable.h
rename to libs/tk/ydkmm/ydkmm/drawable.h
index 05d7f261b8..12699ef250 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/drawable.h
+++ b/libs/tk/ydkmm/ydkmm/drawable.h
@@ -30,14 +30,14 @@
 #include <pangomm/layout.h>
 #include <pangomm/layoutline.h>
 #include <pangomm/glyphstring.h>
-#include <gdkmm/region.h>
-#include <gdkmm/gc.h>
-#include <gdkmm/image.h>
-#include <gdkmm/color.h>
-#include <gdkmm/rgbcmap.h>
-#include <gdkmm/types.h>
+#include <ydkmm/region.h>
+#include <ydkmm/gc.h>
+#include <ydkmm/image.h>
+#include <ydkmm/color.h>
+#include <ydkmm/rgbcmap.h>
+#include <ydkmm/types.h>
 #include <cairomm/context.h>
-//#include <gdkmm/pixbuf.h>
+//#include <ydkmm/pixbuf.h>
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/event.h b/libs/tk/ydkmm/ydkmm/event.h
similarity index 99%
rename from libs/tk/ydkmm/ydkmm/gdkmm/event.h
rename to libs/tk/ydkmm/ydkmm/event.h
index 7c3710d102..899ce33f66 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/event.h
+++ b/libs/tk/ydkmm/ydkmm/event.h
@@ -25,8 +25,8 @@
  */
 
  
-#include <gdkmm/window.h>
-#include <gdkmm/screen.h>
+#include <ydkmm/window.h>
+#include <ydkmm/screen.h>
 
 /* Shadow DELETE macro (from winnt.h).
  */
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/gc.h b/libs/tk/ydkmm/ydkmm/gc.h
similarity index 99%
rename from libs/tk/ydkmm/ydkmm/gdkmm/gc.h
rename to libs/tk/ydkmm/ydkmm/gc.h
index 2799f4b9b5..5d47b82355 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/gc.h
+++ b/libs/tk/ydkmm/ydkmm/gc.h
@@ -29,11 +29,11 @@
  */
 
 #include <glibmm/object.h>
-#include <gdkmm/region.h>
-#include <gdkmm/drawable.h>
-#include <gdkmm/types.h>
-#include <gdkmm/rectangle.h>
-#include <gdkmm/screen.h>
+#include <ydkmm/region.h>
+#include <ydkmm/drawable.h>
+#include <ydkmm/types.h>
+#include <ydkmm/rectangle.h>
+#include <ydkmm/screen.h>
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/general.h b/libs/tk/ydkmm/ydkmm/general.h
similarity index 99%
rename from libs/tk/ydkmm/ydkmm/gdkmm/general.h
rename to libs/tk/ydkmm/ydkmm/general.h
index 40dd9803da..f7977e77dd 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/general.h
+++ b/libs/tk/ydkmm/ydkmm/general.h
@@ -20,7 +20,7 @@
 #ifndef _GDKMM_GENERAL_H
 #define _GDKMM_GENERAL_H
 
-#include <gdkmm/pixbuf.h>
+#include <ydkmm/pixbuf.h>
 #include <cairomm/context.h>
 
 namespace Gdk
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/image.h b/libs/tk/ydkmm/ydkmm/image.h
similarity index 99%
rename from libs/tk/ydkmm/ydkmm/gdkmm/image.h
rename to libs/tk/ydkmm/ydkmm/image.h
index 0ebcb31bcf..023670f950 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/image.h
+++ b/libs/tk/ydkmm/ydkmm/image.h
@@ -29,9 +29,9 @@
  */
 
 #include <glibmm/object.h>
-#include <gdkmm/visual.h>
-#include <gdkmm/colormap.h>
-#include <gdkmm/types.h> //For ByteOrder.
+#include <ydkmm/visual.h>
+#include <ydkmm/colormap.h>
+#include <ydkmm/types.h> //For ByteOrder.
 
  
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/list.h b/libs/tk/ydkmm/ydkmm/list.h
similarity index 100%
rename from libs/tk/ydkmm/ydkmm/gdkmm/list.h
rename to libs/tk/ydkmm/ydkmm/list.h
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/pixbuf.h b/libs/tk/ydkmm/ydkmm/pixbuf.h
similarity index 99%
rename from libs/tk/ydkmm/ydkmm/gdkmm/pixbuf.h
rename to libs/tk/ydkmm/ydkmm/pixbuf.h
index 8797282f29..eef2dad14e 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/pixbuf.h
+++ b/libs/tk/ydkmm/ydkmm/pixbuf.h
@@ -3,7 +3,7 @@
 #ifndef _GDKMM_PIXBUF_H
 #define _GDKMM_PIXBUF_H
 
-#include <gdkmmconfig.h>
+#include <ydkmm/ydkmmconfig.h>
 
 
 #include <glibmm/ustring.h>
@@ -30,12 +30,12 @@
 // the #ifndef GDKMM_DISABLE_DEPRECATED in deprecated classes) is generated:
 
 
-#include <gdkmm/drawable.h>
-#include <gdkmm/image.h>
-#include <gdkmm/pixmap.h>
-#include <gdkmm/bitmap.h>
-#include <gdkmm/pixbufformat.h>
-#include <gdkmm/types.h>
+#include <ydkmm/drawable.h>
+#include <ydkmm/image.h>
+#include <ydkmm/pixmap.h>
+#include <ydkmm/bitmap.h>
+#include <ydkmm/pixbufformat.h>
+#include <ydkmm/types.h>
 #include <giomm/inputstream.h>
 
 
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/pixbufanimation.h b/libs/tk/ydkmm/ydkmm/pixbufanimation.h
similarity index 98%
rename from libs/tk/ydkmm/ydkmm/gdkmm/pixbufanimation.h
rename to libs/tk/ydkmm/ydkmm/pixbufanimation.h
index 1593558a01..5faa582575 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/pixbufanimation.h
+++ b/libs/tk/ydkmm/ydkmm/pixbufanimation.h
@@ -29,8 +29,8 @@
  */
 
 #include <glibmm/object.h>
-#include <gdkmm/pixbuf.h>
-#include <gdkmm/pixbufanimationiter.h>
+#include <ydkmm/pixbuf.h>
+#include <ydkmm/pixbufanimationiter.h>
 #include <ydk-pixbuf/ydk-pixbuf.h>
 
 
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/pixbufanimationiter.h b/libs/tk/ydkmm/ydkmm/pixbufanimationiter.h
similarity index 99%
rename from libs/tk/ydkmm/ydkmm/gdkmm/pixbufanimationiter.h
rename to libs/tk/ydkmm/ydkmm/pixbufanimationiter.h
index 6a9a7869da..6bd917fba0 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/pixbufanimationiter.h
+++ b/libs/tk/ydkmm/ydkmm/pixbufanimationiter.h
@@ -29,7 +29,7 @@
  */
 
 #include <glibmm/object.h>
-#include <gdkmm/pixbuf.h>
+#include <ydkmm/pixbuf.h>
 #include <glibmm/timeval.h>
 #include <ydk-pixbuf/ydk-pixbuf.h>
 
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/pixbufformat.h b/libs/tk/ydkmm/ydkmm/pixbufformat.h
similarity index 98%
rename from libs/tk/ydkmm/ydkmm/gdkmm/pixbufformat.h
rename to libs/tk/ydkmm/ydkmm/pixbufformat.h
index 169638a989..c266ae07f3 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/pixbufformat.h
+++ b/libs/tk/ydkmm/ydkmm/pixbufformat.h
@@ -27,7 +27,7 @@
  */
 
 
-#include <gdkmmconfig.h>
+#include <ydkmm/ydkmmconfig.h>
 #include <glibmm/arrayhandle.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/pixbufloader.h b/libs/tk/ydkmm/ydkmm/pixbufloader.h
similarity index 99%
rename from libs/tk/ydkmm/ydkmm/gdkmm/pixbufloader.h
rename to libs/tk/ydkmm/ydkmm/pixbufloader.h
index 9e289c3839..fc478523d6 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/pixbufloader.h
+++ b/libs/tk/ydkmm/ydkmm/pixbufloader.h
@@ -27,9 +27,9 @@
  */
 
 #include <glibmm/object.h>
-#include <gdkmm/pixbuf.h>
-#include <gdkmm/pixbufanimation.h>
-#include <gdkmm/pixbufformat.h>
+#include <ydkmm/pixbuf.h>
+#include <ydkmm/pixbufanimation.h>
+#include <ydkmm/pixbufformat.h>
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/pixmap.h b/libs/tk/ydkmm/ydkmm/pixmap.h
similarity index 98%
rename from libs/tk/ydkmm/ydkmm/gdkmm/pixmap.h
rename to libs/tk/ydkmm/ydkmm/pixmap.h
index b4f4683823..1437d417c8 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/pixmap.h
+++ b/libs/tk/ydkmm/ydkmm/pixmap.h
@@ -26,10 +26,10 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdkmm/drawable.h>
-#include <gdkmm/color.h>
-#include <gdkmm/colormap.h>
-#include <gdkmm/types.h>
+#include <ydkmm/drawable.h>
+#include <ydkmm/color.h>
+#include <ydkmm/colormap.h>
+#include <ydkmm/types.h>
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/private/bitmap_p.h b/libs/tk/ydkmm/ydkmm/private/bitmap_p.h
similarity index 80%
rename from libs/tk/ydkmm/ydkmm/gdkmm/private/bitmap_p.h
rename to libs/tk/ydkmm/ydkmm/private/bitmap_p.h
index a4226a83ba..8f1ca5ad8c 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/private/bitmap_p.h
+++ b/libs/tk/ydkmm/ydkmm/private/bitmap_p.h
@@ -4,7 +4,7 @@
 #define _GDKMM_BITMAP_P_H
 
 
-#include <gdkmm/private/pixmap_p.h>
+#include <ydkmm/private/pixmap_p.h>
 
 
 #endif /* _GDKMM_BITMAP_P_H */
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/private/color_p.h b/libs/tk/ydkmm/ydkmm/private/color_p.h
similarity index 100%
rename from libs/tk/ydkmm/ydkmm/gdkmm/private/color_p.h
rename to libs/tk/ydkmm/ydkmm/private/color_p.h
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/private/colormap_p.h b/libs/tk/ydkmm/ydkmm/private/colormap_p.h
similarity index 100%
rename from libs/tk/ydkmm/ydkmm/gdkmm/private/colormap_p.h
rename to libs/tk/ydkmm/ydkmm/private/colormap_p.h
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/private/cursor_p.h b/libs/tk/ydkmm/ydkmm/private/cursor_p.h
similarity index 100%
rename from libs/tk/ydkmm/ydkmm/gdkmm/private/cursor_p.h
rename to libs/tk/ydkmm/ydkmm/private/cursor_p.h
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/private/device_p.h b/libs/tk/ydkmm/ydkmm/private/device_p.h
similarity index 100%
rename from libs/tk/ydkmm/ydkmm/gdkmm/private/device_p.h
rename to libs/tk/ydkmm/ydkmm/private/device_p.h
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/private/display_p.h b/libs/tk/ydkmm/ydkmm/private/display_p.h
similarity index 100%
rename from libs/tk/ydkmm/ydkmm/gdkmm/private/display_p.h
rename to libs/tk/ydkmm/ydkmm/private/display_p.h
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/private/displaymanager_p.h b/libs/tk/ydkmm/ydkmm/private/displaymanager_p.h
similarity index 100%
rename from libs/tk/ydkmm/ydkmm/gdkmm/private/displaymanager_p.h
rename to libs/tk/ydkmm/ydkmm/private/displaymanager_p.h
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/private/dragcontext_p.h b/libs/tk/ydkmm/ydkmm/private/dragcontext_p.h
similarity index 100%
rename from libs/tk/ydkmm/ydkmm/gdkmm/private/dragcontext_p.h
rename to libs/tk/ydkmm/ydkmm/private/dragcontext_p.h
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/private/drawable_p.h b/libs/tk/ydkmm/ydkmm/private/drawable_p.h
similarity index 100%
rename from libs/tk/ydkmm/ydkmm/gdkmm/private/drawable_p.h
rename to libs/tk/ydkmm/ydkmm/private/drawable_p.h
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/private/event_p.h b/libs/tk/ydkmm/ydkmm/private/event_p.h
similarity index 100%
rename from libs/tk/ydkmm/ydkmm/gdkmm/private/event_p.h
rename to libs/tk/ydkmm/ydkmm/private/event_p.h
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/private/gc_p.h b/libs/tk/ydkmm/ydkmm/private/gc_p.h
similarity index 100%
rename from libs/tk/ydkmm/ydkmm/gdkmm/private/gc_p.h
rename to libs/tk/ydkmm/ydkmm/private/gc_p.h
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/private/image_p.h b/libs/tk/ydkmm/ydkmm/private/image_p.h
similarity index 100%
rename from libs/tk/ydkmm/ydkmm/gdkmm/private/image_p.h
rename to libs/tk/ydkmm/ydkmm/private/image_p.h
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/private/pixbuf_p.h b/libs/tk/ydkmm/ydkmm/private/pixbuf_p.h
similarity index 100%
rename from libs/tk/ydkmm/ydkmm/gdkmm/private/pixbuf_p.h
rename to libs/tk/ydkmm/ydkmm/private/pixbuf_p.h
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/private/pixbufanimation_p.h b/libs/tk/ydkmm/ydkmm/private/pixbufanimation_p.h
similarity index 100%
rename from libs/tk/ydkmm/ydkmm/gdkmm/private/pixbufanimation_p.h
rename to libs/tk/ydkmm/ydkmm/private/pixbufanimation_p.h
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/private/pixbufanimationiter_p.h b/libs/tk/ydkmm/ydkmm/private/pixbufanimationiter_p.h
similarity index 100%
rename from libs/tk/ydkmm/ydkmm/gdkmm/private/pixbufanimationiter_p.h
rename to libs/tk/ydkmm/ydkmm/private/pixbufanimationiter_p.h
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/private/pixbufformat_p.h b/libs/tk/ydkmm/ydkmm/private/pixbufformat_p.h
similarity index 100%
rename from libs/tk/ydkmm/ydkmm/gdkmm/private/pixbufformat_p.h
rename to libs/tk/ydkmm/ydkmm/private/pixbufformat_p.h
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/private/pixbufloader_p.h b/libs/tk/ydkmm/ydkmm/private/pixbufloader_p.h
similarity index 100%
rename from libs/tk/ydkmm/ydkmm/gdkmm/private/pixbufloader_p.h
rename to libs/tk/ydkmm/ydkmm/private/pixbufloader_p.h
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/private/pixmap_p.h b/libs/tk/ydkmm/ydkmm/private/pixmap_p.h
similarity index 96%
rename from libs/tk/ydkmm/ydkmm/gdkmm/private/pixmap_p.h
rename to libs/tk/ydkmm/ydkmm/private/pixmap_p.h
index b528df292b..3b56dcae74 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/private/pixmap_p.h
+++ b/libs/tk/ydkmm/ydkmm/private/pixmap_p.h
@@ -4,7 +4,7 @@
 #define _GDKMM_PIXMAP_P_H
 
 
-#include <gdkmm/private/drawable_p.h>
+#include <ydkmm/private/drawable_p.h>
 
 #include <glibmm/class.h>
 
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/private/rectangle_p.h b/libs/tk/ydkmm/ydkmm/private/rectangle_p.h
similarity index 100%
rename from libs/tk/ydkmm/ydkmm/gdkmm/private/rectangle_p.h
rename to libs/tk/ydkmm/ydkmm/private/rectangle_p.h
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/private/region_p.h b/libs/tk/ydkmm/ydkmm/private/region_p.h
similarity index 100%
rename from libs/tk/ydkmm/ydkmm/gdkmm/private/region_p.h
rename to libs/tk/ydkmm/ydkmm/private/region_p.h
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/private/rgbcmap_p.h b/libs/tk/ydkmm/ydkmm/private/rgbcmap_p.h
similarity index 100%
rename from libs/tk/ydkmm/ydkmm/gdkmm/private/rgbcmap_p.h
rename to libs/tk/ydkmm/ydkmm/private/rgbcmap_p.h
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/private/screen_p.h b/libs/tk/ydkmm/ydkmm/private/screen_p.h
similarity index 100%
rename from libs/tk/ydkmm/ydkmm/gdkmm/private/screen_p.h
rename to libs/tk/ydkmm/ydkmm/private/screen_p.h
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/private/types_p.h b/libs/tk/ydkmm/ydkmm/private/types_p.h
similarity index 100%
rename from libs/tk/ydkmm/ydkmm/gdkmm/private/types_p.h
rename to libs/tk/ydkmm/ydkmm/private/types_p.h
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/private/visual_p.h b/libs/tk/ydkmm/ydkmm/private/visual_p.h
similarity index 100%
rename from libs/tk/ydkmm/ydkmm/gdkmm/private/visual_p.h
rename to libs/tk/ydkmm/ydkmm/private/visual_p.h
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/private/window_p.h b/libs/tk/ydkmm/ydkmm/private/window_p.h
similarity index 96%
rename from libs/tk/ydkmm/ydkmm/gdkmm/private/window_p.h
rename to libs/tk/ydkmm/ydkmm/private/window_p.h
index 0e5d2fdde7..f2b3de3cfa 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/private/window_p.h
+++ b/libs/tk/ydkmm/ydkmm/private/window_p.h
@@ -4,7 +4,7 @@
 #define _GDKMM_WINDOW_P_H
 
 
-#include <gdkmm/private/drawable_p.h>
+#include <ydkmm/private/drawable_p.h>
 
 #include <glibmm/class.h>
 
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/rectangle.h b/libs/tk/ydkmm/ydkmm/rectangle.h
similarity index 100%
rename from libs/tk/ydkmm/ydkmm/gdkmm/rectangle.h
rename to libs/tk/ydkmm/ydkmm/rectangle.h
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/region.h b/libs/tk/ydkmm/ydkmm/region.h
similarity index 99%
rename from libs/tk/ydkmm/ydkmm/gdkmm/region.h
rename to libs/tk/ydkmm/ydkmm/region.h
index eaf917cc85..d1ceca3691 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/region.h
+++ b/libs/tk/ydkmm/ydkmm/region.h
@@ -64,8 +64,8 @@
 extern "C" { typedef struct _GdkRegion GdkRegion; }
 
 #include <glibmm/arrayhandle.h>
-#include <gdkmm/types.h>
-#include <gdkmm/rectangle.h>
+#include <ydkmm/types.h>
+#include <ydkmm/rectangle.h>
 
 
 namespace Gdk
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/rgb.h b/libs/tk/ydkmm/ydkmm/rgb.h
similarity index 97%
rename from libs/tk/ydkmm/ydkmm/gdkmm/rgb.h
rename to libs/tk/ydkmm/ydkmm/rgb.h
index d66150908a..324e5ec3ac 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/rgb.h
+++ b/libs/tk/ydkmm/ydkmm/rgb.h
@@ -20,8 +20,8 @@
 #ifndef _GDKMM_RGB_H
 #define _GDKMM_RGB_H
 
-#include <gdkmm/colormap.h>  
-#include <gdkmm/visual.h>
+#include <ydkmm/colormap.h>  
+#include <ydkmm/visual.h>
 
 namespace Gdk
 {
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/rgbcmap.h b/libs/tk/ydkmm/ydkmm/rgbcmap.h
similarity index 98%
rename from libs/tk/ydkmm/ydkmm/gdkmm/rgbcmap.h
rename to libs/tk/ydkmm/ydkmm/rgbcmap.h
index 02f204ede3..4f05249bda 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/rgbcmap.h
+++ b/libs/tk/ydkmm/ydkmm/rgbcmap.h
@@ -27,7 +27,7 @@
  */
 
 
-#include <gdkmmconfig.h>
+#include <ydkmm/ydkmmconfig.h>
 #include <glibmm/arrayhandle.h>
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/screen.h b/libs/tk/ydkmm/ydkmm/screen.h
similarity index 99%
rename from libs/tk/ydkmm/ydkmm/gdkmm/screen.h
rename to libs/tk/ydkmm/ydkmm/screen.h
index fcfda1554e..88b72ccdde 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/screen.h
+++ b/libs/tk/ydkmm/ydkmm/screen.h
@@ -28,10 +28,10 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-//#include <gdkmm/visual.h>
-//#include <gdkmm/window.h>
-#include <gdkmm/region.h> //Just to solve GDK_DISABLE_DEPRECATED problems when this header is included from elsewhere.
-#include <gdkmm/rectangle.h>
+//#include <ydkmm/visual.h>
+//#include <ydkmm/window.h>
+#include <ydkmm/region.h> //Just to solve GDK_DISABLE_DEPRECATED problems when this header is included from elsewhere.
+#include <ydkmm/rectangle.h>
 #include <glibmm/object.h>
 #include <cairomm/fontoptions.h>
 
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/types.h b/libs/tk/ydkmm/ydkmm/types.h
similarity index 99%
rename from libs/tk/ydkmm/ydkmm/gdkmm/types.h
rename to libs/tk/ydkmm/ydkmm/types.h
index 3a43ec0073..3b8f8b6c24 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/types.h
+++ b/libs/tk/ydkmm/ydkmm/types.h
@@ -30,7 +30,7 @@
 #include <glibmm/arrayhandle.h>
 #include <glibmm/listhandle.h>
 #include <ydk/gdk.h>
-#include <gdkmmconfig.h>
+#include <ydkmm/ydkmmconfig.h>
 
 /* Shadow ERROR macro (from wingdi.h).
  */
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/visual.h b/libs/tk/ydkmm/ydkmm/visual.h
similarity index 99%
rename from libs/tk/ydkmm/ydkmm/gdkmm/visual.h
rename to libs/tk/ydkmm/ydkmm/visual.h
index 182563bff8..c0cda98d79 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/visual.h
+++ b/libs/tk/ydkmm/ydkmm/visual.h
@@ -29,7 +29,7 @@
  */
 
 #include <glibmm/object.h>
-#include <gdkmm/screen.h>
+#include <ydkmm/screen.h>
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/window.h b/libs/tk/ydkmm/ydkmm/window.h
similarity index 99%
rename from libs/tk/ydkmm/ydkmm/gdkmm/window.h
rename to libs/tk/ydkmm/ydkmm/window.h
index f9d2e8a6d7..54dad898be 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm/window.h
+++ b/libs/tk/ydkmm/ydkmm/window.h
@@ -3,7 +3,7 @@
 #ifndef _GDKMM_WINDOW_H
 #define _GDKMM_WINDOW_H
 
-#include <gdkmmconfig.h>
+#include <ydkmm/ydkmmconfig.h>
 
 
 #include <glibmm/ustring.h>
@@ -27,12 +27,12 @@
  */
 
  
-#include <gdkmm/region.h>
-#include <gdkmm/drawable.h>
-#include <gdkmm/bitmap.h>
-//#include <gdkmm/cursor.h>
-#include <gdkmm/dragcontext.h>
-#include <gdkmm/types.h>
+#include <ydkmm/region.h>
+#include <ydkmm/drawable.h>
+#include <ydkmm/bitmap.h>
+//#include <ydkmm/cursor.h>
+#include <ydkmm/dragcontext.h>
+#include <ydkmm/types.h>
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm/wrap_init.h b/libs/tk/ydkmm/ydkmm/wrap_init.h
similarity index 100%
rename from libs/tk/ydkmm/ydkmm/gdkmm/wrap_init.h
rename to libs/tk/ydkmm/ydkmm/wrap_init.h
diff --git a/libs/tk/ydkmm/ydkmm/gdkmm.h b/libs/tk/ydkmm/ydkmm/ydkmm.h
similarity index 63%
rename from libs/tk/ydkmm/ydkmm/gdkmm.h
rename to libs/tk/ydkmm/ydkmm/ydkmm.h
index 05a7d1de9f..f0f028bd70 100644
--- a/libs/tk/ydkmm/ydkmm/gdkmm.h
+++ b/libs/tk/ydkmm/ydkmm/ydkmm.h
@@ -24,24 +24,24 @@
 #ifndef _GDKMM_GDKMM_H_
 #define _GDKMM_GDKMM_H_
 
-#include <gdkmm/screen.h>
-#include <gdkmm/types.h>
-#include <gdkmm/visual.h>
-#include <gdkmm/gc.h>
-#include <gdkmm/drawable.h>
-#include <gdkmm/window.h>
-#include <gdkmm/pixbuf.h>
-#include <gdkmm/pixbufanimation.h>
-#include <gdkmm/pixbufformat.h>
-#include <gdkmm/pixbufloader.h>
-#include <gdkmm/pixmap.h>
-#include <gdkmm/bitmap.h>
-#include <gdkmm/image.h>
-#include <gdkmm/cursor.h>
-#include <gdkmm/rectangle.h>
-#include <gdkmm/display.h>
-#include <gdkmm/displaymanager.h>
-#include <gdkmm/general.h>
-#include <gdkmm/rgb.h>
+#include <ydkmm/screen.h>
+#include <ydkmm/types.h>
+#include <ydkmm/visual.h>
+#include <ydkmm/gc.h>
+#include <ydkmm/drawable.h>
+#include <ydkmm/window.h>
+#include <ydkmm/pixbuf.h>
+#include <ydkmm/pixbufanimation.h>
+#include <ydkmm/pixbufformat.h>
+#include <ydkmm/pixbufloader.h>
+#include <ydkmm/pixmap.h>
+#include <ydkmm/bitmap.h>
+#include <ydkmm/image.h>
+#include <ydkmm/cursor.h>
+#include <ydkmm/rectangle.h>
+#include <ydkmm/display.h>
+#include <ydkmm/displaymanager.h>
+#include <ydkmm/general.h>
+#include <ydkmm/rgb.h>
 
 #endif /* _GDKMM_GDKMM_H_ */
diff --git a/libs/tk/ydkmm/ydkmm/gdkmmconfig.h b/libs/tk/ydkmm/ydkmm/ydkmmconfig.h
similarity index 100%
rename from libs/tk/ydkmm/ydkmm/gdkmmconfig.h
rename to libs/tk/ydkmm/ydkmm/ydkmmconfig.h
diff --git a/libs/tk/ytkmm/colorbutton.cc b/libs/tk/ytkmm/colorbutton.cc
index 9db046a4c6..ed9d2f722c 100644
--- a/libs/tk/ytkmm/colorbutton.cc
+++ b/libs/tk/ytkmm/colorbutton.cc
@@ -30,7 +30,7 @@
  */
 
 #include <ytk/ytk.h>
-#include <gdkmm/color.h>
+#include <ydkmm/color.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/handlebox.cc b/libs/tk/ytkmm/handlebox.cc
index 246790b623..7dee10c2d4 100644
--- a/libs/tk/ytkmm/handlebox.cc
+++ b/libs/tk/ytkmm/handlebox.cc
@@ -34,7 +34,7 @@
  */
 
 #include <ytk/ytk.h>
-#include <gdkmm/window.h>
+#include <ydkmm/window.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/image.cc b/libs/tk/ytkmm/image.cc
index 3779ccacc6..3c69b6cb94 100644
--- a/libs/tk/ytkmm/image.cc
+++ b/libs/tk/ytkmm/image.cc
@@ -31,9 +31,9 @@
  */
 
 #include <ytk/ytk.h>
-#include <gdkmm/image.h>
-#include <gdkmm/bitmap.h>
-#include <gdkmm/pixmap.h>
+#include <ydkmm/image.h>
+#include <ydkmm/bitmap.h>
+#include <ydkmm/pixmap.h>
 
 namespace Gtk
 {
diff --git a/libs/tk/ytkmm/main.cc b/libs/tk/ytkmm/main.cc
index 2be2c3065e..55c09212ab 100644
--- a/libs/tk/ytkmm/main.cc
+++ b/libs/tk/ytkmm/main.cc
@@ -44,7 +44,7 @@
 #ifdef GTKMM_ATKMM_ENABLED
 #include <ztkmm/wrap_init.h>
 #endif //GTKMM_ATKMM_ENABLED
-#include <gdkmm/wrap_init.h>
+#include <ydkmm/wrap_init.h>
 #include <gtkmm/wrap_init.h>
 
 namespace
diff --git a/libs/tk/ytkmm/selectiondata.cc b/libs/tk/ytkmm/selectiondata.cc
index f60152189a..9bea0ec0b6 100644
--- a/libs/tk/ytkmm/selectiondata.cc
+++ b/libs/tk/ytkmm/selectiondata.cc
@@ -28,7 +28,7 @@
  */
 
 #include <gtkmm/textbuffer.h>
-#include <gdkmm/pixbuf.h>
+#include <ydkmm/pixbuf.h>
 #include <glibmm/utility.h> //For ScopedPtr<>.
 #include <ytk/ytk.h>
 
diff --git a/libs/tk/ytkmm/tooltips.cc b/libs/tk/ytkmm/tooltips.cc
index d0e12d150c..bc64c62ff7 100644
--- a/libs/tk/ytkmm/tooltips.cc
+++ b/libs/tk/ytkmm/tooltips.cc
@@ -31,7 +31,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdkmm/color.h>
+#include <ydkmm/color.h>
 #include <gtkmm/widget.h>
 #include <ytk/ytk.h>
 
diff --git a/libs/tk/ytkmm/window.cc b/libs/tk/ytkmm/window.cc
index 91b07b0e41..422c0840d4 100644
--- a/libs/tk/ytkmm/window.cc
+++ b/libs/tk/ytkmm/window.cc
@@ -36,7 +36,7 @@
  */
 
 #include <gtkmm/accelgroup.h>
-#include <gdkmm/cursor.h>
+#include <ydkmm/cursor.h>
 #include <ytk/ytk.h>
 
 
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm.h b/libs/tk/ytkmm/ytkmm/gtkmm.h
index c489154775..2d5323f5e1 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm.h
@@ -93,7 +93,7 @@ extern const int gtkmm_micro_version;
 #include <glibmm.h>
 #endif
 #include <giomm.h>
-#include <gdkmm.h>
+#include <ydkmm/ydkmm.h>
 
 #include <gtkmm/box.h>
 #include <gtkmm/dialog.h>
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/accelgroup.h b/libs/tk/ytkmm/ytkmm/gtkmm/accelgroup.h
index c994311657..8229a5454d 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/accelgroup.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/accelgroup.h
@@ -27,7 +27,7 @@
  */
 
 
-#include <gdkmm/types.h>
+#include <ydkmm/types.h>
 #include <gtkmm/object.h>
 
 
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/accelkey.h b/libs/tk/ytkmm/ytkmm/gtkmm/accelkey.h
index de8fe7eb30..22f502b32b 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/accelkey.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/accelkey.h
@@ -22,7 +22,7 @@
  */
 
 #include <ydk/gdkkeysyms.h>
-#include <gdkmm/types.h>
+#include <ydkmm/types.h>
 
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/accelmap.h b/libs/tk/ytkmm/ytkmm/gtkmm/accelmap.h
index 776b8400f4..ce3695fc67 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/accelmap.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/accelmap.h
@@ -25,7 +25,7 @@
 
 #include <string>
 
-#include <gdkmm/types.h>
+#include <ydkmm/types.h>
 #include <gtkmm/accelkey.h>
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/assistant.h b/libs/tk/ytkmm/ytkmm/gtkmm/assistant.h
index 08dfffa748..e639ca7ab9 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/assistant.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/assistant.h
@@ -29,7 +29,7 @@
  */
 
 #include <gtkmm/window.h>
-#include <gdkmm/pixbuf.h>
+#include <ydkmm/pixbuf.h>
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/cellview.h b/libs/tk/ytkmm/ytkmm/gtkmm/cellview.h
index 2b0264dba7..f400a2ff02 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/cellview.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/cellview.h
@@ -33,7 +33,7 @@
 #include <gtkmm/treemodel.h>
 #include <gtkmm/treepath.h>
 #include <gtkmm/cellrenderer.h>
-#include <gdkmm/pixbuf.h>
+#include <ydkmm/pixbuf.h>
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/clipboard.h b/libs/tk/ytkmm/ytkmm/gtkmm/clipboard.h
index bb553aa061..8840f40cd3 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/clipboard.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/clipboard.h
@@ -28,8 +28,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdkmm/display.h> 
-#include <gdkmm/pixbuf.h>
+#include <ydkmm/display.h> 
+#include <ydkmm/pixbuf.h>
 #include <gtkmm/targetentry.h>
 #include <gtkmm/selectiondata.h>
 #include <glibmm/object.h>
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/colorbutton.h b/libs/tk/ytkmm/ytkmm/gtkmm/colorbutton.h
index 969609d9e5..e340b57994 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/colorbutton.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/colorbutton.h
@@ -29,7 +29,7 @@
  */
 
 #include <gtkmm/button.h>
-#include <gdkmm/color.h>
+#include <ydkmm/color.h>
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/iconinfo.h b/libs/tk/ytkmm/ytkmm/gtkmm/iconinfo.h
index f1347b69b7..3a99a1a147 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/iconinfo.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/iconinfo.h
@@ -24,9 +24,9 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdkmm/pixbuf.h>
-#include <gdkmm/rectangle.h>
-#include <gdkmm/types.h>
+#include <ydkmm/pixbuf.h>
+#include <ydkmm/rectangle.h>
+#include <ydkmm/types.h>
 
 //#include <ytk/gtkicontheme.h>
 
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/iconset.h b/libs/tk/ytkmm/ytkmm/gtkmm/iconset.h
index 93bf217e88..2bbacde18d 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/iconset.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/iconset.h
@@ -29,7 +29,7 @@
  */
 
 //#include <gtkmm/style.h>
-#include <gdkmm/pixbuf.h>
+#include <ydkmm/pixbuf.h>
 #include <gtkmm/iconsource.h>
 //#include <gtkmm/widget.h>
 #include <gtkmm/stockid.h>
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/iconsource.h b/libs/tk/ytkmm/ytkmm/gtkmm/iconsource.h
index 4ffd0ff2f4..13bc9f2692 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/iconsource.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/iconsource.h
@@ -28,7 +28,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdkmm/pixbuf.h>
+#include <ydkmm/pixbuf.h>
 #include <gtkmm/enums.h>
 
 
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/icontheme.h b/libs/tk/ytkmm/ytkmm/gtkmm/icontheme.h
index 82235a59a6..8226731e78 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/icontheme.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/icontheme.h
@@ -24,8 +24,8 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdkmm/pixbuf.h>
-#include <gdkmm/screen.h>
+#include <ydkmm/pixbuf.h>
+#include <ydkmm/screen.h>
 
 #include <gtkmm/iconinfo.h>
 #include <giomm/icon.h>
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/image.h b/libs/tk/ytkmm/ytkmm/gtkmm/image.h
index d61eb387ec..fb24fc5444 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/image.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/image.h
@@ -30,7 +30,7 @@
 
 #include <gtkmm/misc.h>
 #include <gtkmm/iconset.h>
-#include <gdkmm/pixbufanimation.h>
+#include <ydkmm/pixbufanimation.h>
 #include <giomm/icon.h>
 
 
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/layout.h b/libs/tk/ytkmm/ytkmm/gtkmm/layout.h
index 71db399535..2372dd8d8c 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/layout.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/layout.h
@@ -30,7 +30,7 @@
 
 #include <gtkmm/container.h>
 #include <gtkmm/adjustment.h>
-#include <gdkmm/window.h>
+#include <ydkmm/window.h>
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/main.h b/libs/tk/ytkmm/ytkmm/gtkmm/main.h
index ee0c5a17d5..36a90422e4 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/main.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/main.h
@@ -30,7 +30,7 @@
 
 
 #include <sigc++/sigc++.h>
-#include <gdkmm/types.h> //For GdkEventKey
+#include <ydkmm/types.h> //For GdkEventKey
 #include <glibmm/optioncontext.h>
 
 
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/recentinfo.h b/libs/tk/ytkmm/ytkmm/gtkmm/recentinfo.h
index 1921762225..7645961f47 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/recentinfo.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/recentinfo.h
@@ -24,7 +24,7 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <gdkmm/pixbuf.h>
+#include <ydkmm/pixbuf.h>
 #include <ctime>
 
 
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/recentmanager.h b/libs/tk/ytkmm/ytkmm/gtkmm/recentmanager.h
index 568e46028a..451cecc003 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/recentmanager.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/recentmanager.h
@@ -27,8 +27,8 @@
  */
 
  
-#include <gdkmm/screen.h>
-#include <gdkmm/pixbuf.h>
+#include <ydkmm/screen.h>
+#include <ydkmm/pixbuf.h>
 
 #include <gtkmm/recentinfo.h>
 
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/selectiondata.h b/libs/tk/ytkmm/ytkmm/gtkmm/selectiondata.h
index d8aa9a31fe..58a254dcc0 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/selectiondata.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/selectiondata.h
@@ -27,7 +27,7 @@
  */
 
 
-#include <gdkmm/display.h>
+#include <ydkmm/display.h>
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/socket.h b/libs/tk/ytkmm/ytkmm/gtkmm/socket.h
index c72cbdda9f..97d348ae6e 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/socket.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/socket.h
@@ -27,7 +27,7 @@
  */
 
 #include <gtkmm/container.h>
-#include <gdkmm/types.h>
+#include <ydkmm/types.h>
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/stockitem.h b/libs/tk/ytkmm/ytkmm/gtkmm/stockitem.h
index bea9b14010..b1907c8707 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/stockitem.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/stockitem.h
@@ -27,7 +27,7 @@
  */
 
 #include <gtkmm/stockid.h>
-#include <gdkmm/types.h>
+#include <ydkmm/types.h>
 
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/style.h b/libs/tk/ytkmm/ytkmm/gtkmm/style.h
index cdad2a99cb..b6a7177dc8 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/style.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/style.h
@@ -35,10 +35,10 @@
 #include <pangomm/fontdescription.h>
 #include <pangomm/layout.h>
 
-#include <gdkmm/gc.h>
-#include <gdkmm/pixmap.h>
-#include <gdkmm/types.h>
-#include <gdkmm/window.h>
+#include <ydkmm/gc.h>
+#include <ydkmm/pixmap.h>
+#include <ydkmm/types.h>
+#include <ydkmm/window.h>
 
 #include <gtkmm/object.h>
 #include <gtkmm/enums.h>
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/targetlist.h b/libs/tk/ytkmm/ytkmm/gtkmm/targetlist.h
index 5ec36250ba..fec7b97d45 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/targetlist.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/targetlist.h
@@ -27,7 +27,7 @@
 
 #include <gtkmm/enums.h>
 #include <gtkmm/targetentry.h>
-#include <gdkmm/types.h>
+#include <ydkmm/types.h>
 
 
 namespace Gtk
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/textbuffer.h b/libs/tk/ytkmm/ytkmm/gtkmm/textbuffer.h
index 921cb2f902..49f05a815b 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/textbuffer.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/textbuffer.h
@@ -38,7 +38,7 @@
 #include <gtkmm/textmark.h>
 #include <gtkmm/textiter.h>
 #include <gtkmm/clipboard.h>
-#include <gdkmm/pixbuf.h>
+#include <ydkmm/pixbuf.h>
 #include <gtkmmconfig.h>
 #include <utility>
 
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/textiter.h b/libs/tk/ytkmm/ytkmm/gtkmm/textiter.h
index 984f11a475..aa7833f777 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/textiter.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/textiter.h
@@ -28,7 +28,7 @@
 
 #include <glibmm/exceptionhandler.h>
 #include <glibmm/slisthandle.h>
-#include <gdkmm/pixbuf.h>
+#include <ydkmm/pixbuf.h>
 #include <gtkmm/texttag.h>
 #include <gtkmm/textchildanchor.h>
 #include <gtkmm/textattributes.h>
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/texttag.h b/libs/tk/ytkmm/ytkmm/gtkmm/texttag.h
index 59fe46ce2b..bbcfad8406 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/texttag.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/texttag.h
@@ -31,8 +31,8 @@
 
 #include <gtkmm/object.h>
 #include <gtkmm/enums.h>
-#include <gdkmm/bitmap.h>
-#include <gdkmm/color.h>
+#include <ydkmm/bitmap.h>
+#include <ydkmm/color.h>
 #include <pangomm/fontdescription.h>
 #include <pangomm/tabarray.h>
 
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/tooltip.h b/libs/tk/ytkmm/ytkmm/gtkmm/tooltip.h
index 4e83f1dc6c..14c898d469 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/tooltip.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/tooltip.h
@@ -26,7 +26,7 @@
 
 #include <glibmm/object.h>
 #include <giomm/icon.h>
-#include <gdkmm/pixbuf.h>
+#include <ydkmm/pixbuf.h>
 #include <gtkmm/enums.h>
 #include <gtkmm/widget.h>
 
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/tooltips.h b/libs/tk/ytkmm/ytkmm/gtkmm/tooltips.h
index e16c606ebd..58d89ec75b 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/tooltips.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/tooltips.h
@@ -32,7 +32,7 @@
 // the #ifndef GTKMM_DISABLE_DEPRECATED in deprecated classes) is generated:
 
 
-#include <gdkmm/color.h>
+#include <ydkmm/color.h>
 #include <gtkmm/object.h>
 
 
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/treeview.h b/libs/tk/ytkmm/ytkmm/gtkmm/treeview.h
index cee18dc3d3..12f26d0965 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/treeview.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/treeview.h
@@ -33,7 +33,7 @@
 #include <glibmm/listhandle.h>
 #include <gtkmm/container.h>
 #include <gtkmm/adjustment.h>
-#include <gdkmm/pixmap.h>
+#include <ydkmm/pixmap.h>
 #include <gtkmm/treeviewcolumn.h>
 #include <gtkmm/treeselection.h>
 #include <gtkmm/treemodelcolumn.h>
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/treeviewcolumn.h b/libs/tk/ytkmm/ytkmm/gtkmm/treeviewcolumn.h
index 0dd4817534..4f0d73138e 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/treeviewcolumn.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/treeviewcolumn.h
@@ -32,7 +32,7 @@
 
 #include <gtkmm/object.h>
 #include <gtkmm/widget.h>
-#include <gdkmm/window.h>
+#include <ydkmm/window.h>
 #include <gtkmm/treeiter.h>
 #include <gtkmm/treemodel.h>
 #include <glibmm/listhandle.h>
diff --git a/libs/tk/ytkmm/ytkmm/gtkmm/widget.h b/libs/tk/ytkmm/ytkmm/gtkmm/widget.h
index 5a7f72fd9c..8101dd558e 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmm/widget.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmm/widget.h
@@ -35,14 +35,14 @@
 #include <ztkmm/implementor.h>
 #endif //GTKMM_ATKMM_ENABLED
 
-#include <gdkmm/event.h>
-#include <gdkmm/types.h>
-#include <gdkmm/window.h>
-#include <gdkmm/dragcontext.h>
-#include <gdkmm/pixbuf.h>
-#include <gdkmm/screen.h>
+#include <ydkmm/event.h>
+#include <ydkmm/types.h>
+#include <ydkmm/window.h>
+#include <ydkmm/dragcontext.h>
+#include <ydkmm/pixbuf.h>
+#include <ydkmm/screen.h>
 #include <gtkmm/enums.h>
-#include <gdkmm/display.h>
+#include <ydkmm/display.h>
 //#include <gtkmm/style.h>
 #include <gtkmm/targetlist.h>
 #include <gtkmm/rc.h>
diff --git a/libs/tk/ytkmm/ytkmm/gtkmmconfig.h b/libs/tk/ytkmm/ytkmm/gtkmmconfig.h
index 80970326e8..229853b22f 100644
--- a/libs/tk/ytkmm/ytkmm/gtkmmconfig.h
+++ b/libs/tk/ytkmm/ytkmm/gtkmmconfig.h
@@ -1,7 +1,7 @@
 #ifndef _GTKMM_CONFIG_H
 #define _GTKMM_CONFIG_H
 
-#include <gdkmmconfig.h>
+#include <ydkmm/ydkmmconfig.h>
 
 /* Defined when the --enable-api-atkmm configure argument was given */
 #define GTKMM_ATKMM_ENABLED 1
diff --git a/libs/waveview/wave_view.cc b/libs/waveview/wave_view.cc
index fbdd2e0756..04fdeed0d6 100644
--- a/libs/waveview/wave_view.cc
+++ b/libs/waveview/wave_view.cc
@@ -23,7 +23,7 @@
 #include <cairomm/cairomm.h>
 
 #include <glibmm/threads.h>
-#include <gdkmm/general.h>
+#include <ydkmm/general.h>
 
 #include "pbd/base_ui.h"
 #include "pbd/compose.h"
diff --git a/libs/widgets/fastmeter.cc b/libs/widgets/fastmeter.cc
index 10f695fa94..050de04f29 100644
--- a/libs/widgets/fastmeter.cc
+++ b/libs/widgets/fastmeter.cc
@@ -25,7 +25,6 @@
 #include <stdlib.h>
 
 #include <glibmm.h>
-#include <gdkmm.h>
 
 #include "gtkmm2ext/utils.h"
 #include "widgets/fastmeter.h"
diff --git a/libs/widgets/pane.cc b/libs/widgets/pane.cc
index a8df7f32fb..ac2131c3ee 100644
--- a/libs/widgets/pane.cc
+++ b/libs/widgets/pane.cc
@@ -19,7 +19,7 @@
  */
 
 #include <assert.h>
-#include <gdkmm/cursor.h>
+#include <ydkmm/cursor.h>
 
 #include "widgets/pane.h"
 
diff --git a/libs/widgets/widgets/ardour_fader.h b/libs/widgets/widgets/ardour_fader.h
index bcbd59af9a..24f98d5567 100644
--- a/libs/widgets/widgets/ardour_fader.h
+++ b/libs/widgets/widgets/ardour_fader.h
@@ -23,7 +23,6 @@
 #include <cmath>
 #include <stdint.h>
 
-#include <gdkmm.h>
 #include <gtkmm/adjustment.h>
 
 #include "gtkmm2ext/cairo_widget.h"
diff --git a/libs/widgets/widgets/pane.h b/libs/widgets/widgets/pane.h
index c06c52801d..e505f857ee 100644
--- a/libs/widgets/widgets/pane.h
+++ b/libs/widgets/widgets/pane.h
@@ -26,7 +26,7 @@
 #include <algorithm>
 
 
-#include <gdkmm/cursor.h>
+#include <ydkmm/cursor.h>
 #include <gtkmm/container.h>
 #include <gtkmm/eventbox.h>
 
diff --git a/libs/widgets/widgets/scroomer.h b/libs/widgets/widgets/scroomer.h
index b1aba3dea7..e7a74ea797 100644
--- a/libs/widgets/widgets/scroomer.h
+++ b/libs/widgets/widgets/scroomer.h
@@ -20,7 +20,6 @@
 #ifndef _WIDGETS_SCROOMER_H_
 #define _WIDGETS_SCROOMER_H_
 
-#include <gdkmm.h>
 #include <gtkmm/drawingarea.h>
 #include <gtkmm/adjustment.h>