Clean up more includes

Mainly removing unused h/v includes, but also adding some that
will be necessary as replacements.

diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index 7f9a1f0345bc81770b33fb115069444a2ce78f0e..e77edc49077ed6c11888525a5bf9cd58af0d44fc 100644 (file)
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -52,7 +52,6 @@
 #include "gtkhscale.h"
 #include "gtkentry.h"
 #include "gtkbutton.h"
-#include "gtkhseparator.h"
 #include "gtkinvisible.h"
 #include "gtkmenuitem.h"
 #include "gtkmain.h"

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index dbe7679e6acf833ad6dfa18656c403de7ea4e73a..b123de876473f335019005791001d2c6701cd275 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -38,7 +38,7 @@
 #include "gtktearoffmenuitem.h"
 #include "gtktogglebutton.h"
 #include "gtktreeselection.h"
-#include "gtkvseparator.h"
+#include "gtkseparator.h"
 #include "gtkwindow.h"
 #include "gtktypebuiltins.h"
 #include "gtkprivate.h"

diff --git a/gtk/gtkfilechooserbutton.c b/gtk/gtkfilechooserbutton.c
index 81b720d5b4f27af08f08ebd5fe61aabb640bcb12..346b7783eaa3852cbc87a69fceb551628cb3283c 100644 (file)
--- a/gtk/gtkfilechooserbutton.c
+++ b/gtk/gtkfilechooserbutton.c
@@ -44,7 +44,6 @@
 #include "gtkliststore.h"
 #include "gtkstock.h"
 #include "gtktreemodelfilter.h"
-#include "gtkvseparator.h"
 #include "gtkfilechooserdialog.h"
 #include "gtkfilechooserprivate.h"
 #include "gtkfilechooserutils.h"

diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index 0cd08f4521b4035ecd74ede4a093f33c0da0027a..8918248ffe73cfbf502c5bd9ba896e0756d702d6 100644 (file)
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -34,7 +34,6 @@
 #include "gtkalignment.h"
 #include "gtkhbox.h"
 #include "gtklabel.h"
-#include "gtkvseparator.h"
 #include "gtkfontsel.h"
 #include "gtkimage.h"
 #include "gtkmarshalers.h"

diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index d153c119bfc5c68a32b11b9d342b1d80cdc06374..292b1e1b4b62e2c4ebbd47c6e41bcc43335906c3 100644 (file)
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -31,6 +31,7 @@
 #include "gtkbindings.h"
 #include "gtkmarshalers.h"
 #include "gtkscrollable.h"
+#include "gtkscrollbar.h"
 #include "gtkscrolledwindow.h"
 #include "gtkwindow.h"
 #include "gtkprivate.h"

diff --git a/gtk/gtkscrolledwindow.h b/gtk/gtkscrolledwindow.h
index 8266f65d51307655e2b73179807446b875675358..9d86805ae430dd41c7cd7a378c751ecdcdc609cb 100644 (file)
--- a/gtk/gtkscrolledwindow.h
+++ b/gtk/gtkscrolledwindow.h
@@ -32,8 +32,6 @@
 #define __GTK_SCROLLED_WINDOW_H__
 
 
-#include <gtk/gtkhscrollbar.h>
-#include <gtk/gtkvscrollbar.h>
 #include <gtk/gtkviewport.h>