[gnumeric] Compilation: fix widget includes
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Compilation: fix widget includes
- Date: Wed, 16 May 2018 02:40:16 +0000 (UTC)
commit 4c3734c97e9c4bf7e61e11ed2c0d8e26c55018f8
Author: Morten Welinder <terra gnome org>
Date: Tue May 15 22:39:38 2018 -0400
Compilation: fix widget includes
component/gnumeric.c | 1 -
plugins/guile/guile-support.c | 1 -
plugins/guile/smob-value.c | 1 -
plugins/python-loader/py-command-line.c | 1 -
plugins/python-loader/py-command-line.h | 1 -
plugins/python-loader/py-console.c | 1 -
plugins/python-loader/py-interpreter-selector.c | 2 --
plugins/python-loader/py-interpreter-selector.h | 1 -
src/Makefile.am | 1 -
src/application.c | 1 -
src/complete.c | 1 -
src/dialogs/dao-gui-utils.c | 1 -
src/dialogs/dialog-about.c | 1 -
src/dialogs/dialog-advanced-filter.c | 1 -
src/dialogs/dialog-analysis-tool-chi-squared.c | 1 -
src/dialogs/dialog-analysis-tool-frequency.c | 1 -
src/dialogs/dialog-analysis-tool-kaplan-meier.c | 1 -
src/dialogs/dialog-analysis-tool-normality.c | 1 -
src/dialogs/dialog-analysis-tool-one-mean.c | 1 -
.../dialog-analysis-tool-principal-components.c | 1 -
src/dialogs/dialog-analysis-tool-sign-test.c | 1 -
.../dialog-analysis-tool-wilcoxon-mann-whitney.c | 1 -
src/dialogs/dialog-analysis-tools.c | 1 -
src/dialogs/dialog-autofilter.c | 1 -
src/dialogs/dialog-autoformat.c | 1 -
src/dialogs/dialog-autosave.c | 1 -
src/dialogs/dialog-cell-format-cond.c | 1 -
src/dialogs/dialog-cell-format.c | 1 -
src/dialogs/dialog-cell-sort.c | 1 -
src/dialogs/dialog-col-row.c | 1 -
src/dialogs/dialog-col-width.c | 1 -
src/dialogs/dialog-consolidate.c | 1 -
src/dialogs/dialog-data-table.c | 1 -
src/dialogs/dialog-define-names.c | 1 -
src/dialogs/dialog-delete-cells.c | 1 -
src/dialogs/dialog-doc-metadata.c | 1 -
src/dialogs/dialog-fill-series.c | 1 -
src/dialogs/dialog-formula-guru.c | 1 -
src/dialogs/dialog-function-select.c | 1 -
src/dialogs/dialog-goal-seek.c | 1 -
src/dialogs/dialog-goto-cell.c | 1 -
src/dialogs/dialog-hyperlink.c | 1 -
src/dialogs/dialog-insert-cells.c | 1 -
src/dialogs/dialog-merge.c | 1 -
src/dialogs/dialog-password.c | 1 -
src/dialogs/dialog-paste-special.c | 1 -
src/dialogs/dialog-plugin-manager.c | 1 -
src/dialogs/dialog-preferences.c | 1 -
src/dialogs/dialog-printer-setup.c | 1 -
src/dialogs/dialog-quit.c | 1 -
src/dialogs/dialog-random-generator-cor.c | 1 -
src/dialogs/dialog-random-generator.c | 1 -
src/dialogs/dialog-recent.c | 1 -
src/dialogs/dialog-row-height.c | 1 -
src/dialogs/dialog-scenarios.c | 1 -
src/dialogs/dialog-search-replace.c | 1 -
src/dialogs/dialog-search.c | 1 -
src/dialogs/dialog-sheet-order.c | 1 -
src/dialogs/dialog-sheetobject-size.c | 1 -
src/dialogs/dialog-shuffle.c | 1 -
src/dialogs/dialog-simulation.c | 1 -
src/dialogs/dialog-so-list.c | 1 -
src/dialogs/dialog-so-styled.c | 1 -
src/dialogs/dialog-solver.c | 1 -
src/dialogs/dialog-stf-export.c | 1 -
src/dialogs/dialog-stf-fixed-page.c | 1 -
src/dialogs/dialog-stf-format-page.c | 1 -
src/dialogs/dialog-stf-main-page.c | 1 -
src/dialogs/dialog-stf-preview.c | 1 -
src/dialogs/dialog-stf-preview.h | 1 -
src/dialogs/dialog-stf.c | 1 -
src/dialogs/dialog-stf.h | 1 -
src/dialogs/dialog-tabulate.c | 1 -
src/dialogs/dialog-view.c | 1 -
src/dialogs/dialog-workbook-attr.c | 1 -
src/dialogs/dialog-zoom.c | 1 -
src/gnm-graph-window.h | 1 -
src/gnm-pane-impl.h | 1 -
src/gnm-pane.c | 1 -
src/gui-file.c | 1 -
src/gui-util.c | 1 -
src/gui-util.h | 1 -
src/io-context-gtk.c | 1 -
src/io-context-gtk.h | 1 -
src/item-bar.c | 1 -
src/item-cursor.c | 1 -
src/item-edit.c | 1 -
src/item-grid.c | 1 -
src/main-application.c | 1 -
src/print-cell.h | 1 -
src/print-info.h | 1 -
src/print.c | 1 -
src/sheet-control-gui-priv.h | 1 -
src/sheet-control-gui.c | 1 -
src/sheet-control-gui.h | 1 -
src/sheet-filter.c | 4 ++--
src/sheet-object-graph.c | 1 -
src/sheet-object-image.c | 1 -
src/sheet-object-impl.h | 1 -
src/sheet-object-widget.c | 3 +--
src/sheet-object.h | 1 -
src/style-color.c | 1 -
src/style.c | 1 -
src/validation.c | 4 ++--
src/wbc-gtk-actions.c | 1 -
src/wbc-gtk-edit.c | 1 -
src/wbc-gtk-impl.h | 1 -
src/wbc-gtk.c | 1 -
src/wbc-gtk.h | 1 -
src/widgets/gnm-cell-combo-view-impl.h | 1 -
src/widgets/gnm-cell-combo-view.c | 1 -
src/widgets/gnm-filter-combo-view.c | 1 -
src/widgets/gnm-sheet-slicer-combo-view.c | 1 -
src/widgets/gnm-so-anchor-mode-chooser.c | 1 -
src/widgets/gnm-validation-combo-view.c | 1 -
src/widgets/gnumeric-expr-entry.c | 1 -
src/widgets/gnumeric-expr-entry.h | 1 -
src/widgets/gnumeric-text-view.c | 1 -
src/widgets/gnumeric-text-view.h | 1 -
119 files changed, 5 insertions(+), 123 deletions(-)
---
diff --git a/component/gnumeric.c b/component/gnumeric.c
index 40237d7..84b9989 100644
--- a/component/gnumeric.c
+++ b/component/gnumeric.c
@@ -47,7 +47,6 @@
#include <gsf/gsf-input-memory.h>
#include <gsf/gsf-output-memory.h>
-#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#include <cairo.h>
diff --git a/plugins/guile/guile-support.c b/plugins/guile/guile-support.c
index 57fce5f..0515311 100644
--- a/plugins/guile/guile-support.c
+++ b/plugins/guile/guile-support.c
@@ -7,7 +7,6 @@
#include <gnumeric-config.h>
#include <gnumeric.h>
#include <libguile.h>
-#include <gtk/gtk.h>
#include <guile/gh.h>
#include <position.h>
#include "guile-support.h"
diff --git a/plugins/guile/smob-value.c b/plugins/guile/smob-value.c
index b1d0a1f..869f327 100644
--- a/plugins/guile/smob-value.c
+++ b/plugins/guile/smob-value.c
@@ -26,7 +26,6 @@
#include <gnumeric.h>
#include <libguile.h>
#include <glib.h>
-#include <gtk/gtk.h>
#include <stdlib.h>
#include "smob-value.h"
diff --git a/plugins/python-loader/py-command-line.c b/plugins/python-loader/py-command-line.c
index 7720ba9..32906e1 100644
--- a/plugins/python-loader/py-command-line.c
+++ b/plugins/python-loader/py-command-line.c
@@ -14,7 +14,6 @@
#include <goffice/app/module-plugin-defs.h>
#include <gsf/gsf-impl-utils.h>
#include <glib-object.h>
-#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <string.h>
diff --git a/plugins/python-loader/py-command-line.h b/plugins/python-loader/py-command-line.h
index 636de48..bd5b46c 100644
--- a/plugins/python-loader/py-command-line.h
+++ b/plugins/python-loader/py-command-line.h
@@ -2,7 +2,6 @@
#define PY_COMMAND_LINE
#include <glib.h>
-#include <gtk/gtk.h>
#include <gnumeric.h>
#include "gnm-py-interpreter.h"
diff --git a/plugins/python-loader/py-console.c b/plugins/python-loader/py-console.c
index 9aa03e9..6dea030 100644
--- a/plugins/python-loader/py-console.c
+++ b/plugins/python-loader/py-console.c
@@ -15,7 +15,6 @@
#include <goffice/goffice.h>
#include <goffice/app/module-plugin-defs.h>
-#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n-lib.h>
diff --git a/plugins/python-loader/py-interpreter-selector.c b/plugins/python-loader/py-interpreter-selector.c
index c63082e..8cce9c1 100644
--- a/plugins/python-loader/py-interpreter-selector.c
+++ b/plugins/python-loader/py-interpreter-selector.c
@@ -9,7 +9,6 @@
#include <gnumeric-config.h>
#include <goffice/goffice.h>
-#include <gtk/gtk.h>
#include <gsf/gsf-impl-utils.h>
#include <gnumeric.h>
#include <gui-util.h>
@@ -19,7 +18,6 @@
#include "py-interpreter-selector.h"
#include <string.h>
-#include <gtk/gtk.h>
#include <glib.h>
struct _GnmPyInterpreterSelector {
diff --git a/plugins/python-loader/py-interpreter-selector.h b/plugins/python-loader/py-interpreter-selector.h
index a47cef7..56e7528 100644
--- a/plugins/python-loader/py-interpreter-selector.h
+++ b/plugins/python-loader/py-interpreter-selector.h
@@ -2,7 +2,6 @@
#define PY_INTERPRETER_SELECTOR
#include <glib.h>
-#include <gtk/gtk.h>
#include <gnumeric.h>
#include <goffice/goffice.h>
#include "gnm-py-interpreter.h"
diff --git a/src/Makefile.am b/src/Makefile.am
index 88dd6bf..ad24806 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,7 +33,6 @@ bin_PROGRAMS += ssconvert ssindex ssgrep ssdiff
AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(srcdir) \
- -I$(srcdir)/widgets \
$(GNUMERIC_CFLAGS)
# A hint is needed to build these headers first:
diff --git a/src/application.c b/src/application.c
index d1e9c4d..8835059 100644
--- a/src/application.c
+++ b/src/application.c
@@ -31,7 +31,6 @@
#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include "gnm-i18n.h"
-#include <gtk/gtk.h>
#define GNM_APP(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GNM_APP_TYPE, GnmApp))
#define GNM_IS_APP(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GNM_APP_TYPE))
diff --git a/src/complete.c b/src/complete.c
index 6e840f9..7e0cad7 100644
--- a/src/complete.c
+++ b/src/complete.c
@@ -24,7 +24,6 @@
#include "complete.h"
#include <gsf/gsf-impl-utils.h>
-#include <gtk/gtk.h>
#include <stdlib.h>
#define PARENT_TYPE (G_TYPE_OBJECT)
diff --git a/src/dialogs/dao-gui-utils.c b/src/dialogs/dao-gui-utils.c
index 5d46a7d..01e8a55 100644
--- a/src/dialogs/dao-gui-utils.c
+++ b/src/dialogs/dao-gui-utils.c
@@ -33,7 +33,6 @@
#include "selection.h"
#include <widgets/gnm-dao.h>
-#include <gtk/gtk.h>
/**
* dialog__tool_preset_to_range:
diff --git a/src/dialogs/dialog-about.c b/src/dialogs/dialog-about.c
index 960ca08..1407acf 100644
--- a/src/dialogs/dialog-about.c
+++ b/src/dialogs/dialog-about.c
@@ -30,7 +30,6 @@
#include <wbc-gtk.h>
#include <gnm-format.h>
#include <goffice/goffice.h>
-#include <gtk/gtk.h>
#define ABOUT_KEY "about-dialog"
diff --git a/src/dialogs/dialog-advanced-filter.c b/src/dialogs/dialog-advanced-filter.c
index 1f3eba9..8586d02 100644
--- a/src/dialogs/dialog-advanced-filter.c
+++ b/src/dialogs/dialog-advanced-filter.c
@@ -37,7 +37,6 @@
#include <value.h>
#include <wbc-gtk.h>
-#include <gtk/gtk.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-dao.h>
#include "tools/filter.h"
diff --git a/src/dialogs/dialog-analysis-tool-chi-squared.c b/src/dialogs/dialog-analysis-tool-chi-squared.c
index f2b4cc8..7f22e82 100644
--- a/src/dialogs/dialog-analysis-tool-chi-squared.c
+++ b/src/dialogs/dialog-analysis-tool-chi-squared.c
@@ -50,7 +50,6 @@
#include <widgets/gnumeric-expr-entry.h>
#include <string.h>
-#include <gtk/gtk.h>
#define CHI_SQUARED_I_KEY "analysistools-chi-square-independence-dialog"
diff --git a/src/dialogs/dialog-analysis-tool-frequency.c b/src/dialogs/dialog-analysis-tool-frequency.c
index 0822b60..9412879 100644
--- a/src/dialogs/dialog-analysis-tool-frequency.c
+++ b/src/dialogs/dialog-analysis-tool-frequency.c
@@ -50,7 +50,6 @@
#include <widgets/gnumeric-expr-entry.h>
#include <string.h>
-#include <gtk/gtk.h>
#define FREQUENCY_KEY "analysistools-frequency-dialog"
diff --git a/src/dialogs/dialog-analysis-tool-kaplan-meier.c b/src/dialogs/dialog-analysis-tool-kaplan-meier.c
index 5d86eea..56d86dc 100644
--- a/src/dialogs/dialog-analysis-tool-kaplan-meier.c
+++ b/src/dialogs/dialog-analysis-tool-kaplan-meier.c
@@ -50,7 +50,6 @@
#include <widgets/gnumeric-expr-entry.h>
#include <string.h>
-#include <gtk/gtk.h>
#define KAPLAN_MEIER_KEY "analysistools-kaplan-meier-dialog"
diff --git a/src/dialogs/dialog-analysis-tool-normality.c b/src/dialogs/dialog-analysis-tool-normality.c
index c69ca90..7254eb7 100644
--- a/src/dialogs/dialog-analysis-tool-normality.c
+++ b/src/dialogs/dialog-analysis-tool-normality.c
@@ -50,7 +50,6 @@
#include <widgets/gnumeric-expr-entry.h>
#include <string.h>
-#include <gtk/gtk.h>
#define NORMALITY_KEY "analysistools-normality-dialog"
diff --git a/src/dialogs/dialog-analysis-tool-one-mean.c b/src/dialogs/dialog-analysis-tool-one-mean.c
index 3113137..8033375 100644
--- a/src/dialogs/dialog-analysis-tool-one-mean.c
+++ b/src/dialogs/dialog-analysis-tool-one-mean.c
@@ -50,7 +50,6 @@
#include <widgets/gnumeric-expr-entry.h>
#include <string.h>
-#include <gtk/gtk.h>
#define ONE_MEAN_TEST_KEY "analysistools-one-mean-test-dialog"
diff --git a/src/dialogs/dialog-analysis-tool-principal-components.c
b/src/dialogs/dialog-analysis-tool-principal-components.c
index 8bcb698..476f5a9 100644
--- a/src/dialogs/dialog-analysis-tool-principal-components.c
+++ b/src/dialogs/dialog-analysis-tool-principal-components.c
@@ -50,7 +50,6 @@
#include <widgets/gnumeric-expr-entry.h>
#include <string.h>
-#include <gtk/gtk.h>
#define PRINCIPAL_COMPONENTS_KEY "analysistools-principal-components-dialog"
diff --git a/src/dialogs/dialog-analysis-tool-sign-test.c b/src/dialogs/dialog-analysis-tool-sign-test.c
index 194a20b..94cd1c3 100644
--- a/src/dialogs/dialog-analysis-tool-sign-test.c
+++ b/src/dialogs/dialog-analysis-tool-sign-test.c
@@ -51,7 +51,6 @@
#include <widgets/gnumeric-expr-entry.h>
#include <string.h>
-#include <gtk/gtk.h>
#define SIGN_TEST_KEY_ONE "analysistools-sign-test-one-dialog"
#define SIGN_TEST_KEY_TWO "analysistools-sign-test-two-dialog"
diff --git a/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
b/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
index ac30262..45eb5e6 100644
--- a/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
+++ b/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
@@ -50,7 +50,6 @@
#include <widgets/gnumeric-expr-entry.h>
#include <string.h>
-#include <gtk/gtk.h>
#define WILCOXON_MANN_WHITNEY_KEY "analysistools-principal-components-dialog"
diff --git a/src/dialogs/dialog-analysis-tools.c b/src/dialogs/dialog-analysis-tools.c
index 1613be1..501f499 100644
--- a/src/dialogs/dialog-analysis-tools.c
+++ b/src/dialogs/dialog-analysis-tools.c
@@ -52,7 +52,6 @@
#include <widgets/gnumeric-expr-entry.h>
#include <string.h>
-#include <gtk/gtk.h>
/**********************************************/
/* Generic guru items */
diff --git a/src/dialogs/dialog-autofilter.c b/src/dialogs/dialog-autofilter.c
index 5b227b0..6490580 100644
--- a/src/dialogs/dialog-autofilter.c
+++ b/src/dialogs/dialog-autofilter.c
@@ -38,7 +38,6 @@
#include <number-match.h>
#include <undo.h>
-#include <gtk/gtk.h>
#include <string.h>
typedef struct {
diff --git a/src/dialogs/dialog-autoformat.c b/src/dialogs/dialog-autoformat.c
index c05eddc..2f3a70c 100644
--- a/src/dialogs/dialog-autoformat.c
+++ b/src/dialogs/dialog-autoformat.c
@@ -45,7 +45,6 @@
#include <ranges.h>
#include <goffice/goffice.h>
-#include <gtk/gtk.h>
#include <gsf/gsf-impl-utils.h>
#include <string.h>
diff --git a/src/dialogs/dialog-autosave.c b/src/dialogs/dialog-autosave.c
index 5c330b4..293e495 100644
--- a/src/dialogs/dialog-autosave.c
+++ b/src/dialogs/dialog-autosave.c
@@ -33,7 +33,6 @@
#include <goffice/goffice.h>
#include <glib/gi18n-lib.h>
-#include <gtk/gtk.h>
typedef struct {
GtkWidget *dialog;
diff --git a/src/dialogs/dialog-cell-format-cond.c b/src/dialogs/dialog-cell-format-cond.c
index 65b3e9c..713ba9f 100644
--- a/src/dialogs/dialog-cell-format-cond.c
+++ b/src/dialogs/dialog-cell-format-cond.c
@@ -43,7 +43,6 @@
#include <mathfunc.h>
#include <style-conditions.h>
-#include <gtk/gtk.h>
#include <string.h>
diff --git a/src/dialogs/dialog-cell-format.c b/src/dialogs/dialog-cell-format.c
index 2d5f618..027b60c 100644
--- a/src/dialogs/dialog-cell-format.c
+++ b/src/dialogs/dialog-cell-format.c
@@ -57,7 +57,6 @@
#include <goffice/canvas/goc-canvas.h>
#include <goffice/canvas/goc-item.h>
#include <goffice/canvas/goc-rectangle.h>
-#include <gtk/gtk.h>
#include <string.h>
diff --git a/src/dialogs/dialog-cell-sort.c b/src/dialogs/dialog-cell-sort.c
index 2af6f38..60e9a31 100644
--- a/src/dialogs/dialog-cell-sort.c
+++ b/src/dialogs/dialog-cell-sort.c
@@ -45,7 +45,6 @@
#include <widgets/gnumeric-expr-entry.h>
#include <value.h>
-#include <gtk/gtk.h>
#include <gsf/gsf-impl-utils.h>
#include <gdk/gdkkeysyms.h>
#include <goffice/goffice.h>
diff --git a/src/dialogs/dialog-col-row.c b/src/dialogs/dialog-col-row.c
index 0a49846..ce65f5d 100644
--- a/src/dialogs/dialog-col-row.c
+++ b/src/dialogs/dialog-col-row.c
@@ -30,7 +30,6 @@
#include <workbook.h>
#include <wbc-gtk.h>
-#include <gtk/gtk.h>
#define COL_ROW_DIALOG_KEY "col-row-dialog"
diff --git a/src/dialogs/dialog-col-width.c b/src/dialogs/dialog-col-width.c
index cf579b3..061bf49 100644
--- a/src/dialogs/dialog-col-width.c
+++ b/src/dialogs/dialog-col-width.c
@@ -35,7 +35,6 @@
#include <application.h>
#include <workbook-cmd-format.h>
-#include <gtk/gtk.h>
#define COL_WIDTH_DIALOG_KEY "col-width-dialog"
diff --git a/src/dialogs/dialog-consolidate.c b/src/dialogs/dialog-consolidate.c
index e8e35e6..809db60 100644
--- a/src/dialogs/dialog-consolidate.c
+++ b/src/dialogs/dialog-consolidate.c
@@ -40,7 +40,6 @@
#include <wbc-gtk.h>
#include <dialogs/dao-gui-utils.h>
#include <tools/dao.h>
-#include <gtk/gtk.h>
#include <string.h>
diff --git a/src/dialogs/dialog-data-table.c b/src/dialogs/dialog-data-table.c
index 549d78e..5738d8d 100644
--- a/src/dialogs/dialog-data-table.c
+++ b/src/dialogs/dialog-data-table.c
@@ -37,7 +37,6 @@
#include <commands.h>
#include <ranges.h>
#include <widgets/gnumeric-expr-entry.h>
-#include <gtk/gtk.h>
#include <glib/gi18n.h>
#define DIALOG_DATA_TABLE_KEY "dialog-data-table"
diff --git a/src/dialogs/dialog-define-names.c b/src/dialogs/dialog-define-names.c
index 1e25242..fc52acd 100644
--- a/src/dialogs/dialog-define-names.c
+++ b/src/dialogs/dialog-define-names.c
@@ -44,7 +44,6 @@
#include <widgets/gnumeric-cell-renderer-expr-entry.h>
#include <widgets/gnumeric-cell-renderer-toggle.h>
-#include <gtk/gtk.h>
#include <string.h>
#define DEFINE_NAMES_KEY "define-names-dialog"
diff --git a/src/dialogs/dialog-delete-cells.c b/src/dialogs/dialog-delete-cells.c
index 0254222..744c86d 100644
--- a/src/dialogs/dialog-delete-cells.c
+++ b/src/dialogs/dialog-delete-cells.c
@@ -35,7 +35,6 @@
#include <wbc-gtk.h>
#include <command-context.h>
-#include <gtk/gtk.h>
#define DELETE_CELL_DIALOG_KEY "delete-cells-dialog"
diff --git a/src/dialogs/dialog-doc-metadata.c b/src/dialogs/dialog-doc-metadata.c
index 987904d..bf55208 100644
--- a/src/dialogs/dialog-doc-metadata.c
+++ b/src/dialogs/dialog-doc-metadata.c
@@ -44,7 +44,6 @@
#include <goffice/goffice.h>
-#include <gtk/gtk.h>
#include <glib-object.h>
#include <glib/gi18n-lib.h>
diff --git a/src/dialogs/dialog-fill-series.c b/src/dialogs/dialog-fill-series.c
index 34eafc5..95e27a2 100644
--- a/src/dialogs/dialog-fill-series.c
+++ b/src/dialogs/dialog-fill-series.c
@@ -46,7 +46,6 @@
#include <dialogs/dao-gui-utils.h>
-#include <gtk/gtk.h>
#include "tools/fill-series.h"
#define FILL_SERIES_KEY "fill-series-dialog"
diff --git a/src/dialogs/dialog-formula-guru.c b/src/dialogs/dialog-formula-guru.c
index 1cd7b06..998def4 100644
--- a/src/dialogs/dialog-formula-guru.c
+++ b/src/dialogs/dialog-formula-guru.c
@@ -46,7 +46,6 @@
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnumeric-cell-renderer-expr-entry.h>
-#include <gtk/gtk.h>
#include <locale.h>
#include <string.h>
diff --git a/src/dialogs/dialog-function-select.c b/src/dialogs/dialog-function-select.c
index 0e5c455..8590e12 100644
--- a/src/dialogs/dialog-function-select.c
+++ b/src/dialogs/dialog-function-select.c
@@ -43,7 +43,6 @@
#include <auto-format.h>
#include <gsf/gsf-impl-utils.h>
-#include <gtk/gtk.h>
#include <string.h>
#define F2(func,s) dgettext ((func)->tdomain->str, (s))
diff --git a/src/dialogs/dialog-goal-seek.c b/src/dialogs/dialog-goal-seek.c
index 188fc49..5ef4fea 100644
--- a/src/dialogs/dialog-goal-seek.c
+++ b/src/dialogs/dialog-goal-seek.c
@@ -47,7 +47,6 @@
#include <widgets/gnumeric-expr-entry.h>
#include <selection.h>
#include <application.h>
-#include <gtk/gtk.h>
#include <math.h>
#include <string.h>
diff --git a/src/dialogs/dialog-goto-cell.c b/src/dialogs/dialog-goto-cell.c
index 9fec073..a8c56ba 100644
--- a/src/dialogs/dialog-goto-cell.c
+++ b/src/dialogs/dialog-goto-cell.c
@@ -43,7 +43,6 @@
#include <wbc-gtk.h>
-#include <gtk/gtk.h>
#define GOTO_KEY "goto-dialog"
diff --git a/src/dialogs/dialog-hyperlink.c b/src/dialogs/dialog-hyperlink.c
index 8e71e47..4f299ed 100644
--- a/src/dialogs/dialog-hyperlink.c
+++ b/src/dialogs/dialog-hyperlink.c
@@ -41,7 +41,6 @@
#include <wbc-gtk.h>
#include <goffice/goffice.h>
-#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#include <string.h>
diff --git a/src/dialogs/dialog-insert-cells.c b/src/dialogs/dialog-insert-cells.c
index 976419a..dfa946d 100644
--- a/src/dialogs/dialog-insert-cells.c
+++ b/src/dialogs/dialog-insert-cells.c
@@ -35,7 +35,6 @@
#include <wbc-gtk.h>
#include <command-context.h>
-#include <gtk/gtk.h>
#define INSERT_CELL_DIALOG_KEY "insert-cells-dialog"
diff --git a/src/dialogs/dialog-merge.c b/src/dialogs/dialog-merge.c
index ec9f158..5148cd9 100644
--- a/src/dialogs/dialog-merge.c
+++ b/src/dialogs/dialog-merge.c
@@ -39,7 +39,6 @@
#include <selection.h>
#include <widgets/gnumeric-expr-entry.h>
-#include <gtk/gtk.h>
#define MERGE_KEY "merge-dialog"
diff --git a/src/dialogs/dialog-password.c b/src/dialogs/dialog-password.c
index fabe010..08cc080 100644
--- a/src/dialogs/dialog-password.c
+++ b/src/dialogs/dialog-password.c
@@ -1,5 +1,4 @@
#include <gnumeric-config.h>
-#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#include "dialogs.h"
#include "gui-util.h"
diff --git a/src/dialogs/dialog-paste-special.c b/src/dialogs/dialog-paste-special.c
index 7dabbe8..e4ba06b 100644
--- a/src/dialogs/dialog-paste-special.c
+++ b/src/dialogs/dialog-paste-special.c
@@ -31,7 +31,6 @@
#include <selection.h>
#include <cmd-edit.h>
-#include <gtk/gtk.h>
static char const * const paste_type_group[] = {
"paste-type-all",
diff --git a/src/dialogs/dialog-plugin-manager.c b/src/dialogs/dialog-plugin-manager.c
index afe4585..a147363 100644
--- a/src/dialogs/dialog-plugin-manager.c
+++ b/src/dialogs/dialog-plugin-manager.c
@@ -37,7 +37,6 @@
#include <goffice/goffice.h>
-#include <gtk/gtk.h>
#include <gsf/gsf-impl-utils.h>
#include <string.h>
diff --git a/src/dialogs/dialog-preferences.c b/src/dialogs/dialog-preferences.c
index 686b783..9c6b811 100644
--- a/src/dialogs/dialog-preferences.c
+++ b/src/dialogs/dialog-preferences.c
@@ -40,7 +40,6 @@
#include "gnumeric-conf.h"
#include <gui-util.h>
-#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#include <string.h>
diff --git a/src/dialogs/dialog-printer-setup.c b/src/dialogs/dialog-printer-setup.c
index f6a2644..3ba02aa 100644
--- a/src/dialogs/dialog-printer-setup.c
+++ b/src/dialogs/dialog-printer-setup.c
@@ -22,7 +22,6 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include <gtk/gtk.h>
#include "dialogs.h"
#include "help.h"
diff --git a/src/dialogs/dialog-quit.c b/src/dialogs/dialog-quit.c
index eb62f9d..5f9d6cc 100644
--- a/src/dialogs/dialog-quit.c
+++ b/src/dialogs/dialog-quit.c
@@ -32,7 +32,6 @@
#include <application.h>
#include <goffice/goffice.h>
-#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
diff --git a/src/dialogs/dialog-random-generator-cor.c b/src/dialogs/dialog-random-generator-cor.c
index 27648be..cbfe1c6 100644
--- a/src/dialogs/dialog-random-generator-cor.c
+++ b/src/dialogs/dialog-random-generator-cor.c
@@ -47,7 +47,6 @@
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-dao.h>
-#include <gtk/gtk.h>
#include <string.h>
diff --git a/src/dialogs/dialog-random-generator.c b/src/dialogs/dialog-random-generator.c
index 9e61773..9b7377c 100644
--- a/src/dialogs/dialog-random-generator.c
+++ b/src/dialogs/dialog-random-generator.c
@@ -48,7 +48,6 @@
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-dao.h>
-#include <gtk/gtk.h>
#include <string.h>
diff --git a/src/dialogs/dialog-recent.c b/src/dialogs/dialog-recent.c
index 111998d..05e24fd 100644
--- a/src/dialogs/dialog-recent.c
+++ b/src/dialogs/dialog-recent.c
@@ -26,7 +26,6 @@
#include <wbc-gtk.h>
#include <gui-file.h>
#include <gui-util.h>
-#include <gtk/gtk.h>
#include <string.h>
#include <goffice/goffice.h>
diff --git a/src/dialogs/dialog-row-height.c b/src/dialogs/dialog-row-height.c
index 888ecbc..50f2234 100644
--- a/src/dialogs/dialog-row-height.c
+++ b/src/dialogs/dialog-row-height.c
@@ -35,7 +35,6 @@
#include <application.h>
#include <workbook-cmd-format.h>
-#include <gtk/gtk.h>
#define ROW_HEIGHT_DIALOG_KEY "row-height-dialog"
diff --git a/src/dialogs/dialog-scenarios.c b/src/dialogs/dialog-scenarios.c
index d68c458..6b73f10 100644
--- a/src/dialogs/dialog-scenarios.c
+++ b/src/dialogs/dialog-scenarios.c
@@ -39,7 +39,6 @@
#include <tools/dao.h>
#include "tools/scenarios.h"
-#include <gtk/gtk.h>
#include <goffice/goffice.h>
#include <string.h>
diff --git a/src/dialogs/dialog-search-replace.c b/src/dialogs/dialog-search-replace.c
index 387e79d..f1664d9 100644
--- a/src/dialogs/dialog-search-replace.c
+++ b/src/dialogs/dialog-search-replace.c
@@ -35,7 +35,6 @@
#include <selection.h>
#include <goffice/goffice.h>
-#include <gtk/gtk.h>
#include <string.h>
#define SEARCH_REPLACE_KEY "search-replace-dialog"
diff --git a/src/dialogs/dialog-search.c b/src/dialogs/dialog-search.c
index fbe7b78..5085c44 100644
--- a/src/dialogs/dialog-search.c
+++ b/src/dialogs/dialog-search.c
@@ -43,7 +43,6 @@
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnumeric-lazy-list.h>
-#include <gtk/gtk.h>
#include <string.h>
#define SEARCH_KEY "search-dialog"
diff --git a/src/dialogs/dialog-sheet-order.c b/src/dialogs/dialog-sheet-order.c
index 45b659b..781c6b0 100644
--- a/src/dialogs/dialog-sheet-order.c
+++ b/src/dialogs/dialog-sheet-order.c
@@ -44,7 +44,6 @@
#include <widgets/gnumeric-cell-renderer-toggle.h>
#include <goffice/goffice.h>
-#include <gtk/gtk.h>
#include <string.h>
diff --git a/src/dialogs/dialog-sheetobject-size.c b/src/dialogs/dialog-sheetobject-size.c
index c8edf6c..224379f 100644
--- a/src/dialogs/dialog-sheetobject-size.c
+++ b/src/dialogs/dialog-sheetobject-size.c
@@ -40,7 +40,6 @@
#include <sheet-control-gui.h>
#include <widgets/gnm-so-anchor-mode-chooser.h>
-#include <gtk/gtk.h>
#define SO_SIZE_DIALOG_KEY "so-size-dialog"
diff --git a/src/dialogs/dialog-shuffle.c b/src/dialogs/dialog-shuffle.c
index de6f0f2..c03f6de 100644
--- a/src/dialogs/dialog-shuffle.c
+++ b/src/dialogs/dialog-shuffle.c
@@ -39,7 +39,6 @@
#include <commands.h>
#include <selection.h>
-#include <gtk/gtk.h>
#include <widgets/gnumeric-expr-entry.h>
#include <tools/data-shuffling.h>
diff --git a/src/dialogs/dialog-simulation.c b/src/dialogs/dialog-simulation.c
index 0394eb1..d12960a 100644
--- a/src/dialogs/dialog-simulation.c
+++ b/src/dialogs/dialog-simulation.c
@@ -38,7 +38,6 @@
#include "tools/simulation.h"
#include <string.h>
-#include <gtk/gtk.h>
#define SIMULATION_KEY "simulation-dialog"
diff --git a/src/dialogs/dialog-so-list.c b/src/dialogs/dialog-so-list.c
index 015de36..b6167db 100644
--- a/src/dialogs/dialog-so-list.c
+++ b/src/dialogs/dialog-so-list.c
@@ -37,7 +37,6 @@
#include <parse-util.h>
#include <commands.h>
#include <widgets/gnumeric-expr-entry.h>
-#include <gtk/gtk.h>
#include <glib/gi18n.h>
#define DIALOG_SO_LIST_KEY "so-list"
diff --git a/src/dialogs/dialog-so-styled.c b/src/dialogs/dialog-so-styled.c
index 776ed37..86b57d1 100644
--- a/src/dialogs/dialog-so-styled.c
+++ b/src/dialogs/dialog-so-styled.c
@@ -33,7 +33,6 @@
#include "sheet-object.h"
#include "gnm-so-line.h"
#include <goffice/goffice.h>
-#include <gtk/gtk.h>
#include <widgets/gnumeric-text-view.h>
typedef struct {
diff --git a/src/dialogs/dialog-solver.c b/src/dialogs/dialog-solver.c
index c9394a1..6c0bbbc 100644
--- a/src/dialogs/dialog-solver.c
+++ b/src/dialogs/dialog-solver.c
@@ -47,7 +47,6 @@
#include <tools/gnm-solver.h>
#include <widgets/gnumeric-expr-entry.h>
-#include <gtk/gtk.h>
#include <goffice/goffice.h>
#include <string.h>
#include <tools/scenarios.h>
diff --git a/src/dialogs/dialog-stf-export.c b/src/dialogs/dialog-stf-export.c
index 99e82d4..4a3b581 100644
--- a/src/dialogs/dialog-stf-export.c
+++ b/src/dialogs/dialog-stf-export.c
@@ -31,7 +31,6 @@
#include <gnumeric-conf.h>
#include <goffice/goffice.h>
-#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#include <string.h>
diff --git a/src/dialogs/dialog-stf-fixed-page.c b/src/dialogs/dialog-stf-fixed-page.c
index 128f14c..a914859 100644
--- a/src/dialogs/dialog-stf-fixed-page.c
+++ b/src/dialogs/dialog-stf-fixed-page.c
@@ -24,7 +24,6 @@
#include "dialog-stf.h"
#include <gui-util.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
/*************************************************************************************************
* MISC UTILITY FUNCTIONS
diff --git a/src/dialogs/dialog-stf-format-page.c b/src/dialogs/dialog-stf-format-page.c
index 43cb2bf..3ce57f0 100644
--- a/src/dialogs/dialog-stf-format-page.c
+++ b/src/dialogs/dialog-stf-format-page.c
@@ -29,7 +29,6 @@
#include <workbook.h>
#include <workbook-control.h>
#include <gui-util.h>
-#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
/*************************************************************************************************
diff --git a/src/dialogs/dialog-stf-main-page.c b/src/dialogs/dialog-stf-main-page.c
index f5ef660..4ed0d4a 100644
--- a/src/dialogs/dialog-stf-main-page.c
+++ b/src/dialogs/dialog-stf-main-page.c
@@ -26,7 +26,6 @@
#include <gui-util.h>
#include <sheet.h>
#include <workbook.h>
-#include <gtk/gtk.h>
#include <goffice/goffice.h>
#include <string.h>
diff --git a/src/dialogs/dialog-stf-preview.c b/src/dialogs/dialog-stf-preview.c
index a130a00..9ac39ac 100644
--- a/src/dialogs/dialog-stf-preview.c
+++ b/src/dialogs/dialog-stf-preview.c
@@ -29,7 +29,6 @@
#include <number-match.h>
#include <value.h>
#include <style.h>
-#include <gtk/gtk.h>
#include <widgets/gnumeric-lazy-list.h>
#include <string.h>
diff --git a/src/dialogs/dialog-stf-preview.h b/src/dialogs/dialog-stf-preview.h
index c51f76d..44caa45 100644
--- a/src/dialogs/dialog-stf-preview.h
+++ b/src/dialogs/dialog-stf-preview.h
@@ -17,7 +17,6 @@
#include <gnumeric-fwd.h>
#include <stf.h>
-#include <gtk/gtk.h>
#define STF_LINE_LENGTH_LIMIT 1000
#define STF_LINE_DISPLAY_LIMIT 500
diff --git a/src/dialogs/dialog-stf.c b/src/dialogs/dialog-stf.c
index 87bdf86..7c16c85 100644
--- a/src/dialogs/dialog-stf.c
+++ b/src/dialogs/dialog-stf.c
@@ -30,7 +30,6 @@
#include <sheet-style.h>
#include <mstyle.h>
#include <clipboard.h>
-#include <gtk/gtk.h>
#include <string.h>
/**********************************************************************************************
diff --git a/src/dialogs/dialog-stf.h b/src/dialogs/dialog-stf.h
index 1586aba..2effb8b 100644
--- a/src/dialogs/dialog-stf.h
+++ b/src/dialogs/dialog-stf.h
@@ -6,7 +6,6 @@
#include <stf-parse.h>
#include <goffice/goffice.h>
-#include <gtk/gtk.h>
/* for the main_page */
typedef struct {
diff --git a/src/dialogs/dialog-tabulate.c b/src/dialogs/dialog-tabulate.c
index 430cf74..b2ad3fc 100644
--- a/src/dialogs/dialog-tabulate.c
+++ b/src/dialogs/dialog-tabulate.c
@@ -46,7 +46,6 @@
#include "sheet-style.h"
#include "style-color.h"
-#include <gtk/gtk.h>
#include <string.h>
#define TABULATE_KEY "tabulate-dialog"
diff --git a/src/dialogs/dialog-view.c b/src/dialogs/dialog-view.c
index 04d384f..f665cfa 100644
--- a/src/dialogs/dialog-view.c
+++ b/src/dialogs/dialog-view.c
@@ -28,7 +28,6 @@
#include <gui-util.h>
#include <wbc-gtk.h>
-#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#define VIEW_DIALOG_KEY "view-dialog"
diff --git a/src/dialogs/dialog-workbook-attr.c b/src/dialogs/dialog-workbook-attr.c
index 00a1230..6b9b044 100644
--- a/src/dialogs/dialog-workbook-attr.c
+++ b/src/dialogs/dialog-workbook-attr.c
@@ -29,7 +29,6 @@
#include <workbook.h>
#include <wbc-gtk.h>
#include <workbook-priv.h>
-#include <gtk/gtk.h>
#define WORKBOOK_ATTRIBUTE_KEY "workbook-attribute-dialog"
diff --git a/src/dialogs/dialog-zoom.c b/src/dialogs/dialog-zoom.c
index f31df3a..22f0545 100644
--- a/src/dialogs/dialog-zoom.c
+++ b/src/dialogs/dialog-zoom.c
@@ -33,7 +33,6 @@
#include <wbc-gtk.h>
#include <sheet.h>
-#include <gtk/gtk.h>
#define ZOOM_DIALOG_KEY "zoom-dialog"
#define ZOOM_DIALOG_FACTOR_KEY "zoom-dialog-factor"
diff --git a/src/gnm-graph-window.h b/src/gnm-graph-window.h
index 248d061..9f97856 100644
--- a/src/gnm-graph-window.h
+++ b/src/gnm-graph-window.h
@@ -2,7 +2,6 @@
#ifndef _GNM_GRAPH_WINDOW_H_
# define _GNM_GRAPH_WINDOW_H_
-#include <gtk/gtk.h>
#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/gnm-pane-impl.h b/src/gnm-pane-impl.h
index c304681..a1d42f6 100644
--- a/src/gnm-pane-impl.h
+++ b/src/gnm-pane-impl.h
@@ -5,7 +5,6 @@
#include <src/gnm-pane.h>
#include <src/gnumeric-simple-canvas.h>
#include <goffice/canvas/goc-structs.h>
-#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/src/gnm-pane.c b/src/gnm-pane.c
index 77b65b3..bb05fbb 100644
--- a/src/gnm-pane.c
+++ b/src/gnm-pane.c
@@ -39,7 +39,6 @@
#include <gsf/gsf-impl-utils.h>
-#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <string.h>
diff --git a/src/gui-file.c b/src/gui-file.c
index a808833..a961b96 100644
--- a/src/gui-file.c
+++ b/src/gui-file.c
@@ -26,7 +26,6 @@
#include <goffice/goffice.h>
-#include <gtk/gtk.h>
#include <unistd.h>
#include <string.h>
diff --git a/src/gui-util.c b/src/gui-util.c
index b28679a..7866497 100644
--- a/src/gui-util.c
+++ b/src/gui-util.c
@@ -26,7 +26,6 @@
#include "widgets/gnumeric-expr-entry.h"
#include <goffice/goffice.h>
-#include <gtk/gtk.h>
#include <atk/atkrelation.h>
#include <atk/atkrelationset.h>
#include <gdk/gdkkeysyms.h>
diff --git a/src/gui-util.h b/src/gui-util.h
index 58f1c4b..410be9f 100644
--- a/src/gui-util.h
+++ b/src/gui-util.h
@@ -5,7 +5,6 @@
#include "gnumeric-fwd.h"
#include <goffice/goffice.h>
#include "numbers.h"
-#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/src/io-context-gtk.c b/src/io-context-gtk.c
index 3b01f06..4ecef29 100644
--- a/src/io-context-gtk.c
+++ b/src/io-context-gtk.c
@@ -21,7 +21,6 @@
#include "gnm-i18n.h"
#include <gsf/gsf-impl-utils.h>
-#include <gtk/gtk.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/io-context-gtk.h b/src/io-context-gtk.h
index 8960961..4170204 100644
--- a/src/io-context-gtk.h
+++ b/src/io-context-gtk.h
@@ -3,7 +3,6 @@
#include <stdarg.h>
#include "gnumeric-fwd.h"
-#include <gtk/gtk.h>
#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/item-bar.c b/src/item-bar.c
index e03c1a8..ed7f92a 100644
--- a/src/item-bar.c
+++ b/src/item-bar.c
@@ -27,7 +27,6 @@
#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
-#include <gtk/gtk.h>
#define GNUMERIC_ITEM "BAR"
#include <string.h>
diff --git a/src/item-cursor.c b/src/item-cursor.c
index fd096ef..a622216 100644
--- a/src/item-cursor.c
+++ b/src/item-cursor.c
@@ -35,7 +35,6 @@
#include "gui-util.h"
#include "sheet-autofill.h"
#include <gsf/gsf-impl-utils.h>
-#include <gtk/gtk.h>
#include <goffice/goffice.h>
#define GNUMERIC_ITEM "CURSOR"
diff --git a/src/item-edit.c b/src/item-edit.c
index 0907e46..5723c7e 100644
--- a/src/item-edit.c
+++ b/src/item-edit.c
@@ -36,7 +36,6 @@
#include "widgets/gnumeric-expr-entry.h"
#define GNUMERIC_ITEM "EDIT"
-#include <gtk/gtk.h>
#include <gsf/gsf-impl-utils.h>
#include <string.h>
#include <goffice/goffice.h>
diff --git a/src/item-grid.c b/src/item-grid.c
index d202c5f..d800e2a 100644
--- a/src/item-grid.c
+++ b/src/item-grid.c
@@ -41,7 +41,6 @@
#include "gnm-i18n.h"
#include <goffice/goffice.h>
-#include <gtk/gtk.h>
#include <gsf/gsf-impl-utils.h>
#include <math.h>
#include <string.h>
diff --git a/src/main-application.c b/src/main-application.c
index 02c370d..bdbbec8 100644
--- a/src/main-application.c
+++ b/src/main-application.c
@@ -38,7 +38,6 @@
#include "application.h"
#include "func.h"
-#include <gtk/gtk.h>
#include <glib/gstdio.h>
#include <sys/types.h>
diff --git a/src/print-cell.h b/src/print-cell.h
index f1acc06..7dfea8b 100644
--- a/src/print-cell.h
+++ b/src/print-cell.h
@@ -5,7 +5,6 @@
#include "gnumeric.h"
#include "print-info.h"
#include <cairo.h>
-#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/src/print-info.h b/src/print-info.h
index d97a44e..404bc33 100644
--- a/src/print-info.h
+++ b/src/print-info.h
@@ -3,7 +3,6 @@
# define _GNM_PRINT_INFO_H_
#include "gnumeric.h"
-#include <gtk/gtk.h>
#include "print.h"
G_BEGIN_DECLS
diff --git a/src/print.c b/src/print.c
index 4f84f7b..3e5d0a6 100644
--- a/src/print.c
+++ b/src/print.c
@@ -43,7 +43,6 @@
#include "gnumeric-conf.h"
#include <goffice/goffice.h>
-#include <gtk/gtk.h>
#include <gsf/gsf-meta-names.h>
#include <glib/gi18n-lib.h>
diff --git a/src/sheet-control-gui-priv.h b/src/sheet-control-gui-priv.h
index d2290dc..c203461 100644
--- a/src/sheet-control-gui-priv.h
+++ b/src/sheet-control-gui-priv.h
@@ -5,7 +5,6 @@
#include "sheet-control-gui.h"
#include "sheet-control-priv.h"
#include "sheet-object.h"
-#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/src/sheet-control-gui.c b/src/sheet-control-gui.c
index 496a9fb..1434410 100644
--- a/src/sheet-control-gui.c
+++ b/src/sheet-control-gui.c
@@ -72,7 +72,6 @@
#include <gsf/gsf-impl-utils.h>
#include <gsf/gsf-input.h>
#include <gsf/gsf-output-memory.h>
-#include <gtk/gtk.h>
#include <string.h>
diff --git a/src/sheet-control-gui.h b/src/sheet-control-gui.h
index 18b472a..8eb7e0b 100644
--- a/src/sheet-control-gui.h
+++ b/src/sheet-control-gui.h
@@ -4,7 +4,6 @@
#include "gnumeric-fwd.h"
#include "sheet-control.h"
-#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/src/sheet-filter.c b/src/sheet-filter.c
index 71d8fca..0fc0775 100644
--- a/src/sheet-filter.c
+++ b/src/sheet-filter.c
@@ -36,8 +36,8 @@
#include "number-match.h"
#include "gutils.h"
#include "sheet-object.h"
-#include "gnm-filter-combo-view.h"
-#include "gnm-cell-combo-view.h"
+#include "widgets/gnm-filter-combo-view.h"
+#include "widgets/gnm-cell-combo-view.h"
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
diff --git a/src/sheet-object-graph.c b/src/sheet-object-graph.c
index 12eced1..28bca53 100644
--- a/src/sheet-object-graph.c
+++ b/src/sheet-object-graph.c
@@ -50,7 +50,6 @@
#include <gsf/gsf-output-stdio.h>
#include <gsf/gsf-libxml.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
#include <math.h>
#include <string.h>
diff --git a/src/sheet-object-image.c b/src/sheet-object-image.c
index 67f74a4..f4ae7cc 100644
--- a/src/sheet-object-image.c
+++ b/src/sheet-object-image.c
@@ -25,7 +25,6 @@
#include <gsf/gsf-impl-utils.h>
#include <gsf/gsf-output-stdio.h>
#include <gsf/gsf-utils.h>
-#include <gtk/gtk.h>
#include <math.h>
#include <string.h>
diff --git a/src/sheet-object-impl.h b/src/sheet-object-impl.h
index e055ee0..61171bb 100644
--- a/src/sheet-object-impl.h
+++ b/src/sheet-object-impl.h
@@ -9,7 +9,6 @@ G_BEGIN_DECLS
#include <gsf/gsf-libxml.h>
#include <libxml/tree.h>
#include <glib-object.h>
-#include <gtk/gtk.h>
typedef enum {
SHEET_OBJECT_IS_VISIBLE = 1 << 0, /* user selectable */
diff --git a/src/sheet-object-widget.c b/src/sheet-object-widget.c
index 3393f61..0015373 100644
--- a/src/sheet-object-widget.c
+++ b/src/sheet-object-widget.c
@@ -43,7 +43,7 @@
#include "sheet.h"
#include "cell.h"
#include "mathfunc.h"
-#include "gnumeric-expr-entry.h"
+#include "widgets/gnumeric-expr-entry.h"
#include "dialogs/dialogs.h"
#include "dialogs/help.h"
#include "xml-sax.h"
@@ -56,7 +56,6 @@
#include <gsf/gsf-impl-utils.h>
#include <libxml/globals.h>
#include <gdk/gdkkeysyms.h>
-#include <gtk/gtk.h>
#include <math.h>
#include <string.h>
diff --git a/src/sheet-object.h b/src/sheet-object.h
index 2ae4531..5c79a94 100644
--- a/src/sheet-object.h
+++ b/src/sheet-object.h
@@ -3,7 +3,6 @@
# define _GNM_SHEET_OBJECT_H_
#include "gnumeric.h"
-#include <gtk/gtk.h>
#include <gsf/gsf-output.h>
#include <goffice/goffice.h>
diff --git a/src/style-color.c b/src/style-color.c
index eb0ef9c..58776a5 100644
--- a/src/style-color.c
+++ b/src/style-color.c
@@ -10,7 +10,6 @@
#include "gnumeric.h"
#include "style-color.h"
#include "style-border.h"
-#include <gtk/gtk.h>
static GHashTable *style_color_hash;
static GnmColor *sc_black;
diff --git a/src/style.c b/src/style.c
index 0ed777f..657bc7d 100644
--- a/src/style.c
+++ b/src/style.c
@@ -25,7 +25,6 @@
#include <pango/pangocairo.h>
#include <gdk/gdk.h>
-#include <gtk/gtk.h>
#include <string.h>
#include <goffice/goffice.h>
diff --git a/src/validation.c b/src/validation.c
index 894a4eb..c136fa3 100644
--- a/src/validation.c
+++ b/src/validation.c
@@ -39,8 +39,8 @@
#include "sheet-view.h"
#include "sheet-object.h"
#include "sheet-style.h"
-#include "gnm-validation-combo-view.h"
-#include "gnm-cell-combo-view.h"
+#include "widgets/gnm-validation-combo-view.h"
+#include "widgets/gnm-cell-combo-view.h"
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
diff --git a/src/wbc-gtk-actions.c b/src/wbc-gtk-actions.c
index b4876b5..0aa4483 100644
--- a/src/wbc-gtk-actions.c
+++ b/src/wbc-gtk-actions.c
@@ -72,7 +72,6 @@
#include <goffice/goffice.h>
#include <goffice/component/goffice-component.h>
-#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#include <gsf/gsf-input.h>
#include <string.h>
diff --git a/src/wbc-gtk-edit.c b/src/wbc-gtk-edit.c
index bef8839..e8079d7 100644
--- a/src/wbc-gtk-edit.c
+++ b/src/wbc-gtk-edit.c
@@ -53,7 +53,6 @@
#include "command-context.h"
#include <goffice/goffice.h>
-#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#include <string.h>
diff --git a/src/wbc-gtk-impl.h b/src/wbc-gtk-impl.h
index 149fa5b..8613c2e 100644
--- a/src/wbc-gtk-impl.h
+++ b/src/wbc-gtk-impl.h
@@ -10,7 +10,6 @@
#include "widgets/gnm-notebook.h"
#include <goffice/goffice.h>
-#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 24a9ad2..85c4329 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -63,7 +63,6 @@
#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include <gsf/gsf-doc-meta-data.h>
-#include <gtk/gtk.h>
#include "gdk/gdkkeysyms-compat.h"
#include "gnm-i18n.h"
#include <string.h>
diff --git a/src/wbc-gtk.h b/src/wbc-gtk.h
index 0c3d460..e57fc75 100644
--- a/src/wbc-gtk.h
+++ b/src/wbc-gtk.h
@@ -7,7 +7,6 @@
#include "workbook-control.h"
#include "widgets/gnumeric-expr-entry.h"
-#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/src/widgets/gnm-cell-combo-view-impl.h b/src/widgets/gnm-cell-combo-view-impl.h
index 775ee7c..ac224cc 100644
--- a/src/widgets/gnm-cell-combo-view-impl.h
+++ b/src/widgets/gnm-cell-combo-view-impl.h
@@ -3,7 +3,6 @@
#include "gnumeric-fwd.h"
#include "sheet-object-impl.h"
-#include <gtk/gtk.h>
typedef SheetObjectView GnmCComboView;
typedef struct {
diff --git a/src/widgets/gnm-cell-combo-view.c b/src/widgets/gnm-cell-combo-view.c
index 15766e8..83daa2e 100644
--- a/src/widgets/gnm-cell-combo-view.c
+++ b/src/widgets/gnm-cell-combo-view.c
@@ -33,7 +33,6 @@
#include "ranges.h"
#include <goffice/goffice.h>
-#include <gtk/gtk.h>
#include <gdk/gdk.h>
#include <gdk/gdkkeysyms.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/src/widgets/gnm-filter-combo-view.c b/src/widgets/gnm-filter-combo-view.c
index 99f7ad8..02adc85 100644
--- a/src/widgets/gnm-filter-combo-view.c
+++ b/src/widgets/gnm-filter-combo-view.c
@@ -44,7 +44,6 @@
#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
-#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#include <string.h>
diff --git a/src/widgets/gnm-sheet-slicer-combo-view.c b/src/widgets/gnm-sheet-slicer-combo-view.c
index a315809..6ca6997 100644
--- a/src/widgets/gnm-sheet-slicer-combo-view.c
+++ b/src/widgets/gnm-sheet-slicer-combo-view.c
@@ -36,7 +36,6 @@
#include "go-data-cache-field.h"
#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
-#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#include <string.h>
diff --git a/src/widgets/gnm-so-anchor-mode-chooser.c b/src/widgets/gnm-so-anchor-mode-chooser.c
index 69a4f12..58ecf9f 100644
--- a/src/widgets/gnm-so-anchor-mode-chooser.c
+++ b/src/widgets/gnm-so-anchor-mode-chooser.c
@@ -19,7 +19,6 @@
*/
#include <gnumeric-config.h>
-#include <gtk/gtk.h>
#include "gnm-so-anchor-mode-chooser.h"
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
diff --git a/src/widgets/gnm-validation-combo-view.c b/src/widgets/gnm-validation-combo-view.c
index 1781dd9..6b8ba34 100644
--- a/src/widgets/gnm-validation-combo-view.c
+++ b/src/widgets/gnm-validation-combo-view.c
@@ -41,7 +41,6 @@
#include "gnumeric.h"
#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
-#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
#include <string.h>
diff --git a/src/widgets/gnumeric-expr-entry.c b/src/widgets/gnumeric-expr-entry.c
index 9f82fc6..91758a0 100644
--- a/src/widgets/gnumeric-expr-entry.c
+++ b/src/widgets/gnumeric-expr-entry.c
@@ -39,7 +39,6 @@
#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
-#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include <string.h>
diff --git a/src/widgets/gnumeric-expr-entry.h b/src/widgets/gnumeric-expr-entry.h
index 864dd6b..3df879e 100644
--- a/src/widgets/gnumeric-expr-entry.h
+++ b/src/widgets/gnumeric-expr-entry.h
@@ -3,7 +3,6 @@
#include "gnumeric-fwd.h"
#include "parse-util.h"
-#include <gtk/gtk.h>
#define GNM_EXPR_ENTRY_TYPE (gnm_expr_entry_get_type ())
#define GNM_EXPR_ENTRY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNM_EXPR_ENTRY_TYPE, GnmExprEntry))
diff --git a/src/widgets/gnumeric-text-view.c b/src/widgets/gnumeric-text-view.c
index 6353528..1fd787a 100644
--- a/src/widgets/gnumeric-text-view.c
+++ b/src/widgets/gnumeric-text-view.c
@@ -27,7 +27,6 @@
#include <gui-util.h>
#include <gsf/gsf-impl-utils.h>
-#include <gtk/gtk.h>
struct _GnmTextView {
GtkBox parent;
diff --git a/src/widgets/gnumeric-text-view.h b/src/widgets/gnumeric-text-view.h
index bbf6dc0..4fbf4b4 100644
--- a/src/widgets/gnumeric-text-view.h
+++ b/src/widgets/gnumeric-text-view.h
@@ -23,7 +23,6 @@
#define GNUMERIC_TEXT_VIEW_H
#include "gnumeric-fwd.h"
-#include <gtk/gtk.h>
#define GNM_TEXT_VIEW_TYPE (gnm_text_view_get_type ())
#define GNM_TEXT_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNM_TEXT_VIEW_TYPE, GnmTextView))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
