Clean up more includes

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

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"

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"

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"

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"

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"

gtk/gtkscrolledwindow.h

@@ -32,8 +32,6 @@
 #define __GTK_SCROLLED_WINDOW_H__
 
 
-#include <gtk/gtkhscrollbar.h>
-#include <gtk/gtkvscrollbar.h>
 #include <gtk/gtkviewport.h>