From 78b87a291e2ae71dc136125418ad6b9aa6529acb Mon Sep 17 00:00:00 2001
From: Damien Zammit <damien@zamaudio.com>
Date: Fri, 9 Dec 2016 14:46:22 +1100
Subject: gtk: Do not include individual headers

---
 gtk2_ardour/actions.cc                      | 4 +---
 gtk2_ardour/control_point.h                 | 2 +-
 gtk2_ardour/editor_actions.cc               | 2 +-
 gtk2_ardour/editor_rulers.cc                | 2 +-
 gtk2_ardour/public_editor.h                 | 2 +-
 libs/clearlooks-newer/clearlooks_rc_style.h | 1 -
 libs/clearlooks-newer/clearlooks_style.h    | 1 -
 libs/clearlooks-newer/clearlooks_types.h    | 1 +
 libs/gtkmm2ext/actions.cc                   | 4 +---
 libs/gtkmm2ext/utils.cc                     | 1 -
 10 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/gtk2_ardour/actions.cc b/gtk2_ardour/actions.cc
index 28367ff3f3..50af511ca2 100644
--- a/gtk2_ardour/actions.cc
+++ b/gtk2_ardour/actions.cc
@@ -21,9 +21,7 @@
 #include <string>
 #include <list>
 
-#include <gtk/gtkaccelmap.h>
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkactiongroup.h>
+#include <gtk/gtk.h>
 
 #include <gtkmm/accelmap.h>
 #include <gtkmm/uimanager.h>
diff --git a/gtk2_ardour/control_point.h b/gtk2_ardour/control_point.h
index c9aab3af64..5591f275af 100644
--- a/gtk2_ardour/control_point.h
+++ b/gtk2_ardour/control_point.h
@@ -21,7 +21,7 @@
 #define __ardour_control_point_h__
 
 #include <sys/types.h>
-#include <gdk/gdkevents.h>
+#include <gdk/gdk.h>
 
 #include "ardour/automation_list.h"
 
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc
index c9f63c02ba..5269c42864 100644
--- a/gtk2_ardour/editor_actions.cc
+++ b/gtk2_ardour/editor_actions.cc
@@ -18,7 +18,7 @@
 */
 
 #include <gio/gio.h>
-#include <gtk/gtkiconfactory.h>
+#include <gtk/gtk.h>
 
 #include "pbd/file_utils.h"
 
diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc
index bdffd6fd39..7ec4a4926a 100644
--- a/gtk2_ardour/editor_rulers.cc
+++ b/gtk2_ardour/editor_rulers.cc
@@ -27,7 +27,7 @@
 
 #include <string>
 
-#include <gtk/gtkaction.h>
+#include <gtk/gtk.h>
 
 #include "canvas/container.h"
 #include "canvas/canvas.h"
diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index fb6da74dbf..17b3426889 100644
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -28,7 +28,7 @@
 
 #include <string>
 #include <glib.h>
-#include <gdk/gdktypes.h>
+#include <gdk/gdk.h>
 #include <gtkmm/box.h>
 #include <gtkmm/window.h>
 #include <gtkmm/actiongroup.h>
diff --git a/libs/clearlooks-newer/clearlooks_rc_style.h b/libs/clearlooks-newer/clearlooks_rc_style.h
index a80a846000..a34a8066e6 100644
--- a/libs/clearlooks-newer/clearlooks_rc_style.h
+++ b/libs/clearlooks-newer/clearlooks_rc_style.h
@@ -22,7 +22,6 @@
  * Modified by Kulyk Nazar <schamane@myeburg.net>
  */
 
-#include <gtk/gtkrc.h>
 #include "clearlooks_types.h"
 
 typedef struct _ClearlooksRcStyle ClearlooksRcStyle;
diff --git a/libs/clearlooks-newer/clearlooks_style.h b/libs/clearlooks-newer/clearlooks_style.h
index b306836453..04a88dbb21 100644
--- a/libs/clearlooks-newer/clearlooks_style.h
+++ b/libs/clearlooks-newer/clearlooks_style.h
@@ -21,7 +21,6 @@
  * and by Alexander Larsson <alexl@redhat.com>
  * Modified by Richard Stellingwerff <remenic@gmail.com>
  */
-#include <gtk/gtkstyle.h>
 
 #ifndef CLEARLOOKS_STYLE_H
 #define CLEARLOOKS_STYLE_H
diff --git a/libs/clearlooks-newer/clearlooks_types.h b/libs/clearlooks-newer/clearlooks_types.h
index 893113cc9e..42c1f96360 100644
--- a/libs/clearlooks-newer/clearlooks_types.h
+++ b/libs/clearlooks-newer/clearlooks_types.h
@@ -2,6 +2,7 @@
 #define CLEARLOOKS_TYPES_H
 
 #include <ge-support.h>
+#include <gtk/gtk.h>
 
 typedef unsigned char boolean;
 typedef unsigned char uint8;
diff --git a/libs/gtkmm2ext/actions.cc b/libs/gtkmm2ext/actions.cc
index 840c9dc4a2..ef7e7e047d 100644
--- a/libs/gtkmm2ext/actions.cc
+++ b/libs/gtkmm2ext/actions.cc
@@ -26,9 +26,7 @@
 
 #include <boost/shared_ptr.hpp>
 
-#include <gtk/gtkaccelmap.h>
-#include <gtk/gtkuimanager.h>
-#include <gtk/gtkactiongroup.h>
+#include <gtk/gtk.h>
 
 #include <gtkmm.h>
 #include <gtkmm/accelmap.h>
diff --git a/libs/gtkmm2ext/utils.cc b/libs/gtkmm2ext/utils.cc
index c18023e020..102c3d90c6 100644
--- a/libs/gtkmm2ext/utils.cc
+++ b/libs/gtkmm2ext/utils.cc
@@ -21,7 +21,6 @@
 #include <map>
 #include <algorithm>
 
-#include <gtk/gtkpaned.h>
 #include <gtk/gtk.h>
 
 #include <gtkmm/widget.h>
-- 
cgit v1.2.3