commit 2f45d75bdd3796bf27041e8e48f4214657234a45
Author: Hubert Figuière <hub@figuiere.net>
Date:   Fri Apr 12 12:13:47 2013 -0400

    Properly fixes includes due to new gtkmm (Closes #697835)
    
    Partially contributed by Edward Sheldrake
    Partially revert 42ca7d27e8dd3105d612f8330072416ec889447f

diff --git a/gdk/gdkmm/rgb.cc b/gdk/gdkmm/rgb.cc
index ad95073..80a2438 100644
--- a/gdk/gdkmm/rgb.cc
+++ b/gdk/gdkmm/rgb.cc
@@ -18,7 +18,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <glibmm/listhandle.h>
 #include <gdkmm/rgb.h>
 #include <gdk/gdk.h>
 
diff --git a/gdk/src/color.hg b/gdk/src/color.hg
index ce22d4b..5f11b19 100644
--- a/gdk/src/color.hg
+++ b/gdk/src/color.hg
@@ -23,6 +23,9 @@ _CONFIGINCLUDE(gdkmmconfig.h)
 
 _DEFS(gdkmm,gdk)
 
+#include <glibmm/value.h>
+#include <glibmm/arrayhandle.h>
+
 namespace Gdk
 {
 
diff --git a/gdk/src/pixbufanimationiter.hg b/gdk/src/pixbufanimationiter.hg
index 4e12f52..d74666b 100644
--- a/gdk/src/pixbufanimationiter.hg
+++ b/gdk/src/pixbufanimationiter.hg
@@ -20,6 +20,7 @@
  */
 
 #include <glibmm/object.h>
+#include <glibmm/timeval.h>
 #include <gdkmm/pixbuf.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
diff --git a/gdk/src/screen.hg b/gdk/src/screen.hg
index c50072c..b145248 100644
--- a/gdk/src/screen.hg
+++ b/gdk/src/screen.hg
@@ -21,6 +21,7 @@
 
 //#include <gdkmm/visual.h>
 //#include <gdkmm/window.h>
+#include <glibmm/listhandle.h>
 #include <gdkmm/region.h> //Just to solve GDK_DISABLE_DEPRECATED problems when this header is included from elsewhere.
 #include <gdkmm/rectangle.h>
 #include <glibmm/object.h>
diff --git a/gdk/src/types.hg b/gdk/src/types.hg
index fd644b8..ca7b974 100644
--- a/gdk/src/types.hg
+++ b/gdk/src/types.hg
@@ -22,6 +22,9 @@ _DEFS(gdkmm,gdk)
 #include <gdk/gdk.h>
 #include <gdkmmconfig.h>
 
+#include <glibmm/listhandle.h>
+#include <glibmm/arrayhandle.h>
+
 /* Shadow ERROR macro (from wingdi.h).
  */
 #if defined(ERROR) && !defined(GTKMM_MACRO_SHADOW_ERROR)
diff --git a/gtk/gtkmm/selectiondata_private.cc b/gtk/gtkmm/selectiondata_private.cc
index 0595191..491627a 100644
--- a/gtk/gtkmm/selectiondata_private.cc
+++ b/gtk/gtkmm/selectiondata_private.cc
@@ -19,7 +19,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <glibmm/listhandle.h>
 #include <gtkmm/selectiondata_private.h>
 
 namespace Gtk
diff --git a/gtk/src/main.hg b/gtk/src/main.hg
index c6c05ed..2665445 100644
--- a/gtk/src/main.hg
+++ b/gtk/src/main.hg
@@ -22,6 +22,7 @@
 
 #include <sigc++/sigc++.h>
 #include <gdkmm/types.h> //For GdkEventKey
+#include <glibmm/optioncontext.h>
 
 _DEFS(gtkmm,gtk)
 
diff --git a/gtk/src/treemodel.hg b/gtk/src/treemodel.hg
index a04d924..67720af 100644
--- a/gtk/src/treemodel.hg
+++ b/gtk/src/treemodel.hg
@@ -26,7 +26,6 @@ _PINCLUDE(glibmm/private/interface_p.h)
 #m4 _PUSH(SECTION_CC_PRE_INCLUDES)
 //Include this before the other headers, such as treeiter.h,
 //so that the undef in GdkRegion is used.
-#include <glibmm/listhandle.h>
 #include <gtkmm/treepath.h>
 #m4 _POP()
 
