inspector: Clean up includes

Don't include gtk.h, instead include individual headers.
And include config.h and gi18n-lib.h everywhere.

gtk/inspector/action-editor.c

@@ -17,8 +17,15 @@
 
 #include "config.h"
 #include <glib/gi18n-lib.h>
+
 #include "action-editor.h"
 
+#include "gtksizegroup.h"
+#include "gtktogglebutton.h"
+#include "gtkentry.h"
+#include "gtkbin.h"
+#include "gtklabel.h"
+
 struct _GtkInspectorActionEditorPrivate
 {
   GActionGroup *group;

gtk/inspector/action-editor.h

@@ -19,7 +19,7 @@
 #define _GTK_INSPECTOR_ACTION_EDITOR_H_
 
 
-#include <gtk/gtk.h>
+#include <gtk/gtkbox.h>
 
 
 #define GTK_TYPE_INSPECTOR_ACTION_EDITOR            (gtk_inspector_action_editor_get_type())

gtk/inspector/actions.c

@@ -17,9 +17,16 @@
 
 #include "config.h"
 #include <glib/gi18n-lib.h>
+
 #include "actions.h"
 #include "action-editor.h"
+
+#include "gtkapplication.h"
+#include "gtkapplicationwindow.h"
+#include "gtktreeview.h"
+#include "gtkliststore.h"
 #include "gtkwidgetprivate.h"
+#include "gtkpopover.h"
 
 enum
 {

gtk/inspector/actions.h

@@ -18,7 +18,7 @@
 #ifndef _GTK_INSPECTOR_ACTIONS_H_
 #define _GTK_INSPECTOR_ACTIONS_H_
 
-#include <gtk/gtk.h>
+#include <gtk/gtkbox.h>
 
 #define GTK_TYPE_INSPECTOR_ACTIONS            (gtk_inspector_actions_get_type())
 #define GTK_INSPECTOR_ACTIONS(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_INSPECTOR_ACTIONS, GtkInspectorActions))

gtk/inspector/button-path.c

@@ -20,8 +20,14 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+#include <glib/gi18n-lib.h>
+
 #include "button-path.h"
 
+#include "gtkbutton.h"
+#include "gtkwidgetpath.h"
+
 struct _GtkInspectorButtonPathPrivate
 {
   GtkWidget *sw;

gtk/inspector/button-path.h

@@ -23,7 +23,7 @@
 #define _GTK_INSPECTOR_BUTTON_PATH_H_
 
 
-#include <gtk/gtk.h>
+#include <gtk/gtkbox.h>
 
 #define GTK_TYPE_INSPECTOR_BUTTON_PATH            (gtk_inspector_button_path_get_type())
 #define GTK_INSPECTOR_BUTTON_PATH(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_INSPECTOR_BUTTON_PATH, GtkInspectorButtonPath))

gtk/inspector/classes-list.c

@@ -22,8 +22,16 @@
 
 #include "config.h"
 #include <glib/gi18n-lib.h>
+
 #include "classes-list.h"
 
+#include "gtkliststore.h"
+#include "gtktreeview.h"
+#include "gtkcellrenderertoggle.h"
+#include "gtkbutton.h"
+#include "gtkdialog.h"
+#include "gtkstylecontext.h"
+
 enum
 {
   COLUMN_ENABLED,

gtk/inspector/classes-list.h

@@ -23,7 +23,7 @@
 #ifndef _GTK_INSPECTOR_CLASSES_LIST_H_
 #define _GTK_INSPECTOR_CLASSES_LIST_H_
 
-#include <gtk/gtk.h>
+#include <gtk/gtkbox.h>
 
 #define GTK_TYPE_INSPECTOR_CLASSES_LIST            (gtk_inspector_classes_list_get_type())
 #define GTK_INSPECTOR_CLASSES_LIST(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_INSPECTOR_CLASSES_LIST, GtkInspectorClassesList))

gtk/inspector/css-editor.c

@@ -21,9 +21,18 @@
  */
 
 #include "config.h"
-#include "css-editor.h"
 #include <glib/gi18n-lib.h>
 
+#include "css-editor.h"
+
+#include "gtkcssprovider.h"
+#include "gtkstyleprovider.h"
+#include "gtkstylecontext.h"
+#include "gtktextview.h"
+#include "gtkmessagedialog.h"
+#include "gtkfilechooserdialog.h"
+#include "gtktoggletoolbutton.h"
+
 #define GTK_INSPECTOR_CSS_EDITOR_TEXT "inspector-css-editor-text"
 #define GTK_INSPECTOR_CSS_EDITOR_PROVIDER "inspector-css-editor-provider"
 

gtk/inspector/css-editor.h

@@ -23,7 +23,7 @@
 #ifndef _GTK_INSPECTOR_CSS_EDITOR_H_
 #define _GTK_INSPECTOR_CSS_EDITOR_H_
 
-#include <gtk/gtk.h>
+#include <gtk/gtkbox.h>
 
 #define GTK_TYPE_INSPECTOR_CSS_EDITOR            (gtk_inspector_css_editor_get_type())
 #define GTK_INSPECTOR_CSS_EDITOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_INSPECTOR_CSS_EDITOR, GtkInspectorCssEditor))

gtk/inspector/data-list.c

@@ -17,8 +17,13 @@
 
 #include "config.h"
 #include <glib/gi18n-lib.h>
+
 #include "data-list.h"
 
+#include "gtktreeview.h"
+#include "gtkcellrenderertext.h"
+#include "gtktoggletoolbutton.h"
+
 struct _GtkInspectorDataListPrivate
 {
   GtkTreeModel *object;

gtk/inspector/data-list.h

@@ -18,7 +18,7 @@
 #ifndef _GTK_INSPECTOR_DATA_LIST_H_
 #define _GTK_INSPECTOR_DATA_LIST_H_
 
-#include <gtk/gtk.h>
+#include <gtk/gtkbox.h>
 
 #define GTK_TYPE_INSPECTOR_DATA_LIST            (gtk_inspector_data_list_get_type())
 #define GTK_INSPECTOR_DATA_LIST(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_INSPECTOR_DATA_LIST, GtkInspectorDataList))

gtk/inspector/general.c

@@ -20,6 +20,9 @@
 
 #include "general.h"
 
+#include "gtkdebug.h"
+#include "gtkswitch.h"
+#include "gtklistbox.h"
 #include "gtkprivate.h"
 
 #ifdef GDK_WINDOWING_X11

gtk/inspector/general.h

@@ -18,7 +18,7 @@
 #ifndef _GTK_INSPECTOR_GENERAL_H_
 #define _GTK_INSPECTOR_GENERAL_H_
 
-#include <gtk/gtk.h>
+#include <gtk/gtkbox.h>
 
 #define GTK_TYPE_INSPECTOR_GENERAL            (gtk_inspector_general_get_type())
 #define GTK_INSPECTOR_GENERAL(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_INSPECTOR_GENERAL, GtkInspectorGeneral))

gtk/inspector/gestures.c

@@ -17,10 +17,17 @@
 
 #include "config.h"
 #include <glib/gi18n-lib.h>
+
 #include "gestures.h"
-#include "gtkwidgetprivate.h"
 #include "widget-tree.h"
 
+#include "gtksizegroup.h"
+#include "gtkcomboboxtext.h"
+#include "gtklistbox.h"
+#include "gtkgesture.h"
+#include "gtklabel.h"
+#include "gtkframe.h"
+#include "gtkwidgetprivate.h"
 
 enum
 {

gtk/inspector/gestures.h

@@ -18,7 +18,7 @@
 #ifndef _GTK_INSPECTOR_GESTURES_H_
 #define _GTK_INSPECTOR_GESTURES_H_
 
-#include <gtk/gtk.h>
+#include <gtk/gtkbox.h>
 
 #define GTK_TYPE_INSPECTOR_GESTURES            (gtk_inspector_gestures_get_type())
 #define GTK_INSPECTOR_GESTURES(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_INSPECTOR_GESTURES, GtkInspectorGestures))

gtk/inspector/inspect-button.c

@@ -23,9 +23,13 @@
 
 #include "config.h"
 #include <glib/gi18n-lib.h>
+
 #include "window.h"
 #include "widget-tree.h"
 
+#include "gtknotebook.h"
+#include "gtkmain.h"
+
 typedef struct
 {
   gint x;

gtk/inspector/menu.c

@@ -17,7 +17,10 @@
 
 #include "config.h"
 #include <glib/gi18n-lib.h>
+
 #include "menu.h"
+
+#include "gtktreestore.h"
 #include "gtkwidgetprivate.h"
 
 enum

gtk/inspector/menu.h

@@ -18,7 +18,7 @@
 #ifndef _GTK_INSPECTOR_MENU_H_
 #define _GTK_INSPECTOR_MENU_H_
 
-#include <gtk/gtk.h>
+#include <gtk/gtkbox.h>
 
 #define GTK_TYPE_INSPECTOR_MENU            (gtk_inspector_menu_get_type())
 #define GTK_INSPECTOR_MENU(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_INSPECTOR_MENU, GtkInspectorMenu))

gtk/inspector/object-hierarchy.c

@@ -20,8 +20,15 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+#include <glib/gi18n-lib.h>
+
 #include "object-hierarchy.h"
 
+#include "gtktreeview.h"
+#include "gtktreestore.h"
+
+
 enum
 {
   COLUMN_OBJECT_NAME

gtk/inspector/object-hierarchy.h

@@ -23,7 +23,7 @@
 #ifndef _GTK_INSPECTOR_OBJECT_HIERARCHY_H_
 #define _GTK_INSPECTOR_OBJECT_HIERARCHY_H_
 
-#include <gtk/gtk.h>
+#include <gtk/gtkbox.h>
 
 #define GTK_TYPE_INSPECTOR_OBJECT_HIERARCHY            (gtk_inspector_object_hierarchy_get_type())
 #define GTK_INSPECTOR_OBJECT_HIERARCHY(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_INSPECTOR_OBJECT_HIERARCHY, GtkInspectorObjectHierarchy))

gtk/inspector/prop-editor.c

@@ -17,8 +17,28 @@
 
 #include "config.h"
 #include <glib/gi18n-lib.h>
+
 #include "prop-editor.h"
 #include "widget-tree.h"
+
+#include "gtkactionable.h"
+#include "gtkadjustment.h"
+#include "gtkapplicationwindow.h"
+#include "gtkcelllayout.h"
+#include "gtkcellrenderertext.h"
+#include "gtkcolorbutton.h"
+#include "gtkcolorchooser.h"
+#include "gtkcolorchooserwidget.h"
+#include "gtkcombobox.h"
+#include "gtkfontchooser.h"
+#include "gtkfontchooserwidget.h"
+#include "gtkiconview.h"
+#include "gtklabel.h"
+#include "gtkpopover.h"
+#include "gtkradiobutton.h"
+#include "gtkscrolledwindow.h"
+#include "gtkspinbutton.h"
+#include "gtktogglebutton.h"
 #include "gtkwidgetprivate.h"
 
 struct _GtkInspectorPropEditorPrivate

gtk/inspector/prop-editor.h

@@ -19,7 +19,7 @@
 #define _GTK_INSPECTOR_PROP_EDITOR_H_
 
 
-#include <gtk/gtk.h>
+#include <gtk/gtkbox.h>
 
 
 #define GTK_TYPE_INSPECTOR_PROP_EDITOR            (gtk_inspector_prop_editor_get_type())

gtk/inspector/prop-list.c

@@ -21,10 +21,16 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+#include <glib/gi18n-lib.h>
+
 #include "prop-list.h"
+
 #include "prop-editor.h"
 #include "widget-tree.h"
 
+#include "gtkcelllayout.h"
+#include "gtkpopover.h"
 
 enum
 {

gtk/inspector/prop-list.h

@@ -24,7 +24,7 @@
 #define _GTK_INSPECTOR_PROP_LIST_H_
 
 
-#include <gtk/gtk.h>
+#include <gtk/gtkbox.h>
 
 #define GTK_TYPE_INSPECTOR_PROP_LIST            (gtk_inspector_prop_list_get_type())
 #define GTK_INSPECTOR_PROP_LIST(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_INSPECTOR_PROP_LIST, GtkInspectorPropList))

gtk/inspector/python-shell.c

@@ -20,12 +20,18 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+#include "config.h"
+#include <glib/gi18n-lib.h>
+
 #include <gdk/gdkkeysyms.h>
 #include <string.h>
 
 #include "python-hooks.h"
 #include "python-shell.h"
 
+#include "gtkscrolledwindow.h"
+#include "gtktextview.h"
+
 #define MAX_HISTORY_LENGTH 20
 
 struct _GtkInspectorPythonShellPrivate

gtk/inspector/python-shell.h

@@ -27,7 +27,7 @@ typedef struct _GtkInspectorPythonShell         GtkInspectorPythonShell;
 typedef struct _GtkInspectorPythonShellClass    GtkInspectorPythonShellClass;
 typedef struct _GtkInspectorPythonShellPrivate  GtkInspectorPythonShellPrivate;
 
-#include <gtk/gtk.h>
+#include <gtk/gtkbox.h>
 
 #define GTK_TYPE_INSPECTOR_PYTHON_SHELL (gtk_inspector_python_shell_get_type())
 #define GTK_INSPECTOR_PYTHON_SHELL(obj) \

gtk/inspector/resource-list.c

@@ -17,8 +17,13 @@
 
 #include "config.h"
 #include <glib/gi18n-lib.h>
+
 #include "resource-list.h"
 
+#include "gtktextbuffer.h"
+#include "gtktreestore.h"
+#include "gtktreeselection.h"
+
 enum
 {
   COLUMN_NAME,

gtk/inspector/resource-list.h

@@ -18,7 +18,7 @@
 #ifndef _GTK_INSPECTOR_RESOURCE_LIST_H_
 #define _GTK_INSPECTOR_RESOURCE_LIST_H_
 
-#include <gtk/gtk.h>
+#include <gtk/gtkbox.h>
 
 #define GTK_TYPE_INSPECTOR_RESOURCE_LIST            (gtk_inspector_resource_list_get_type())
 #define GTK_INSPECTOR_RESOURCE_LIST(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_INSPECTOR_RESOURCE_LIST, GtkInspectorResourceList))

gtk/inspector/signals-list.c

@@ -17,8 +17,15 @@
 
 #include "config.h"
 #include <glib/gi18n-lib.h>
+
 #include "signals-list.h"
 
+#include "gtkcellrenderer.h"
+#include "gtkliststore.h"
+#include "gtktextbuffer.h"
+#include "gtktoggletoolbutton.h"
+#include "gtktreeviewcolumn.h"
+
 enum
 {
   COLUMN_NAME,

gtk/inspector/signals-list.h

@@ -18,7 +18,7 @@
 #ifndef _GTK_INSPECTOR_SIGNALS_LIST_H_
 #define _GTK_INSPECTOR_SIGNALS_LIST_H_
 
-#include <gtk/gtk.h>
+#include <gtk/gtkpaned.h>
 
 #define GTK_TYPE_INSPECTOR_SIGNALS_LIST            (gtk_inspector_signals_list_get_type())
 #define GTK_INSPECTOR_SIGNALS_LIST(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_INSPECTOR_SIGNALS_LIST, GtkInspectorSignalsList))

gtk/inspector/size-groups.c

@@ -17,8 +17,16 @@
 
 #include "config.h"
 #include <glib/gi18n-lib.h>
+
 #include "size-groups.h"
 #include "window.h"
+
+#include "gtkcomboboxtext.h"
+#include "gtkframe.h"
+#include "gtklabel.h"
+#include "gtklistbox.h"
+#include "gtksizegroup.h"
+#include "gtkswitch.h"
 #include "gtkwidgetprivate.h"
 
 

gtk/inspector/size-groups.h

@@ -18,7 +18,7 @@
 #ifndef _GTK_INSPECTOR_SIZE_GROUPS_H_
 #define _GTK_INSPECTOR_SIZE_GROUPS_H_
 
-#include <gtk/gtk.h>
+#include <gtk/gtkbox.h>
 
 #define GTK_TYPE_INSPECTOR_SIZE_GROUPS            (gtk_inspector_size_groups_get_type())
 #define GTK_INSPECTOR_SIZE_GROUPS(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_INSPECTOR_SIZE_GROUPS, GtkInspectorSizeGroups))

gtk/inspector/style-prop-list.c

@@ -20,9 +20,15 @@
  * THE SOFTWARE.
  */
 
+#include "config.h"
+#include <glib/gi18n-lib.h>
+
 #include "style-prop-list.h"
+
 #include "gtkcssproviderprivate.h"
 #include "gtkcssstylepropertyprivate.h"
+#include "gtkliststore.h"
+#include "gtksettings.h"
 
 enum
 {

gtk/inspector/style-prop-list.h

@@ -22,8 +22,7 @@
 #ifndef _GTK_INSPECTOR_STYLE_PROP_LIST_H_
 #define _GTK_INSPECTOR_STYLE_PROP_LIST_H_
 
-
-#include <gtk/gtk.h>
+#include <gtk/gtkbox.h>
 
 #define GTK_TYPE_INSPECTOR_STYLE_PROP_LIST            (gtk_inspector_style_prop_list_get_type())
 #define GTK_INSPECTOR_STYLE_PROP_LIST(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_INSPECTOR_STYLE_PROP_LIST, GtkInspectorStylePropList))

gtk/inspector/visual.c

@@ -17,9 +17,15 @@
 
 #include "config.h"
 #include <glib/gi18n-lib.h>
+
 #include "visual.h"
 
+#include "gtkcomboboxtext.h"
+#include "gtkdebug.h"
 #include "gtkprivate.h"
+#include "gtksettings.h"
+#include "gtkswitch.h"
+#include "gtkwindow.h"
 
 struct _GtkInspectorVisualPrivate
 {

gtk/inspector/visual.h

@@ -18,7 +18,7 @@
 #ifndef _GTK_INSPECTOR_VISUAL_H_
 #define _GTK_INSPECTOR_VISUAL_H_
 
-#include <gtk/gtk.h>
+#include <gtk/gtkbox.h>
 
 #define GTK_TYPE_INSPECTOR_VISUAL            (gtk_inspector_visual_get_type())
 #define GTK_INSPECTOR_VISUAL(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_INSPECTOR_VISUAL, GtkInspectorVisual))

gtk/inspector/widget-tree.c

@@ -22,12 +22,26 @@
  * THE SOFTWARE.
  */
 
-#include "prop-list.h"
-#include "widget-tree.h"
-#include "gtkwidgetprivate.h"
-#include "gtkcomboboxprivate.h"
+#include "config.h"
+#include <glib/gi18n-lib.h>
+
 #include <string.h>
 
+#include "widget-tree.h"
+#include "prop-list.h"
+
+#include "gtkbuildable.h"
+#include "gtkbutton.h"
+#include "gtkcelllayout.h"
+#include "gtkcomboboxprivate.h"
+#include "gtkiconview.h"
+#include "gtklabel.h"
+#include "gtkmenuitem.h"
+#include "gtksettings.h"
+#include "gtktextview.h"
+#include "gtktreestore.h"
+#include "gtkwidgetprivate.h"
+
 enum
 {
   OBJECT,

gtk/inspector/widget-tree.h

@@ -23,9 +23,7 @@
 #ifndef _GTK_INSPECTOR_WIDGET_TREE_H_
 #define _GTK_INSPECTOR_WIDGET_TREE_H_
 
-
-#include <gtk/gtk.h>
-
+#include <gtk/gtktreeview.h>
 
 #define GTK_TYPE_INSPECTOR_WIDGET_TREE            (gtk_inspector_widget_tree_get_type())
 #define GTK_INSPECTOR_WIDGET_TREE(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_INSPECTOR_WIDGET_TREE, GtkInspectorWidgetTree))

gtk/inspector/window.c

@@ -24,7 +24,9 @@
 
 #include "config.h"
 #include <glib/gi18n-lib.h>
+
 #include <stdlib.h>
+
 #include "window.h"
 #include "prop-list.h"
 #include "classes-list.h"

gtk/inspector/window.h

@@ -24,7 +24,7 @@
 #define _GTK_INSPECTOR_WINDOW_H_
 
 
-#include <gtk/gtk.h>
+#include <gtk/gtkwindow.h>
 
 #define GTK_TYPE_INSPECTOR_WINDOW            (gtk_inspector_window_get_type())
 #define GTK_INSPECTOR_WINDOW(obj)            (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_INSPECTOR_WINDOW, GtkInspectorWindow))