[gnumeric] Compilation: don't include goffice detail files.
- From: Morten Welinder <mortenw src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnumeric] Compilation: don't include goffice detail files.
- Date: Wed, 10 Jun 2009 10:34:21 -0400 (EDT)
commit 467c41427313d4e381170310a0b29a525c4825fb
Author: Morten Welinder <terra gnome org>
Date: Wed Jun 10 10:33:43 2009 -0400
Compilation: don't include goffice detail files.
---
component/gnumeric.c | 6 +----
plugins/applix/applix-read.c | 5 +---
plugins/applix/applix-write.c | 4 +--
plugins/applix/boot.c | 3 +-
plugins/corba/corba-application.c | 2 +-
plugins/corba/corba-workbook.c | 3 +-
plugins/derivatives/options.c | 2 +-
plugins/dif/dif.c | 3 +-
plugins/excel/boot.c | 4 +--
plugins/excel/excel-xml-read.c | 5 +---
plugins/excel/ms-biff.c | 2 +-
plugins/excel/ms-chart.c | 24 +----------------------
plugins/excel/ms-excel-read.c | 9 +-------
plugins/excel/ms-excel-util.c | 2 +-
plugins/excel/ms-excel-write.c | 11 +---------
plugins/excel/ms-formula-read.c | 2 +-
plugins/excel/ms-formula-write.c | 2 +-
plugins/excel/xls-read-pivot.c | 2 +-
plugins/excel/xlsx-read.c | 15 +-------------
plugins/excel/xlsx-utils.c | 2 +-
plugins/excel/xlsx-write.c | 6 +----
plugins/fn-complex/functions.c | 2 +-
plugins/fn-database/functions.c | 2 +-
plugins/fn-date/functions.c | 2 +-
plugins/fn-eng/functions.c | 2 +-
plugins/fn-erlang/functions.c | 2 +-
plugins/fn-financial/functions.c | 2 +-
plugins/fn-info/functions.c | 3 +-
plugins/fn-logical/functions.c | 2 +-
plugins/fn-lookup/functions.c | 3 +-
plugins/fn-math/functions.c | 2 +-
plugins/fn-r/functions.c | 2 +-
plugins/fn-random/functions.c | 2 +-
plugins/fn-stat/functions.c | 2 +-
plugins/fn-string/functions.c | 5 +---
plugins/fn-tsa/functions.c | 2 +-
plugins/gda/plugin-gda.c | 6 +----
plugins/guile/plugin.c | 3 +-
plugins/html/boot.c | 2 +-
plugins/html/boot.h | 2 +-
plugins/html/html.c | 4 +--
plugins/html/html.h | 2 +-
plugins/html/html_read.c | 4 +--
plugins/html/latex.c | 3 +-
plugins/html/latex.h | 2 +-
plugins/html/roff.c | 3 +-
plugins/lotus-123/boot.c | 5 +---
plugins/mps/mps.c | 5 +---
plugins/mps/parser.c | 4 +--
plugins/numtheory/numtheory.c | 2 +-
plugins/oleo/boot.c | 2 +-
plugins/openoffice/openoffice-read.c | 9 +-------
plugins/openoffice/openoffice-write.c | 7 +-----
plugins/paradox/paradox.c | 6 +----
plugins/perl-loader/boot.c | 2 +-
plugins/perl-loader/perl-loader.c | 6 +----
plugins/plan-perfect/pln.c | 5 +---
plugins/plan-perfect/pln.h | 2 +-
plugins/psiconv/boot.c | 3 +-
plugins/psiconv/psiconv-plugin.h | 2 +-
plugins/psiconv/psiconv-read.c | 3 +-
plugins/python-loader/boot.c | 2 +-
plugins/python-loader/gnm-py-interpreter.c | 2 +-
plugins/python-loader/gnm-python.c | 4 +--
plugins/python-loader/py-command-line.c | 2 +-
plugins/python-loader/py-console.c | 2 +-
plugins/python-loader/py-gnumeric.c | 2 +-
plugins/python-loader/py-gnumeric.h | 2 +-
plugins/python-loader/py-interpreter-selector.c | 2 +-
plugins/python-loader/py-interpreter-selector.h | 2 +-
plugins/python-loader/python-loader.c | 4 +--
plugins/qpro/qpro-read.c | 3 +-
plugins/sample_datasource/sample_datasource.c | 2 +-
plugins/sc/sc.c | 6 +----
plugins/sylk/sylk-write.c | 2 +-
plugins/sylk/sylk.c | 5 +---
plugins/xbase/boot.c | 5 +---
plugins/xbase/xbase.c | 3 +-
src/application.c | 4 +--
src/auto-format.c | 2 +-
src/cell-draw.c | 2 +-
src/cell.c | 2 +-
src/clipboard.c | 3 +-
src/clipboard.h | 2 +-
src/collect.c | 2 +-
src/command-context-stderr.c | 3 +-
src/command-context.h | 2 +-
src/commands.c | 4 +--
src/dependent.c | 2 +-
src/dependent.h | 3 +-
src/dialogs/dialog-about.c | 12 +----------
src/dialogs/dialog-autocorrect.c | 2 +-
src/dialogs/dialog-autosave.c | 2 +-
src/dialogs/dialog-cell-format.c | 7 +-----
src/dialogs/dialog-cell-sort.c | 2 +-
src/dialogs/dialog-doc-metadata.c | 3 +-
src/dialogs/dialog-formula-guru.c | 2 +-
src/dialogs/dialog-hyperlink.c | 2 +-
src/dialogs/dialog-plugin-manager.c | 7 +-----
src/dialogs/dialog-printer-setup.c | 4 +--
src/dialogs/dialog-quit.c | 4 +--
src/dialogs/dialog-recent.c | 2 +-
src/dialogs/dialog-scenarios.c | 2 +-
src/dialogs/dialog-search-replace.c | 2 +-
src/dialogs/dialog-sheet-order.c | 3 +-
src/dialogs/dialog-so-styled.c | 3 +-
src/dialogs/dialog-solver.c | 2 +-
src/dialogs/dialog-stf-csv-page.c | 2 +-
src/dialogs/dialog-stf-export.c | 3 +-
src/dialogs/dialog-stf-main-page.c | 2 +-
src/dialogs/dialog-stf.h | 4 +--
src/dialogs/dialogs.h | 2 +-
src/expr-name.c | 3 +-
src/expr-name.h | 2 +-
src/expr.c | 4 +--
src/file-autoft.c | 3 +-
src/format-template.c | 4 +--
src/func.c | 2 +-
src/gnm-data-cache-source.h | 2 +-
src/gnm-datetime.c | 2 +-
src/gnm-datetime.h | 2 +-
src/gnm-format.c | 4 +--
src/gnm-format.h | 2 +-
src/gnm-graph-window.c | 2 +-
src/gnm-graph-window.h | 2 +-
src/gnm-pane.c | 5 +---
src/gnm-plugin.c | 9 +-------
src/gnm-plugin.h | 3 +-
src/gnm-so-filled.c | 6 +----
src/gnm-so-line.c | 6 +----
src/gnm-so-polygon.c | 5 +---
src/gnm-style-impl.h | 2 +-
src/gnumeric-gconf.c | 4 +--
src/gnumeric-gconf.h | 3 +-
src/gnumeric.h | 3 +-
src/go-data-cache-field.h | 2 +-
src/go-data-cache-source.c | 2 +-
src/go-data-cache-source.h | 2 +-
src/go-data-cache.h | 2 +-
src/go-data-slicer-field.h | 2 +-
src/go-string.c | 3 +-
src/go-val.c | 3 +-
src/graph.c | 4 +--
src/graph.h | 3 +-
src/gui-clipboard.c | 2 +-
src/gui-file.c | 5 +---
src/gui-util.c | 5 +---
src/gui-util.h | 3 +-
src/gutils.c | 4 +--
src/gutils.h | 2 +-
src/history.c | 2 +-
src/hlink.c | 2 +-
src/io-context-gtk.c | 2 +-
src/io-context-gtk.h | 2 +-
src/item-cursor.c | 2 +-
src/item-edit.c | 2 +-
src/libgnumeric.c | 5 ----
src/main-application.c | 5 +---
src/mathfunc.c | 2 +-
src/mstyle.c | 3 +-
src/number-match.c | 5 +---
src/numbers.h | 2 +-
src/parse-util.c | 4 +--
src/parser.y | 4 +--
src/print-info.c | 6 +----
src/print.c | 3 +-
src/rangefunc.h | 2 +-
src/regression.h | 2 +-
src/rendered-value.c | 3 +-
src/search.h | 2 +-
src/selection.c | 4 +--
src/selection.h | 2 +-
src/session.c | 2 +-
src/sheet-autofill.c | 3 +-
src/sheet-control-gui.c | 4 +--
src/sheet-filter.h | 2 +-
src/sheet-object-cell-comment.c | 3 +-
src/sheet-object-graph.c | 16 +--------------
src/sheet-object-graph.h | 3 +-
src/sheet-object-image.c | 5 +---
src/sheet-object-widget.c | 4 +--
src/sheet-object.c | 3 +-
src/sheet-object.h | 2 +-
src/sheet-style.c | 2 +-
src/sheet.c | 4 +--
src/sheet.h | 2 +-
src/sort.c | 2 +-
src/ssconvert.c | 8 +------
src/ssgrep.c | 6 +----
src/ssindex.c | 8 +------
src/sstest.c | 7 +-----
src/stf-export.c | 6 +----
src/stf-export.h | 2 +-
src/stf-parse.c | 5 +---
src/stf.c | 5 +---
src/style-color.h | 2 +-
src/style.c | 2 +-
src/symbol.c | 2 +-
src/test-harness.c | 5 +---
src/test-pango.c | 4 +--
src/tools/analysis-exp-smoothing.c | 7 +-----
src/tools/analysis-frequency.c | 7 +-----
src/tools/analysis-histogram.c | 7 +-----
src/tools/analysis-kaplan-meier.c | 10 +--------
src/tools/analysis-tools.c | 7 +-----
src/tools/auto-correct.c | 3 +-
src/tools/dao.c | 3 +-
src/tools/dao.h | 2 +-
src/tools/data-shuffling.c | 2 +-
src/tools/fill-series.c | 2 +-
src/tools/scenarios.c | 2 +-
src/tools/solver/solver.c | 2 +-
src/value-sheet.c | 2 +-
src/value.c | 3 +-
src/wbc-gtk-actions.c | 8 +------
src/wbc-gtk-edit.c | 3 +-
src/wbc-gtk-impl.h | 7 +-----
src/wbc-gtk.c | 10 +--------
src/widgets/gnm-dao.c | 2 +-
src/widgets/gnm-filter-combo-foo-view.c | 3 +-
src/widgets/gnm-format-sel.h | 2 +-
src/widgets/gnm-sheet-slicer-combo-foo-view.c | 2 +-
src/widgets/gnm-validation-combo-foo-view.c | 2 +-
src/widgets/gnumeric-expr-entry.c | 5 +---
src/widgets/widget-font-selector.c | 3 +-
src/workbook-control-priv.h | 2 +-
src/workbook-control.c | 2 +-
src/workbook-priv.h | 4 +--
src/workbook-view.c | 7 +-----
src/workbook.c | 5 +---
src/workbook.h | 2 +-
src/xml-io.c | 6 +----
src/xml-io.h | 3 +-
src/xml-sax-read.c | 10 +--------
src/xml-sax-write.c | 3 +-
235 files changed, 234 insertions(+), 623 deletions(-)
diff --git a/component/gnumeric.c b/component/gnumeric.c
index a0e60ff..b83fb00 100644
--- a/component/gnumeric.c
+++ b/component/gnumeric.c
@@ -37,14 +37,10 @@
#include <workbook-view.h>
#include <workbook.h>
-#include <goffice/app/io-context.h>
+#include <goffice/goffice.h>
#include <goffice/component/goffice-component.h>
#include <goffice/component/go-component-factory.h>
#include <goffice/component/go-component.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-color.h>
-#include <goffice/utils/go-image.h>
-#include <goffice/app/go-cmd-context.h>
#include <goffice/app/module-plugin-defs.h>
#include <gsf/gsf-impl-utils.h>
#include <gsf/gsf-input-memory.h>
diff --git a/plugins/applix/applix-read.c b/plugins/applix/applix-read.c
index ec16ebd..5d8ba9f 100644
--- a/plugins/applix/applix-read.c
+++ b/plugins/applix/applix-read.c
@@ -53,10 +53,7 @@
#include <workbook.h>
#include <parse-util.h>
-#include <goffice/app/io-context.h>
-#include <goffice/app/error-info.h>
-#include <goffice/utils/go-format.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-input-textline.h>
diff --git a/plugins/applix/applix-write.c b/plugins/applix/applix-write.c
index 25fad9a..13c98d6 100644
--- a/plugins/applix/applix-write.c
+++ b/plugins/applix/applix-write.c
@@ -40,11 +40,9 @@
#include "selection.h"
#include "position.h"
#include "ranges.h"
-#include <goffice/app/io-context.h>
+#include <goffice/goffice.h>
#include "workbook-view.h"
#include "workbook.h"
-#include <goffice/app/error-info.h>
-#include <goffice/app/go-doc.h>
#include <string.h>
#include <gsf/gsf-output.h>
diff --git a/plugins/applix/boot.c b/plugins/applix/boot.c
index 5a6624c..9e8692b 100644
--- a/plugins/applix/boot.c
+++ b/plugins/applix/boot.c
@@ -25,11 +25,10 @@
#include <gnumeric.h>
#include "applix.h"
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
#include <workbook-view.h>
#include <workbook.h>
-#include <goffice/app/io-context.h>
#include <gsf/gsf-input.h>
#include <string.h>
diff --git a/plugins/corba/corba-application.c b/plugins/corba/corba-application.c
index f1a1cb6..01823db 100644
--- a/plugins/corba/corba-application.c
+++ b/plugins/corba/corba-application.c
@@ -30,7 +30,7 @@
#include <workbook-priv.h>
#include <workbook-view.h>
#include <gnm-plugin.h>
-#include <goffice/app/io-context.h>
+#include <goffice/goffice.h>
#include <command-context.h>
#include <command-context-stderr.h>
#include <glib/gi18n-lib.h>
diff --git a/plugins/corba/corba-workbook.c b/plugins/corba/corba-workbook.c
index 2cc33c4..f03f461 100644
--- a/plugins/corba/corba-workbook.c
+++ b/plugins/corba/corba-workbook.c
@@ -33,8 +33,7 @@
#include <sheet.h>
#include <command-context.h>
-#include <goffice/app/go-doc.h>
-#include <goffice/app/go-cmd-context-impl.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include <bonobo/bonobo-main.h>
#include <bonobo/bonobo-exception.h>
diff --git a/plugins/derivatives/options.c b/plugins/derivatives/options.c
index 6a4d1b1..7b75433 100644
--- a/plugins/derivatives/options.c
+++ b/plugins/derivatives/options.c
@@ -34,7 +34,7 @@
#include "gnm-i18n.h"
#include "numbers.h"
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
#include <math.h>
diff --git a/plugins/dif/dif.c b/plugins/dif/dif.c
index ed2d301..204f85c 100644
--- a/plugins/dif/dif.c
+++ b/plugins/dif/dif.c
@@ -18,11 +18,10 @@
#include <value.h>
#include <numbers.h>
#include <gutils.h>
-#include <goffice/app/io-context.h>
+#include <goffice/goffice.h>
#include <workbook-view.h>
#include <workbook.h>
#include <gnm-plugin.h>
-#include <goffice/app/error-info.h>
#include <gsf/gsf-input-textline.h>
#include <gsf/gsf-output.h>
diff --git a/plugins/excel/boot.c b/plugins/excel/boot.c
index 9b0bcb1..9e035fd 100644
--- a/plugins/excel/boot.c
+++ b/plugins/excel/boot.c
@@ -35,9 +35,7 @@
#include "ms-excel-util.h"
#include "ms-excel-read.h"
-#include <goffice/app/go-doc.h>
-#include <goffice/app/file.h>
-#include <goffice/app/io-context.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-input.h>
#include <gsf/gsf-infile.h>
#include <gsf/gsf-infile-msole.h>
diff --git a/plugins/excel/excel-xml-read.c b/plugins/excel/excel-xml-read.c
index 1d3430a..cf133fe 100644
--- a/plugins/excel/excel-xml-read.c
+++ b/plugins/excel/excel-xml-read.c
@@ -42,10 +42,7 @@
#include "workbook-view.h"
#include "workbook.h"
#include "xml-io.h"
-#include <goffice/app/error-info.h>
-#include <goffice/app/io-context.h>
-#include <goffice/app/go-plugin.h>
-#include <goffice/utils/datetime.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-libxml.h>
#include <gsf/gsf-input.h>
diff --git a/plugins/excel/ms-biff.c b/plugins/excel/ms-biff.c
index c3b8a34..1dce3b2 100644
--- a/plugins/excel/ms-biff.c
+++ b/plugins/excel/ms-biff.c
@@ -23,7 +23,7 @@
#include <gsf/gsf-output.h>
#include <gsf/gsf-utils.h>
#include <gsf/gsf-msole-utils.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#define BIFF_DEBUG 0
#define sizeof_BIFF_8_FILEPASS (6 + 3*16)
diff --git a/plugins/excel/ms-chart.c b/plugins/excel/ms-chart.c
index da364b6..a87bc59 100644
--- a/plugins/excel/ms-chart.c
+++ b/plugins/excel/ms-chart.c
@@ -30,29 +30,7 @@
#include <workbook-view.h>
#include <go-string.h>
-#include <goffice/graph/goffice-graph.h>
-#include <goffice/graph/gog-graph.h>
-#include <goffice/graph/gog-chart.h>
-#include <goffice/graph/gog-axis.h>
-#include <goffice/graph/gog-grid-line.h>
-#include <goffice/graph/gog-plot-impl.h>
-#include <goffice/graph/gog-series-impl.h>
-#include <goffice/graph/gog-object.h>
-#include <goffice/graph/gog-styled-object.h>
-#include <goffice/graph/gog-plot-engine.h>
-#include <goffice/graph/gog-renderer.h>
-#include <goffice/graph/gog-error-bar.h>
-#include <goffice/graph/gog-reg-curve.h>
-#include <goffice/graph/gog-label.h>
-#include <goffice/data/go-data-simple.h>
-#include <goffice/utils/go-color.h>
-#include <goffice/utils/go-font.h>
-#include <goffice/utils/go-line.h>
-#include <goffice/utils/go-pattern.h>
-#include <goffice/utils/go-marker.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-style.h>
-#include <goffice/utils/go-styled-object.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-utils.h>
#include <math.h>
diff --git a/plugins/excel/ms-excel-read.c b/plugins/excel/ms-excel-read.c
index 0ea559b..b6ee2cf 100644
--- a/plugins/excel/ms-excel-read.c
+++ b/plugins/excel/ms-excel-read.c
@@ -67,14 +67,7 @@
#include <sheet-object-graph.h>
#include <sheet-object-image.h>
#include <go-string.h>
-#include <goffice/app/io-context.h>
-#include <goffice/app/go-doc.h>
-#include <goffice/utils/go-font.h>
-#include <goffice/utils/go-format.h>
-#include <goffice/utils/go-locale.h>
-#include <goffice/utils/go-units.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-style.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-input.h>
#include <gsf/gsf-utils.h>
diff --git a/plugins/excel/ms-excel-util.c b/plugins/excel/ms-excel-util.c
index 9f14caf..1d0fb13 100644
--- a/plugins/excel/ms-excel-util.c
+++ b/plugins/excel/ms-excel-util.c
@@ -15,7 +15,7 @@
#include "boot.h"
#include "style.h"
#include "ms-excel-util.h"
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <stdio.h>
#include <string.h>
diff --git a/plugins/excel/ms-excel-write.c b/plugins/excel/ms-excel-write.c
index a3678ef..8345a32 100644
--- a/plugins/excel/ms-excel-write.c
+++ b/plugins/excel/ms-excel-write.c
@@ -57,7 +57,7 @@
#include <print-info.h>
#include <workbook-view.h>
#include <workbook-priv.h>
-#include <goffice/app/io-context.h>
+#include <goffice/goffice.h>
#include <command-context.h>
#include <expr.h>
#include <expr-impl.h>
@@ -66,15 +66,6 @@
#include <go-string.h>
#include <go-data-slicer.h>
-#include <goffice/graph/goffice-graph.h>
-#include <goffice/graph/gog-object.h>
-#include <goffice/graph/gog-styled-object.h>
-#include <goffice/graph/gog-axis.h>
-#include <goffice/utils/go-color.h>
-#include <goffice/utils/go-marker.h>
-#include <goffice/utils/go-units.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-style.h>
#include <gsf/gsf-utils.h>
#include <gsf/gsf-output.h>
#include <gsf/gsf-outfile.h>
diff --git a/plugins/excel/ms-formula-read.c b/plugins/excel/ms-formula-read.c
index a233a39..dc20085 100644
--- a/plugins/excel/ms-formula-read.c
+++ b/plugins/excel/ms-formula-read.c
@@ -26,7 +26,7 @@
#include <sheet.h>
#include <workbook.h>
#include <go-string.h>
-#include <goffice/app/go-doc.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-utils.h>
#undef G_LOG_DOMAIN
diff --git a/plugins/excel/ms-formula-write.c b/plugins/excel/ms-formula-write.c
index 48aa2e5..d5d351d 100644
--- a/plugins/excel/ms-formula-write.c
+++ b/plugins/excel/ms-formula-write.c
@@ -31,7 +31,7 @@
#include <expr-name.h>
#include <parse-util.h>
#include <go-string.h>
-#include <goffice/app/io-context.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-utils.h>
#include <glib/gi18n-lib.h>
diff --git a/plugins/excel/xls-read-pivot.c b/plugins/excel/xls-read-pivot.c
index b6dd671..afde687 100644
--- a/plugins/excel/xls-read-pivot.c
+++ b/plugins/excel/xls-read-pivot.c
@@ -40,7 +40,7 @@
#include <go-data-slicer-field.h>
#include <go-data-slicer.h>
-#include <goffice/utils/datetime.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-infile.h>
#include <gsf/gsf-input.h>
diff --git a/plugins/excel/xlsx-read.c b/plugins/excel/xlsx-read.c
index 43ae661..876da66 100644
--- a/plugins/excel/xlsx-read.c
+++ b/plugins/excel/xlsx-read.c
@@ -50,21 +50,8 @@
#include "sheet-object-graph.h"
#include "gnm-sheet-slicer.h"
-#include <goffice/app/error-info.h>
-#include <goffice/app/io-context.h>
-#include <goffice/app/go-plugin.h>
-#include <goffice/utils/datetime.h>
-#include <goffice/utils/go-units.h>
-#include <goffice/utils/go-marker.h>
-#include <goffice/utils/go-style.h>
-#include <goffice/utils/go-styled-object.h>
-#include <goffice/data/go-data-simple.h>
-
-#include <goffice/graph/gog-object.h>
-#include <goffice/graph/gog-chart.h>
-#include <goffice/graph/gog-plot.h>
-#include <goffice/graph/gog-series.h>
-#include <goffice/graph/gog-data-set.h>
+#include <goffice/goffice.h>
+
#include "goffice-data.h" /* MOVE TO GOFFCE with slicer code */
#include "go-data-slicer-field.h" /* MOVE TO GOFFCE with slicer code */
diff --git a/plugins/excel/xlsx-utils.c b/plugins/excel/xlsx-utils.c
index fd6b85d..44afb2a 100644
--- a/plugins/excel/xlsx-utils.c
+++ b/plugins/excel/xlsx-utils.c
@@ -32,7 +32,7 @@
#include "sheet.h"
#include "func.h"
#include "gnm-format.h"
-#include <goffice/app/go-doc.h>
+#include <goffice/goffice.h>
#include <glib-object.h>
typedef struct {
diff --git a/plugins/excel/xlsx-write.c b/plugins/excel/xlsx-write.c
index 90e2d75..81c2634 100644
--- a/plugins/excel/xlsx-write.c
+++ b/plugins/excel/xlsx-write.c
@@ -52,11 +52,7 @@
#include "go-val.h"
#include <go-string.h>
-#include <goffice/app/file.h>
-#include <goffice/utils/go-format.h>
-#include <goffice/graph/gog-object.h>
-#include <goffice/graph/gog-plot.h>
-#include <goffice/graph/gog-data-set.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-output.h>
#include <gsf/gsf-outfile.h>
diff --git a/plugins/fn-complex/functions.c b/plugins/fn-complex/functions.c
index 6142dcb..6ba2950 100644
--- a/plugins/fn-complex/functions.c
+++ b/plugins/fn-complex/functions.c
@@ -36,7 +36,7 @@
#include <mathfunc.h>
#include <gnm-i18n.h>
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
#include "gsl-complex.h"
diff --git a/plugins/fn-database/functions.c b/plugins/fn-database/functions.c
index 012fb0d..a1983e1 100644
--- a/plugins/fn-database/functions.c
+++ b/plugins/fn-database/functions.c
@@ -35,7 +35,7 @@
#include <gnm-i18n.h>
#include <go-string.h>
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
#include <math.h>
diff --git a/plugins/fn-date/functions.c b/plugins/fn-date/functions.c
index 9177e81..4fbe4dc 100644
--- a/plugins/fn-date/functions.c
+++ b/plugins/fn-date/functions.c
@@ -40,7 +40,7 @@
#include <string.h>
#include <stdlib.h>
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
GNM_PLUGIN_MODULE_HEADER;
diff --git a/plugins/fn-eng/functions.c b/plugins/fn-eng/functions.c
index 3afc414..a5e788c 100644
--- a/plugins/fn-eng/functions.c
+++ b/plugins/fn-eng/functions.c
@@ -35,7 +35,7 @@
#include <workbook.h>
#include <sheet.h>
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
#include <math.h>
diff --git a/plugins/fn-erlang/functions.c b/plugins/fn-erlang/functions.c
index d04fea1..b68862d 100644
--- a/plugins/fn-erlang/functions.c
+++ b/plugins/fn-erlang/functions.c
@@ -37,7 +37,7 @@
#include <tools/goal-seek.h>
#include <gnm-i18n.h>
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
#include <math.h>
diff --git a/plugins/fn-financial/functions.c b/plugins/fn-financial/functions.c
index dab2934..220ad94 100644
--- a/plugins/fn-financial/functions.c
+++ b/plugins/fn-financial/functions.c
@@ -36,7 +36,7 @@
#include <sheet.h>
#include <gnm-datetime.h>
#include <gnm-i18n.h>
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
#include <math.h>
diff --git a/plugins/fn-info/functions.c b/plugins/fn-info/functions.c
index ae05f3f..6fa8523 100644
--- a/plugins/fn-info/functions.c
+++ b/plugins/fn-info/functions.c
@@ -49,8 +49,7 @@
#include <number-match.h>
#include <gnm-i18n.h>
-#include <goffice/app/go-doc.h>
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
#ifdef HAVE_UNAME
diff --git a/plugins/fn-logical/functions.c b/plugins/fn-logical/functions.c
index 4aabcf2..5f329e0 100644
--- a/plugins/fn-logical/functions.c
+++ b/plugins/fn-logical/functions.c
@@ -33,7 +33,7 @@
#include <value.h>
#include <gnm-i18n.h>
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
GNM_PLUGIN_MODULE_HEADER;
diff --git a/plugins/fn-lookup/functions.c b/plugins/fn-lookup/functions.c
index 1c1befd..58abb15 100644
--- a/plugins/fn-lookup/functions.c
+++ b/plugins/fn-lookup/functions.c
@@ -42,8 +42,7 @@
#include <parse-util.h>
#include <gnm-i18n.h>
-#include <goffice/app/go-plugin.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
#include <string.h>
diff --git a/plugins/fn-math/functions.c b/plugins/fn-math/functions.c
index 76f22ca..da9f5cf 100644
--- a/plugins/fn-math/functions.c
+++ b/plugins/fn-math/functions.c
@@ -36,7 +36,7 @@
#include <regression.h>
#include <gnm-i18n.h>
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
#include <math.h>
diff --git a/plugins/fn-r/functions.c b/plugins/fn-r/functions.c
index 0745efe..a975586 100644
--- a/plugins/fn-r/functions.c
+++ b/plugins/fn-r/functions.c
@@ -2,7 +2,7 @@
#include <gnumeric-config.h>
#include <gnumeric.h>
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
#include <func.h>
#include <gnm-i18n.h>
diff --git a/plugins/fn-random/functions.c b/plugins/fn-random/functions.c
index 4e0f360..fb6c70e 100644
--- a/plugins/fn-random/functions.c
+++ b/plugins/fn-random/functions.c
@@ -35,7 +35,7 @@
#include <collect.h>
#include <gnm-i18n.h>
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
GNM_PLUGIN_MODULE_HEADER;
diff --git a/plugins/fn-stat/functions.c b/plugins/fn-stat/functions.c
index a577b4c..ae7c7a8 100644
--- a/plugins/fn-stat/functions.c
+++ b/plugins/fn-stat/functions.c
@@ -36,7 +36,7 @@
#include <expr-impl.h>
#include <func-builtin.h>
#include <gnm-i18n.h>
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
#include <math.h>
#include <stdlib.h>
diff --git a/plugins/fn-string/functions.c b/plugins/fn-string/functions.c
index b737b61..257d95b 100644
--- a/plugins/fn-string/functions.c
+++ b/plugins/fn-string/functions.c
@@ -37,13 +37,10 @@
#include <mathfunc.h>
#include <rangefunc-strings.h>
#include <collect.h>
-#include <goffice/utils/regutf8.h>
-#include <goffice/utils/go-locale.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-utils.h>
#include <gsf/gsf-msole-utils.h>
#include <gnm-i18n.h>
-#include <goffice/app/go-plugin.h>
-#include <goffice/utils/go-glib-extras.h>
#include <gnm-plugin.h>
#include <limits.h>
diff --git a/plugins/fn-tsa/functions.c b/plugins/fn-tsa/functions.c
index b10c11b..b3028c0 100644
--- a/plugins/fn-tsa/functions.c
+++ b/plugins/fn-tsa/functions.c
@@ -46,7 +46,7 @@
#include <expr-impl.h>
#include <func-builtin.h>
#include <gnm-i18n.h>
-#include <goffice/math/go-cspline.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
#include <tools/analysis-tools.h>
#include <complex.h>
diff --git a/plugins/gda/plugin-gda.c b/plugins/gda/plugin-gda.c
index 5e678b9..bc5674e 100644
--- a/plugins/gda/plugin-gda.c
+++ b/plugins/gda/plugin-gda.c
@@ -35,11 +35,7 @@
#include "workbook.h"
#include "sheet.h"
#include "gnm-i18n.h"
-#include <goffice/app/go-plugin.h>
-#include <goffice/app/error-info.h>
-#include <goffice/utils/datetime.h>
-#include <goffice/utils/go-format.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
GNM_PLUGIN_MODULE_HEADER;
diff --git a/plugins/guile/plugin.c b/plugins/guile/plugin.c
index ff2e625..7aed0a4 100644
--- a/plugins/guile/plugin.c
+++ b/plugins/guile/plugin.c
@@ -32,8 +32,7 @@
#include <guile/gh.h>
#include <gnome.h>
-#include <goffice/app/go-plugin.h>
-#include <goffice/app/error-info.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
#include "expr.h"
#include "expr-impl.h"
diff --git a/plugins/html/boot.c b/plugins/html/boot.c
index c1d0a1a..1394349 100644
--- a/plugins/html/boot.c
+++ b/plugins/html/boot.c
@@ -25,7 +25,7 @@
#include "html.h"
#include "latex.h"
#include "roff.h"
-#include <goffice/app/file.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
GNM_PLUGIN_MODULE_HEADER;
diff --git a/plugins/html/boot.h b/plugins/html/boot.h
index cec8e90..38eb681 100644
--- a/plugins/html/boot.h
+++ b/plugins/html/boot.h
@@ -23,6 +23,6 @@
#define GNUMERIC_HTML_BOOT_H
#include "gnumeric.h"
-#include "goffice/app/go-plugin.h"
+#include <goffice/goffice.h>
#endif
diff --git a/plugins/html/html.c b/plugins/html/html.c
index d5dd7bb..b36339b 100644
--- a/plugins/html/html.c
+++ b/plugins/html/html.c
@@ -26,7 +26,7 @@
#include <gnumeric-config.h>
#include <gnumeric.h>
-#include <goffice/app/io-context.h>
+#include <goffice/goffice.h>
#include "workbook-view.h"
#include "workbook.h"
#include "sheet-style.h"
@@ -39,8 +39,6 @@
#include "value.h"
#include "font.h"
#include "cellspan.h"
-#include <goffice/app/error-info.h>
-#include <goffice/utils/go-format.h>
#include "style-border.h"
#include <rendered-value.h>
#include "style.h"
diff --git a/plugins/html/html.h b/plugins/html/html.h
index af09be7..e128c49 100644
--- a/plugins/html/html.h
+++ b/plugins/html/html.h
@@ -23,7 +23,7 @@
#define GNUMERIC_PLUGIN_HTML_H
#include "gnumeric.h"
-#include <goffice/app/file.h>
+#include <goffice/goffice.h>
void html32_file_save (GOFileSaver const *fs, IOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output);
diff --git a/plugins/html/html_read.c b/plugins/html/html_read.c
index c790d9e..93c829b 100644
--- a/plugins/html/html_read.c
+++ b/plugins/html/html_read.c
@@ -44,9 +44,7 @@
#include <hlink.h>
#include <cell.h>
#include <ranges.h>
-#include <goffice/app/io-context.h>
-#include <goffice/app/error-info.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-input.h>
#include <libxml/HTMLparser.h>
diff --git a/plugins/html/latex.c b/plugins/html/latex.c
index a2b86d7..bff7186 100644
--- a/plugins/html/latex.c
+++ b/plugins/html/latex.c
@@ -40,8 +40,7 @@
#include <gnumeric.h>
#include <gnumeric-gconf.h>
#include "latex.h"
-#include <goffice/app/io-context.h>
-#include <goffice/app/error-info.h>
+#include <goffice/goffice.h>
#include <workbook-view.h>
#include <workbook.h>
#include <sheet.h>
diff --git a/plugins/html/latex.h b/plugins/html/latex.h
index f2b5360..387f675 100644
--- a/plugins/html/latex.h
+++ b/plugins/html/latex.h
@@ -23,7 +23,7 @@
#define GNUMERIC_PLUGIN_LATEX_H
#include <gnumeric.h>
-#include <goffice/app/file.h>
+#include <goffice/goffice.h>
void latex_file_save (GOFileSaver const *fs, IOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output);
diff --git a/plugins/html/roff.c b/plugins/html/roff.c
index 3580972..03f1590 100644
--- a/plugins/html/roff.c
+++ b/plugins/html/roff.c
@@ -30,8 +30,7 @@
#include "font.h"
#include "cell.h"
#include "cellspan.h"
-#include <goffice/app/io-context.h>
-#include <goffice/app/error-info.h>
+#include <goffice/goffice.h>
#include <string.h>
#include <gsf/gsf-output.h>
diff --git a/plugins/lotus-123/boot.c b/plugins/lotus-123/boot.c
index c4b931b..b48d7fb 100644
--- a/plugins/lotus-123/boot.c
+++ b/plugins/lotus-123/boot.c
@@ -13,13 +13,10 @@
#include "lotus-formula.h"
#include "lotus-types.h"
-#include <goffice/app/file.h>
+#include <goffice/goffice.h>
#include <workbook-view.h>
-#include <goffice/app/go-plugin.h>
#include <gnm-plugin.h>
-#include <goffice/app/error-info.h>
#include <gutils.h>
-#include <goffice/app/io-context.h>
#include <gsf/gsf-input.h>
#include <gsf/gsf-utils.h>
diff --git a/plugins/mps/mps.c b/plugins/mps/mps.c
index b5bec8f..5f7e317 100644
--- a/plugins/mps/mps.c
+++ b/plugins/mps/mps.c
@@ -35,7 +35,7 @@
#include "cell.h"
#include "sheet.h"
#include "value.h"
-#include <goffice/app/io-context.h>
+#include <goffice/goffice.h>
#include "workbook-view.h"
#include "workbook.h"
#include <gnm-plugin.h>
@@ -47,9 +47,6 @@
#include "parse-util.h"
#include "func.h"
#include "expr.h"
-#include <goffice/app/file.h>
-#include <goffice/utils/go-format.h>
-#include <goffice/app/error-info.h>
#include <glib/gi18n-lib.h>
#include <sys/types.h>
#include <unistd.h>
diff --git a/plugins/mps/parser.c b/plugins/mps/parser.c
index 1fb6ae4..c631e64 100644
--- a/plugins/mps/parser.c
+++ b/plugins/mps/parser.c
@@ -28,7 +28,7 @@
#include "cell.h"
#include "sheet.h"
#include "value.h"
-#include <goffice/app/io-context.h>
+#include <goffice/goffice.h>
#include "workbook-view.h"
#include "workbook.h"
#include <goffice/app/module-plugin-defs.h>
@@ -38,8 +38,6 @@
#include "solver.h"
#include "sheet-style.h"
#include "parse-util.h"
-#include <goffice/app/file.h>
-#include <goffice/app/error-info.h>
#include <glib/gi18n-lib.h>
#include <sys/types.h>
#include <unistd.h>
diff --git a/plugins/numtheory/numtheory.c b/plugins/numtheory/numtheory.c
index 1855106..71f57ad 100644
--- a/plugins/numtheory/numtheory.c
+++ b/plugins/numtheory/numtheory.c
@@ -25,7 +25,7 @@
#include "func.h"
#include "value.h"
#include <gnm-i18n.h>
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
#include <limits.h>
diff --git a/plugins/oleo/boot.c b/plugins/oleo/boot.c
index 80b965c..6533e21 100644
--- a/plugins/oleo/boot.c
+++ b/plugins/oleo/boot.c
@@ -11,7 +11,7 @@
#include "oleo.h"
#include <workbook-view.h>
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
GNM_PLUGIN_MODULE_HEADER;
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index b5006a1..773a661 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -49,10 +49,7 @@
#include <xml-io.h>
#include <go-string.h>
-#include <goffice/app/io-context.h>
-#include <goffice/app/go-doc.h>
-#include <goffice/utils/go-units.h>
-#include <goffice/utils/datetime.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-libxml.h>
#include <gsf/gsf-input.h>
@@ -64,10 +61,6 @@
#include <gsf/gsf-utils.h>
#include <glib/gi18n-lib.h>
-#include <goffice/graph/gog-chart.h>
-#include <goffice/graph/gog-plot-impl.h>
-#include <goffice/data/go-data-simple.h>
-#include <goffice/utils/go-glib-extras.h>
#include <sheet-object-graph.h>
#include <sheet-object-image.h>
#include <graph.h>
diff --git a/plugins/openoffice/openoffice-write.c b/plugins/openoffice/openoffice-write.c
index dcd3fc0..b6990df 100644
--- a/plugins/openoffice/openoffice-write.c
+++ b/plugins/openoffice/openoffice-write.c
@@ -33,10 +33,7 @@
#include <gnumeric-config.h>
#include <gnumeric.h>
#include <workbook-view.h>
-#include <goffice/app/file.h>
-#include <goffice/app/io-context.h>
-#include <goffice/utils/go-format.h>
-#include <goffice/utils/go-units.h>
+#include <goffice/goffice.h>
#include <gnm-format.h>
#include <workbook.h>
#include <workbook-priv.h> /* Workbook::names */
@@ -67,7 +64,6 @@
#include <xml-io.h>
#include <go-string.h>
-#include <goffice/utils/go-glib-extras.h>
#include <gsf/gsf-libxml.h>
#include <gsf/gsf-output.h>
@@ -77,7 +73,6 @@
#include <gsf/gsf-opendoc-utils.h>
#include <gsf/gsf-doc-meta-data.h>
#include <gsf/gsf-meta-names.h>
-#include <goffice/utils/go-glib-extras.h>
#include <string.h>
#include <glib.h>
diff --git a/plugins/paradox/paradox.c b/plugins/paradox/paradox.c
index ae46bfa..f1a1bdf 100644
--- a/plugins/paradox/paradox.c
+++ b/plugins/paradox/paradox.c
@@ -20,11 +20,7 @@
#include <mstyle.h>
#include <sheet-style.h>
-#include <goffice/app/go-plugin.h>
-#include <goffice/app/io-context.h>
-#include <goffice/utils/datetime.h>
-#include <goffice/utils/go-format.h>
-#include <goffice/app/error-info.h>
+#include <goffice/goffice.h>
#include <string.h>
#include <unistd.h>
diff --git a/plugins/perl-loader/boot.c b/plugins/perl-loader/boot.c
index 1192e2f..c8e6f79 100644
--- a/plugins/perl-loader/boot.c
+++ b/plugins/perl-loader/boot.c
@@ -6,7 +6,7 @@
#include <gnumeric-config.h>
#include <gnumeric.h>
#include <glib.h>
-#include <goffice/app/error-info.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
#include "perl-loader.h"
diff --git a/plugins/perl-loader/perl-loader.c b/plugins/perl-loader/perl-loader.c
index d7d0a64..420215e 100644
--- a/plugins/perl-loader/perl-loader.c
+++ b/plugins/perl-loader/perl-loader.c
@@ -18,11 +18,7 @@
#include <expr-impl.h>
#include <gnm-plugin.h>
-#include <goffice/app/error-info.h>
-#include <goffice/app/go-plugin.h>
-#include <goffice/app/go-plugin-loader.h>
-#include <goffice/app/go-plugin-service.h>
-#include <goffice/app/io-context.h>
+#include <goffice/goffice.h>
#include <goffice/app/module-plugin-defs.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/plugins/plan-perfect/pln.c b/plugins/plan-perfect/pln.c
index bd8eebd..5a82539 100644
--- a/plugins/plan-perfect/pln.c
+++ b/plugins/plan-perfect/pln.c
@@ -9,9 +9,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
-#include <goffice/app/io-context.h>
#include <sheet.h>
#include <ranges.h>
#include <value.h>
@@ -23,8 +22,6 @@
#include <sheet-style.h>
#include <style.h>
#include <mstyle.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/app/error-info.h>
#include <gsf/gsf-utils.h>
#include <gsf/gsf-input.h>
diff --git a/plugins/plan-perfect/pln.h b/plugins/plan-perfect/pln.h
index 007c6d5..5fea418 100644
--- a/plugins/plan-perfect/pln.h
+++ b/plugins/plan-perfect/pln.h
@@ -11,7 +11,7 @@
#define GNUMERIC_PLN_H
#include "sheet.h"
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
PluginInitResult init_plugin (GOCmdContext *context, PluginData *pd);
diff --git a/plugins/psiconv/boot.c b/plugins/psiconv/boot.c
index 135924c..ba7bbe3 100644
--- a/plugins/psiconv/boot.c
+++ b/plugins/psiconv/boot.c
@@ -25,8 +25,7 @@
*/
#include <gnumeric-config.h>
#include <gnumeric.h>
-#include <goffice/app/io-context.h>
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
#include "psiconv-plugin.h"
#include "workbook-view.h"
diff --git a/plugins/psiconv/psiconv-plugin.h b/plugins/psiconv/psiconv-plugin.h
index 63e56dc..4c55dc5 100644
--- a/plugins/psiconv/psiconv-plugin.h
+++ b/plugins/psiconv/psiconv-plugin.h
@@ -2,7 +2,7 @@
#define PLUGIN_PSICONV_PLUGIN_H
#include "gnumeric.h"
-#include <goffice/app/io-context.h>
+#include <goffice/goffice.h>
#include <stdio.h>
#include <gsf/gsf-input.h>
diff --git a/plugins/psiconv/psiconv-read.c b/plugins/psiconv/psiconv-read.c
index d1d85e5..ad54581 100644
--- a/plugins/psiconv/psiconv-read.c
+++ b/plugins/psiconv/psiconv-read.c
@@ -42,10 +42,9 @@
#include "selection.h"
#include "position.h"
#include "ranges.h"
-#include <goffice/app/io-context.h>
+#include <goffice/goffice.h>
#include "workbook-view.h"
#include "workbook.h"
-#include <goffice/app/error-info.h>
#include <string.h>
#include <stdlib.h>
diff --git a/plugins/python-loader/boot.c b/plugins/python-loader/boot.c
index ed67f34..a64e723 100644
--- a/plugins/python-loader/boot.c
+++ b/plugins/python-loader/boot.c
@@ -10,7 +10,7 @@
#include "python-loader.h"
#include "py-console.h"
#include <gnm-plugin.h>
-#include <goffice/app/error-info.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
#include <glib.h>
diff --git a/plugins/python-loader/gnm-py-interpreter.c b/plugins/python-loader/gnm-py-interpreter.c
index 5a92019..931d0a0 100644
--- a/plugins/python-loader/gnm-py-interpreter.c
+++ b/plugins/python-loader/gnm-py-interpreter.c
@@ -13,7 +13,7 @@
#include "gnm-py-interpreter.h"
#include "gnm-python.h"
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include <goffice/app/module-plugin-defs.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
diff --git a/plugins/python-loader/gnm-python.c b/plugins/python-loader/gnm-python.c
index 6667113..24a4d33 100644
--- a/plugins/python-loader/gnm-python.c
+++ b/plugins/python-loader/gnm-python.c
@@ -11,10 +11,8 @@
#include "gnm-python.h"
#include "py-gnumeric.h"
-#include <goffice/app/go-plugin.h>
-#include <goffice/app/error-info.h>
+#include <goffice/goffice.h>
#include <goffice/app/module-plugin-defs.h>
-#include <goffice/utils/go-glib-extras.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
diff --git a/plugins/python-loader/py-command-line.c b/plugins/python-loader/py-command-line.c
index 48568bc..478adb1 100644
--- a/plugins/python-loader/py-command-line.c
+++ b/plugins/python-loader/py-command-line.c
@@ -10,7 +10,7 @@
#include "gnm-python.h"
#include <gnumeric.h>
#include <gutils.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <goffice/app/module-plugin-defs.h>
#include <gsf/gsf-impl-utils.h>
#include <glib-object.h>
diff --git a/plugins/python-loader/py-console.c b/plugins/python-loader/py-console.c
index 91e8f17..4f3c147 100644
--- a/plugins/python-loader/py-console.c
+++ b/plugins/python-loader/py-console.c
@@ -12,7 +12,7 @@
#include "py-command-line.h"
#include "py-console.h"
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include <goffice/app/module-plugin-defs.h>
#include <gtk/gtk.h>
diff --git a/plugins/python-loader/py-gnumeric.c b/plugins/python-loader/py-gnumeric.c
index edfe2e4..664c8bb 100644
--- a/plugins/python-loader/py-gnumeric.c
+++ b/plugins/python-loader/py-gnumeric.c
@@ -23,7 +23,7 @@
#include "py-gnumeric.h"
#include <go-string.h>
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include <glib/gi18n-lib.h>
diff --git a/plugins/python-loader/py-gnumeric.h b/plugins/python-loader/py-gnumeric.h
index b79a3a9..1635a74 100644
--- a/plugins/python-loader/py-gnumeric.h
+++ b/plugins/python-loader/py-gnumeric.h
@@ -3,7 +3,7 @@
#include <Python.h>
#include <glib.h>
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include "gnm-py-interpreter.h"
#include <gui-gnumeric.h>
diff --git a/plugins/python-loader/py-interpreter-selector.c b/plugins/python-loader/py-interpreter-selector.c
index 3180f55..690c376 100644
--- a/plugins/python-loader/py-interpreter-selector.c
+++ b/plugins/python-loader/py-interpreter-selector.c
@@ -7,7 +7,7 @@
*/
#include <gnumeric-config.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <gtk/gtk.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/plugins/python-loader/py-interpreter-selector.h b/plugins/python-loader/py-interpreter-selector.h
index 4cddb4f..e9eacc5 100644
--- a/plugins/python-loader/py-interpreter-selector.h
+++ b/plugins/python-loader/py-interpreter-selector.h
@@ -4,7 +4,7 @@
#include <glib.h>
#include <gtk/gtk.h>
#include <gnumeric.h>
-#include <goffice/app/error-info.h>
+#include <goffice/goffice.h>
#include "gnm-py-interpreter.h"
#define GNM_PY_INTERPRETER_SELECTOR_TYPE (gnm_py_interpreter_selector_get_type ())
diff --git a/plugins/python-loader/python-loader.c b/plugins/python-loader/python-loader.c
index 19fc020..fb91a6d 100644
--- a/plugins/python-loader/python-loader.c
+++ b/plugins/python-loader/python-loader.c
@@ -24,9 +24,7 @@
#include "expr-impl.h"
#include "func.h"
-#include <goffice/app/io-context.h>
-#include <goffice/app/go-plugin-service.h>
-#include <goffice/app/go-plugin-loader.h>
+#include <goffice/goffice.h>
#include <goffice/app/module-plugin-defs.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/plugins/qpro/qpro-read.c b/plugins/qpro/qpro-read.c
index 3f2de9a..dd84849 100644
--- a/plugins/qpro/qpro-read.c
+++ b/plugins/qpro/qpro-read.c
@@ -34,7 +34,7 @@
#include <gutils.h>
#include <func.h>
-#include <goffice/app/file.h>
+#include <goffice/goffice.h>
#include <workbook-view.h>
#include <workbook.h>
#include <sheet.h>
@@ -46,7 +46,6 @@
#include <style-color.h>
#include <parse-util.h>
#include <gnm-plugin.h>
-#include <goffice/app/io-context.h>
#include <gsf/gsf-utils.h>
#include <gsf/gsf-input.h>
diff --git a/plugins/sample_datasource/sample_datasource.c b/plugins/sample_datasource/sample_datasource.c
index e41c04a..d1c89a6 100644
--- a/plugins/sample_datasource/sample_datasource.c
+++ b/plugins/sample_datasource/sample_datasource.c
@@ -28,7 +28,7 @@
#include "workbook.h"
#include "sheet.h"
#include "gnm-i18n.h"
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
#include <sys/types.h>
diff --git a/plugins/sc/sc.c b/plugins/sc/sc.c
index 1e7f543..b544f9b 100644
--- a/plugins/sc/sc.c
+++ b/plugins/sc/sc.c
@@ -12,17 +12,13 @@
#include <string.h>
#include <errno.h>
#include <stdio.h>
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include <gnm-plugin.h>
-#include <goffice/app/io-context.h>
-#include <goffice/app/error-info.h>
-#include <goffice/utils/go-glib-extras.h>
#include "sheet-style.h"
#include "workbook-view.h"
#include "workbook.h"
#include "parse-util.h"
#include "value.h"
-#include <goffice/app/file.h>
#include "cell.h"
#include "style.h"
#include "sheet.h"
diff --git a/plugins/sylk/sylk-write.c b/plugins/sylk/sylk-write.c
index c7e905e..f28768e 100644
--- a/plugins/sylk/sylk-write.c
+++ b/plugins/sylk/sylk-write.c
@@ -33,7 +33,7 @@
#include "parse-util.h"
#include <go-string.h>
-#include <goffice/app/io-context.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-output.h>
#include <gsf/gsf-utils.h>
diff --git a/plugins/sylk/sylk.c b/plugins/sylk/sylk.c
index 6bec12c..6b622ee 100644
--- a/plugins/sylk/sylk.c
+++ b/plugins/sylk/sylk.c
@@ -15,8 +15,7 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include <goffice/app/file.h>
-#include <goffice/app/io-context.h>
+#include <goffice/goffice.h>
#include "workbook-view.h"
#include "workbook.h"
#include "cell.h"
@@ -32,8 +31,6 @@
#include "number-match.h"
#include "parse-util.h"
#include "gutils.h"
-#include <goffice/app/error-info.h>
-#include <goffice/app/go-plugin.h>
#include <gnm-plugin.h>
#include <string.h>
diff --git a/plugins/xbase/boot.c b/plugins/xbase/boot.c
index 0d69613..30dded9 100644
--- a/plugins/xbase/boot.c
+++ b/plugins/xbase/boot.c
@@ -17,10 +17,7 @@
#include <ranges.h>
#include <mstyle.h>
#include <sheet-style.h>
-#include <goffice/app/io-context.h>
-#include <goffice/app/go-plugin.h>
-#include <goffice/app/error-info.h>
-#include <goffice/utils/datetime.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-utils.h>
#include <gnm-plugin.h>
#include <glib/gi18n-lib.h>
diff --git a/plugins/xbase/xbase.c b/plugins/xbase/xbase.c
index 0242cb3..291daa7 100644
--- a/plugins/xbase/xbase.c
+++ b/plugins/xbase/xbase.c
@@ -8,8 +8,7 @@
#include <gnm-format.h>
#include <gutils.h>
#include <sheet.h>
-#include <goffice/app/io-context.h>
-#include <goffice/app/error-info.h>
+#include <goffice/goffice.h>
#include <string.h>
#include <stdio.h>
diff --git a/src/application.c b/src/application.c
index 7c422ca..3143131 100644
--- a/src/application.c
+++ b/src/application.c
@@ -27,9 +27,7 @@
#include "commands.h"
#include <gnumeric-gconf.h>
-#include <goffice/app/go-doc.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-file.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
#include <gtk/gtk.h>
diff --git a/src/auto-format.c b/src/auto-format.c
index 5ccbd6f..f84a048 100644
--- a/src/auto-format.c
+++ b/src/auto-format.c
@@ -21,7 +21,7 @@
#include "expr-impl.h"
#include "sheet.h"
#include "workbook.h"
-#include <goffice/utils/go-format.h>
+#include <goffice/goffice.h>
/* ------------------------------------------------------------------------- */
/*
diff --git a/src/cell-draw.c b/src/cell-draw.c
index 31cdb6f..74bf552 100644
--- a/src/cell-draw.c
+++ b/src/cell-draw.c
@@ -18,7 +18,7 @@
#include "rendered-value.h"
#include "parse-util.h"
#include "sheet-merge.h"
-#include <goffice/utils/go-color.h>
+#include <goffice/goffice.h>
#include <gdk/gdk.h>
#include <string.h>
diff --git a/src/cell.c b/src/cell.c
index 80f8785..fecf9a8 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -27,7 +27,7 @@
#include "parse-util.h"
#include <go-string.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
/**
* gnm_cell_cleanout :
diff --git a/src/clipboard.c b/src/clipboard.c
index 878cf73..6853e13 100644
--- a/src/clipboard.c
+++ b/src/clipboard.c
@@ -44,8 +44,7 @@
#include <glib/gi18n-lib.h>
#include <locale.h>
#include <string.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/datetime.h>
+#include <goffice/goffice.h>
#ifndef USE_CELL_COPY_POOLS
#define USE_CELL_COPY_POOLS 1
diff --git a/src/clipboard.h b/src/clipboard.h
index 72dcb23..eec9ae3 100644
--- a/src/clipboard.h
+++ b/src/clipboard.h
@@ -3,7 +3,7 @@
# define _GNM_CLIPBOARD_H_
#include "gnumeric.h"
-#include <goffice/utils/go-undo.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/collect.c b/src/collect.c
index 8ee60b3..3ae8d40 100644
--- a/src/collect.c
+++ b/src/collect.c
@@ -20,7 +20,7 @@
#include "sheet.h"
#include "ranges.h"
#include "number-match.h"
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/command-context-stderr.c b/src/command-context-stderr.c
index 212fd23..1e94a9e 100644
--- a/src/command-context-stderr.c
+++ b/src/command-context-stderr.c
@@ -12,8 +12,7 @@
#include "gnumeric.h"
#include "command-context-stderr.h"
#include <gsf/gsf-impl-utils.h>
-#include <goffice/app/error-info.h>
-#include <goffice/app/go-cmd-context-impl.h>
+#include <goffice/goffice.h>
#include "ranges.h"
struct _CmdContextStderr {
diff --git a/src/command-context.h b/src/command-context.h
index cc2806b..899a738 100644
--- a/src/command-context.h
+++ b/src/command-context.h
@@ -3,7 +3,7 @@
# define _GNM_COMMAND_CONTEXT_H_
#include "gnumeric.h"
-#include <goffice/app/go-cmd-context.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/commands.c b/src/commands.c
index f85da6f..ac90ed0 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -73,9 +73,7 @@
#include "tools/tabulate.h"
#include <go-string.h>
-#include <goffice/graph/gog-graph.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-pango-extras.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-doc-meta-data.h>
#include <string.h>
diff --git a/src/dependent.c b/src/dependent.c
index 278386d..69a718c 100644
--- a/src/dependent.c
+++ b/src/dependent.c
@@ -38,7 +38,7 @@
#include "sheet-view.h"
#include <go-string.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <string.h>
static void dependent_changed (GnmDependent *dep);
diff --git a/src/dependent.h b/src/dependent.h
index 99d2698..15df750 100644
--- a/src/dependent.h
+++ b/src/dependent.h
@@ -3,8 +3,7 @@
# define _GNM_DEPENDENT_H_
#include "gnumeric.h"
-#include <goffice/utils/goffice-utils.h>
-#include <goffice/utils/go-undo.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/dialogs/dialog-about.c b/src/dialogs/dialog-about.c
index 985c2d5..d555746 100644
--- a/src/dialogs/dialog-about.c
+++ b/src/dialogs/dialog-about.c
@@ -27,17 +27,7 @@
#include <gui-util.h>
#include <mathfunc.h>
#include <goffice/cut-n-paste/foocanvas/foo-canvas.h>
-#include <goffice/graph/gog-object.h>
-#include <goffice/graph/gog-styled-object.h>
-#include <goffice/graph/gog-graph.h>
-#include <goffice/graph/gog-chart.h>
-#include <goffice/graph/gog-plot.h>
-#include <goffice/graph/gog-series.h>
-#include <goffice/graph/gog-data-set.h>
-#include <goffice/graph/gog-control-foocanvas.h>
-#include <goffice/data/go-data-simple.h>
-#include <goffice/utils/go-color.h>
-#include <goffice/utils/go-style.h>
+#include <goffice/goffice.h>
#include <gtk/gtk.h>
#define ABOUT_KEY "about-dialog"
diff --git a/src/dialogs/dialog-autocorrect.c b/src/dialogs/dialog-autocorrect.c
index 2b07eac..ddaa91f 100644
--- a/src/dialogs/dialog-autocorrect.c
+++ b/src/dialogs/dialog-autocorrect.c
@@ -42,7 +42,7 @@
#include <glade/glade.h>
#include <gsf/gsf-impl-utils.h>
#include <gtk/gtk.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <string.h>
#include "help.h"
diff --git a/src/dialogs/dialog-autosave.c b/src/dialogs/dialog-autosave.c
index 75df283..3d34639 100644
--- a/src/dialogs/dialog-autosave.c
+++ b/src/dialogs/dialog-autosave.c
@@ -31,7 +31,7 @@
#include <wbc-gtk.h>
#include <gui-util.h>
-#include <goffice/app/go-doc.h>
+#include <goffice/goffice.h>
#include <glib/gi18n-lib.h>
#include <glade/glade.h>
diff --git a/src/dialogs/dialog-cell-format.c b/src/dialogs/dialog-cell-format.c
index 1bb4469..1dbb37b 100644
--- a/src/dialogs/dialog-cell-format.c
+++ b/src/dialogs/dialog-cell-format.c
@@ -54,12 +54,7 @@
#include <widgets/gnm-format-sel.h>
#include <go-string.h>
-#include <goffice/gtk/go-combo-color.h>
-#include <goffice/gtk/go-combo-box.h>
-#include <goffice/gtk/go-combo-text.h>
-#include <goffice/gtk/go-rotation-sel.h>
-#include <goffice/utils/go-font.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <goffice/cut-n-paste/foocanvas/foo-canvas-util.h>
#include <goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h>
#include <glade/glade.h>
diff --git a/src/dialogs/dialog-cell-sort.c b/src/dialogs/dialog-cell-sort.c
index eec7cc8..a38937c 100644
--- a/src/dialogs/dialog-cell-sort.c
+++ b/src/dialogs/dialog-cell-sort.c
@@ -50,7 +50,7 @@
#include <gtk/gtk.h>
#include <gsf/gsf-impl-utils.h>
#include <gdk/gdkkeysyms.h>
-#include <goffice/gtk/go-locale-sel.h>
+#include <goffice/goffice.h>
#define CELL_SORT_KEY "cell-sort-dialog"
diff --git a/src/dialogs/dialog-doc-metadata.c b/src/dialogs/dialog-doc-metadata.c
index 84e61c5..0b5ac4e 100644
--- a/src/dialogs/dialog-doc-metadata.c
+++ b/src/dialogs/dialog-doc-metadata.c
@@ -37,8 +37,7 @@
#include <gsf/gsf-timestamp.h>
#include <gsf/gsf-docprop-vector.h>
-#include <goffice/app/go-doc.h>
-#include <goffice/utils/go-file.h>
+#include <goffice/goffice.h>
#include <glade/glade.h>
#include <gtk/gtk.h>
diff --git a/src/dialogs/dialog-formula-guru.c b/src/dialogs/dialog-formula-guru.c
index 5f236e7..6511a6a 100644
--- a/src/dialogs/dialog-formula-guru.c
+++ b/src/dialogs/dialog-formula-guru.c
@@ -41,7 +41,7 @@
#include <expr-impl.h>
#include <func.h>
#include <gnm-format.h>
-#include <goffice/utils/go-locale.h>
+#include <goffice/goffice.h>
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnumeric-cell-renderer-expr-entry.h>
diff --git a/src/dialogs/dialog-hyperlink.c b/src/dialogs/dialog-hyperlink.c
index fe3b7a8..fddb45d 100644
--- a/src/dialogs/dialog-hyperlink.c
+++ b/src/dialogs/dialog-hyperlink.c
@@ -37,7 +37,7 @@
#include <sheet-style.h>
#include <value.h>
#include <wbc-gtk.h>
-#include <goffice/utils/go-file.h>
+#include <goffice/goffice.h>
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
diff --git a/src/dialogs/dialog-plugin-manager.c b/src/dialogs/dialog-plugin-manager.c
index 56af425..76c8772 100644
--- a/src/dialogs/dialog-plugin-manager.c
+++ b/src/dialogs/dialog-plugin-manager.c
@@ -36,12 +36,7 @@
#include <gutils.h>
#include <gui-util.h>
-#include <goffice/app/go-plugin.h>
-#include <goffice/app/go-plugin-service.h>
-#include <goffice/app/go-cmd-context.h>
-#include <goffice/app/error-info.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/gtk/goffice-gtk.h>
+#include <goffice/goffice.h>
#include <glade/glade.h>
#include <gtk/gtk.h>
diff --git a/src/dialogs/dialog-printer-setup.c b/src/dialogs/dialog-printer-setup.c
index c389d0a..1253613 100644
--- a/src/dialogs/dialog-printer-setup.c
+++ b/src/dialogs/dialog-printer-setup.c
@@ -47,9 +47,7 @@
#include <goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h>
#include <glade/glade.h>
#include <gdk/gdkkeysyms.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-format.h>
-#include <goffice/gtk/go-format-sel.h>
+#include <goffice/goffice.h>
#include <string.h>
/* FIXME: do not hardcode pixel counts. */
diff --git a/src/dialogs/dialog-quit.c b/src/dialogs/dialog-quit.c
index f22cb85..5f9c16b 100644
--- a/src/dialogs/dialog-quit.c
+++ b/src/dialogs/dialog-quit.c
@@ -30,9 +30,7 @@
#include <gui-clipboard.h>
#include <application.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-file.h>
-#include <goffice/app/go-doc.h>
+#include <goffice/goffice.h>
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
diff --git a/src/dialogs/dialog-recent.c b/src/dialogs/dialog-recent.c
index 2ad3950..0c1b4e7 100644
--- a/src/dialogs/dialog-recent.c
+++ b/src/dialogs/dialog-recent.c
@@ -28,7 +28,7 @@
#include <gui-file.h>
#include <gtk/gtk.h>
#include <string.h>
-#include <goffice/gtk/goffice-gtk.h>
+#include <goffice/goffice.h>
/* ------------------------------------------------------------------------- */
diff --git a/src/dialogs/dialog-scenarios.c b/src/dialogs/dialog-scenarios.c
index 95cb0eb..3571e81 100644
--- a/src/dialogs/dialog-scenarios.c
+++ b/src/dialogs/dialog-scenarios.c
@@ -41,7 +41,7 @@
#include <glade/glade.h>
#include <gtk/gtk.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <string.h>
typedef struct {
diff --git a/src/dialogs/dialog-search-replace.c b/src/dialogs/dialog-search-replace.c
index 21595cc..8ec3354 100644
--- a/src/dialogs/dialog-search-replace.c
+++ b/src/dialogs/dialog-search-replace.c
@@ -33,7 +33,7 @@
#include <selection.h>
#include <glade/glade.h>
-#include <goffice/gtk/goffice-gtk.h>
+#include <goffice/goffice.h>
#include <gtk/gtk.h>
#include <string.h>
diff --git a/src/dialogs/dialog-sheet-order.c b/src/dialogs/dialog-sheet-order.c
index 6375d4f..054067f 100644
--- a/src/dialogs/dialog-sheet-order.c
+++ b/src/dialogs/dialog-sheet-order.c
@@ -45,8 +45,7 @@
#include <application.h>
#include <widgets/gnumeric-cell-renderer-text.h>
#include <widgets/gnumeric-cell-renderer-toggle.h>
-#include <goffice/gtk/go-combo-box.h>
-#include <goffice/gtk/go-combo-color.h>
+#include <goffice/goffice.h>
#include <glade/glade.h>
#include <gtk/gtk.h>
diff --git a/src/dialogs/dialog-so-styled.c b/src/dialogs/dialog-so-styled.c
index 3825b7b..8cadb0b 100644
--- a/src/dialogs/dialog-so-styled.c
+++ b/src/dialogs/dialog-so-styled.c
@@ -31,8 +31,7 @@
#include "wbc-gtk.h"
#include "commands.h"
#include "sheet-object.h"
-#include <goffice/app/go-cmd-context.h>
-#include <goffice/utils/go-style.h>
+#include <goffice/goffice.h>
#include <gtk/gtk.h>
#include <widgets/gnumeric-text-view.h>
diff --git a/src/dialogs/dialog-solver.c b/src/dialogs/dialog-solver.c
index 3c05572..50c01be 100644
--- a/src/dialogs/dialog-solver.c
+++ b/src/dialogs/dialog-solver.c
@@ -44,7 +44,7 @@
#include <glade/glade.h>
#include <gtk/gtk.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <string.h>
#include <scenarios.h>
diff --git a/src/dialogs/dialog-stf-csv-page.c b/src/dialogs/dialog-stf-csv-page.c
index b68025a..636f7e3 100644
--- a/src/dialogs/dialog-stf-csv-page.c
+++ b/src/dialogs/dialog-stf-csv-page.c
@@ -22,7 +22,7 @@
#include <gnumeric-config.h>
#include "dialog-stf.h"
#include "gnm-format.h"
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <string.h>
/*************************************************************************************************
diff --git a/src/dialogs/dialog-stf-export.c b/src/dialogs/dialog-stf-export.c
index b373897..edf9936 100644
--- a/src/dialogs/dialog-stf-export.c
+++ b/src/dialogs/dialog-stf-export.c
@@ -30,8 +30,7 @@
#include <wbc-gtk.h>
#include <sheet.h>
#include <gui-util.h>
-#include <goffice/gtk/go-charmap-sel.h>
-#include <goffice/gtk/go-locale-sel.h>
+#include <goffice/goffice.h>
#include <gtk/gtk.h>
#include <glib/gi18n-lib.h>
diff --git a/src/dialogs/dialog-stf-main-page.c b/src/dialogs/dialog-stf-main-page.c
index 6ea9ab6..f58ca0f 100644
--- a/src/dialogs/dialog-stf-main-page.c
+++ b/src/dialogs/dialog-stf-main-page.c
@@ -28,7 +28,7 @@
#include <sheet.h>
#include <workbook.h>
#include <gtk/gtk.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <string.h>
/*************************************************************************************************
diff --git a/src/dialogs/dialog-stf.h b/src/dialogs/dialog-stf.h
index a1b5f55..75e77d0 100644
--- a/src/dialogs/dialog-stf.h
+++ b/src/dialogs/dialog-stf.h
@@ -4,9 +4,7 @@
#include "dialog-stf-preview.h"
#include "gui-util.h"
#include <stf-parse.h>
-#include <goffice/gtk/go-charmap-sel.h>
-#include <goffice/gtk/go-locale-sel.h>
-#include <goffice/gtk/go-format-sel.h>
+#include <goffice/goffice.h>
#include <gtk/gtk.h>
diff --git a/src/dialogs/dialogs.h b/src/dialogs/dialogs.h
index e06b939..6c9fa9b 100644
--- a/src/dialogs/dialogs.h
+++ b/src/dialogs/dialogs.h
@@ -3,7 +3,7 @@
#include "gui-gnumeric.h"
#include "consolidate.h"
-#include <goffice/utils/go-style.h>
+#include <goffice/goffice.h>
typedef enum {
FD_CURRENT = -1,
diff --git a/src/expr-name.c b/src/expr-name.c
index 10b7190..f0063ae 100644
--- a/src/expr-name.c
+++ b/src/expr-name.c
@@ -26,8 +26,7 @@
#include "sheet-style.h"
#include <go-string.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-locale.h>
+#include <goffice/goffice.h>
/**
* expr_name_validate:
diff --git a/src/expr-name.h b/src/expr-name.h
index a2d1576..027ea4d 100644
--- a/src/expr-name.h
+++ b/src/expr-name.h
@@ -6,7 +6,7 @@
#include "expr.h"
#include "func.h"
#include "parse-util.h"
-#include <goffice/utils/go-undo.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/expr.c b/src/expr.c
index 98fa297..603cd09 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -42,9 +42,7 @@
#include "mathfunc.h"
#include <go-string.h>
-#include <goffice/utils/go-locale.h>
-#include <goffice/utils/go-format.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <math.h>
#include <string.h>
#include <stdlib.h>
diff --git a/src/file-autoft.c b/src/file-autoft.c
index 8bc3dae..084721b 100644
--- a/src/file-autoft.c
+++ b/src/file-autoft.c
@@ -32,8 +32,7 @@
#include "gnumeric-gconf.h"
#include <gsf/gsf-impl-utils.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-libxml-extras.h>
+#include <goffice/goffice.h>
#include <sys/types.h>
#include <string.h>
diff --git a/src/format-template.c b/src/format-template.c
index 6b67f11..067228c 100644
--- a/src/format-template.c
+++ b/src/format-template.c
@@ -32,10 +32,8 @@
#include "command-context.h"
#include "ranges.h"
#include "xml-io.h"
-#include <goffice/app/io-context.h>
+#include <goffice/goffice.h>
#include <string.h>
-#include <goffice/utils/go-libxml-extras.h>
-#include <goffice/utils/go-glib-extras.h>
#include <libxml/parser.h>
#define CC2XML(s) ((xmlChar const *)(s))
diff --git a/src/func.c b/src/func.c
index 06922c7..4984b5c 100644
--- a/src/func.c
+++ b/src/func.c
@@ -29,7 +29,7 @@
#include "func-builtin.h"
#include <go-string.h>
-#include <goffice/utils/go-locale.h>
+#include <goffice/goffice.h>
#include <glib.h>
#include <string.h>
#include <stdlib.h>
diff --git a/src/gnm-data-cache-source.h b/src/gnm-data-cache-source.h
index 558cf27..c5f7afb 100644
--- a/src/gnm-data-cache-source.h
+++ b/src/gnm-data-cache-source.h
@@ -21,7 +21,7 @@
#ifndef GNM_DATA_CACHE_SOURCE_H
#define GNM_DATA_CACHE_SOURCE_H
-#include <goffice/data/goffice-data.h>
+#include <goffice/goffice.h>
#include <glib-object.h>
#include <gnumeric.h>
diff --git a/src/gnm-datetime.c b/src/gnm-datetime.c
index 3fdb4c8..10999da 100644
--- a/src/gnm-datetime.c
+++ b/src/gnm-datetime.c
@@ -24,7 +24,7 @@
* USA
*/
#include <gnumeric-config.h>
-#include <goffice/utils/go-format.h>
+#include <goffice/goffice.h>
#include "value.h"
#include <string.h>
#include "gnm-datetime.h"
diff --git a/src/gnm-datetime.h b/src/gnm-datetime.h
index 2ecad3d..6d8de9e 100644
--- a/src/gnm-datetime.h
+++ b/src/gnm-datetime.h
@@ -4,7 +4,7 @@
#include "gnumeric.h"
#include "numbers.h"
-#include <goffice/utils/datetime.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/gnm-format.c b/src/gnm-format.c
index 1ac021e..9e267dd 100644
--- a/src/gnm-format.c
+++ b/src/gnm-format.c
@@ -28,9 +28,7 @@
#include "value.h"
#include "cell.h"
-#include <goffice/utils/go-font.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-locale.h>
+#include <goffice/goffice.h>
#include <glib/gi18n-lib.h>
#include <string.h>
#include <style-font.h>
diff --git a/src/gnm-format.h b/src/gnm-format.h
index a408030..9b109dc 100644
--- a/src/gnm-format.h
+++ b/src/gnm-format.h
@@ -3,7 +3,7 @@
# define _GNM_FORMAT_H_
#include "gnumeric.h"
-#include <goffice/utils/go-format.h>
+#include <goffice/goffice.h>
#include <pango/pango.h>
G_BEGIN_DECLS
diff --git a/src/gnm-graph-window.c b/src/gnm-graph-window.c
index 696f94b..f154da9 100644
--- a/src/gnm-graph-window.c
+++ b/src/gnm-graph-window.c
@@ -7,7 +7,7 @@
#include <glib/gi18n-lib.h>
-#include <goffice/gtk/go-graph-widget.h>
+#include <goffice/goffice.h>
#define ZOOM_IN(x) *x = CLAMP(*x+1, ZOOM_LEVEL_25, ZOOM_LEVEL_200)
#define ZOOM_OUT(x) *x = CLAMP(*x-1, ZOOM_LEVEL_25, ZOOM_LEVEL_200)
diff --git a/src/gnm-graph-window.h b/src/gnm-graph-window.h
index 5918854..fa006ae 100644
--- a/src/gnm-graph-window.h
+++ b/src/gnm-graph-window.h
@@ -3,7 +3,7 @@
# define _GNM_GRAPH_WINDOW_H_
#include <gtk/gtk.h>
-#include <goffice/graph/gog-graph.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/gnm-pane.c b/src/gnm-pane.c
index d4ebafc..9c19889 100644
--- a/src/gnm-pane.c
+++ b/src/gnm-pane.c
@@ -40,10 +40,7 @@
#include "item-edit.h"
#include "item-grid.h"
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-format.h>
-#include <goffice/utils/go-locale.h>
-#include <goffice/utils/go-geometry.h>
+#include <goffice/goffice.h>
#include <goffice/cut-n-paste/foocanvas/foo-canvas-line.h>
#include <goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/src/gnm-plugin.c b/src/gnm-plugin.c
index 99e316a..6a248fc 100644
--- a/src/gnm-plugin.c
+++ b/src/gnm-plugin.c
@@ -13,12 +13,7 @@
#include "gnumeric-gconf.h"
#include "application.h"
-#include <goffice/app/go-cmd-context.h>
-#include <goffice/app/go-plugin-service.h>
-#include <goffice/app/go-plugin-service-impl.h>
-#include <goffice/app/error-info.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-libxml-extras.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
#include <string.h>
@@ -437,8 +432,6 @@ GSF_CLASS (PluginServiceUI, plugin_service_ui,
/****************************************************************************/
-#include <goffice/app/go-plugin-loader.h>
-#include <goffice/app/go-plugin-loader-module.h>
typedef GOPluginLoaderModule GnmPluginLoaderModule;
typedef GOPluginLoaderModuleClass GnmPluginLoaderModuleClass;
diff --git a/src/gnm-plugin.h b/src/gnm-plugin.h
index 23d8174..6c928f8 100644
--- a/src/gnm-plugin.h
+++ b/src/gnm-plugin.h
@@ -3,8 +3,7 @@
# define _GNM_PLUGIN_H_
#include <gnumeric.h>
-#include <goffice/app/goffice-app.h>
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include <goffice/app/module-plugin-defs.h>
#include <gmodule.h>
#include <libxml/tree.h>
diff --git a/src/gnm-so-filled.c b/src/gnm-so-filled.c
index 386a871..a5a995c 100644
--- a/src/gnm-so-filled.c
+++ b/src/gnm-so-filled.c
@@ -26,11 +26,7 @@
#include "sheet-object-impl.h"
#include "xml-io.h"
-#include <goffice/utils/go-libxml-extras.h>
-#include <goffice/utils/go-color.h>
-#include <goffice/utils/go-persist.h>
-#include <goffice/utils/go-style.h>
-#include <goffice/utils/go-format.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
#include <string.h>
diff --git a/src/gnm-so-line.c b/src/gnm-so-line.c
index 948d503..ba2b744 100644
--- a/src/gnm-so-line.c
+++ b/src/gnm-so-line.c
@@ -26,10 +26,7 @@
#include "sheet-object-impl.h"
#include "xml-io.h"
-#include <goffice/utils/go-libxml-extras.h>
-#include <goffice/utils/go-color.h>
-#include <goffice/utils/go-persist.h>
-#include <goffice/utils/go-style.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
#include <string.h>
@@ -149,7 +146,6 @@ sol_default_style (void)
#include <dialogs/dialogs.h>
#include <gnumeric-simple-canvas.h>
#include <gnm-pane.h>
-#include <goffice/utils/go-color.h>
static void
gnm_so_line_user_config (SheetObject *so, SheetControl *sc)
diff --git a/src/gnm-so-polygon.c b/src/gnm-so-polygon.c
index 97d77cc..c3ff85b 100644
--- a/src/gnm-so-polygon.c
+++ b/src/gnm-so-polygon.c
@@ -27,10 +27,7 @@
#include "xml-io.h"
#include "parse-util.h"
-#include <goffice/utils/go-persist.h>
-#include <goffice/utils/go-libxml-extras.h>
-#include <goffice/utils/go-color.h>
-#include <goffice/utils/go-style.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
#include <string.h>
diff --git a/src/gnm-style-impl.h b/src/gnm-style-impl.h
index be0f476..9201d46 100644
--- a/src/gnm-style-impl.h
+++ b/src/gnm-style-impl.h
@@ -7,7 +7,7 @@
#include "style-font.h"
#include "validation.h"
#include "pattern.h"
-#include <goffice/utils/go-format.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/gnumeric-gconf.c b/src/gnumeric-gconf.c
index 6bb446a..c6aa988 100644
--- a/src/gnumeric-gconf.c
+++ b/src/gnumeric-gconf.c
@@ -32,9 +32,7 @@
#include "gnumeric-gconf-priv.h"
#include "gutils.h"
#include "mstyle.h"
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-format.h>
-#include <goffice/utils/go-locale.h>
+#include <goffice/goffice.h>
#include <value.h>
#include <number-match.h>
#include <string.h>
diff --git a/src/gnumeric-gconf.h b/src/gnumeric-gconf.h
index 34c2806..eea7a8d 100644
--- a/src/gnumeric-gconf.h
+++ b/src/gnumeric-gconf.h
@@ -7,8 +7,7 @@
#include <glib-object.h>
#include <print-info.h>
#include <libgnumeric.h>
-#include <goffice/app/go-conf.h>
-#include <goffice/utils/go-geometry.h>
+#include <goffice/goffice.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS
diff --git a/src/gnumeric.h b/src/gnumeric.h
index 5b11712..a4819e8 100644
--- a/src/gnumeric.h
+++ b/src/gnumeric.h
@@ -3,8 +3,7 @@
# define _GNM_GNUMERIC_H_
#include <glib.h>
-#include <goffice/app/goffice-app.h>
-#include <goffice/utils/goffice-utils.h>
+#include <goffice/goffice.h>
#include "goffice-utils.h" /* merge into real file when go-string moves */
G_BEGIN_DECLS
diff --git a/src/go-data-cache-field.h b/src/go-data-cache-field.h
index 72be129..63e4e5a 100644
--- a/src/go-data-cache-field.h
+++ b/src/go-data-cache-field.h
@@ -22,7 +22,7 @@
#define GO_DATA_CACHE_FIELD_H
#include "goffice-data.h" /* remove after move to goffice */
-#include <goffice/data/goffice-data.h>
+#include <goffice/goffice.h>
#include <glib-object.h>
#include <go-val.h>
diff --git a/src/go-data-cache-source.c b/src/go-data-cache-source.c
index 26e9884..ee63f8b 100644
--- a/src/go-data-cache-source.c
+++ b/src/go-data-cache-source.c
@@ -19,7 +19,7 @@
* USA
*/
-//#include <goffice/goffice-config.h>
+#include <goffice/goffice.h>
#include <gnumeric-config.h>
#include "go-data-cache-source.h"
diff --git a/src/go-data-cache-source.h b/src/go-data-cache-source.h
index 87011ce..1bec112 100644
--- a/src/go-data-cache-source.h
+++ b/src/go-data-cache-source.h
@@ -22,7 +22,7 @@
#define GO_DATA_CACHE_SOURCE_H
#include "goffice-data.h" /* remove after move to goffice */
-#include <goffice/data/goffice-data.h>
+#include <goffice/goffice.h>
#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/src/go-data-cache.h b/src/go-data-cache.h
index b7f42f5..eba5bd6 100644
--- a/src/go-data-cache.h
+++ b/src/go-data-cache.h
@@ -22,7 +22,7 @@
#define GO_DATA_CACHE_H
#include "goffice-data.h" /* remove after move to goffice */
-#include <goffice/data/goffice-data.h>
+#include <goffice/goffice.h>
#include <go-val.h>
#include <glib-object.h>
diff --git a/src/go-data-slicer-field.h b/src/go-data-slicer-field.h
index a2e6d7d..8d6850a 100644
--- a/src/go-data-slicer-field.h
+++ b/src/go-data-slicer-field.h
@@ -22,7 +22,7 @@
#define GO_DATA_SLICER_FIELD_H
#include "goffice-data.h" /* remove after move to goffice */
-#include <goffice/data/goffice-data.h>
+#include <goffice/goffice.h>
#include <go-string.h>
#include <glib-object.h>
diff --git a/src/go-string.c b/src/go-string.c
index d9360b5..1b62e0a 100644
--- a/src/go-string.c
+++ b/src/go-string.c
@@ -23,8 +23,7 @@
#include "gnumeric.h"
#include "go-string.h"
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-pango-extras.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-utils.h>
#include <string.h>
diff --git a/src/go-val.c b/src/go-val.c
index d822f45..b39d9d4 100644
--- a/src/go-val.c
+++ b/src/go-val.c
@@ -23,8 +23,7 @@
#include "go-val.h"
#include "gnm-datetime.h"
-#include <goffice/app/go-cmd-context.h>
-#include <goffice/utils/datetime.h>
+#include <goffice/goffice.h>
#include <glib/gi18n-lib.h>
#include <string.h>
diff --git a/src/graph.c b/src/graph.c
index 4c3d051..878e012 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -35,9 +35,7 @@
#include "ranges.h"
#include "parse-util.h"
#include <go-string.h>
-#include <goffice/data/go-data-impl.h>
-#include <goffice/math/go-math.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include <string.h>
diff --git a/src/graph.h b/src/graph.h
index 57118f7..6b7aef9 100644
--- a/src/graph.h
+++ b/src/graph.h
@@ -4,8 +4,7 @@
#include "gnumeric.h"
#include "sheet-object.h"
-#include <goffice/graph/goffice-graph.h>
-#include <goffice/data/goffice-data.h>
+#include <goffice/goffice.h>
#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/src/gui-clipboard.c b/src/gui-clipboard.c
index 56db7fe..23a0d62 100644
--- a/src/gui-clipboard.c
+++ b/src/gui-clipboard.c
@@ -36,7 +36,7 @@
#include "xml-sax.h"
#include "xml-io.h"
-#include <goffice/app/io-context.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-input-memory.h>
#include <gsf/gsf-output-memory.h>
#include <glib/gi18n-lib.h>
diff --git a/src/gui-file.c b/src/gui-file.c
index fb954b5..73d88d0 100644
--- a/src/gui-file.c
+++ b/src/gui-file.c
@@ -26,10 +26,7 @@
#include "gnumeric-gconf.h"
#include "application.h"
-#include <goffice/gtk/go-charmap-sel.h>
-#include <goffice/app/io-context.h>
-#include <goffice/app/go-doc.h>
-#include <goffice/utils/go-file.h>
+#include <goffice/goffice.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
diff --git a/src/gui-util.c b/src/gui-util.c
index 25e56e7..bb3f7a5 100644
--- a/src/gui-util.c
+++ b/src/gui-util.c
@@ -25,10 +25,7 @@
#include "wbc-gtk.h"
#include "widgets/gnumeric-expr-entry.h"
-#include <goffice/app/error-info.h>
-#include <goffice/gtk/go-combo-color.h>
-#include <goffice/gtk/goffice-gtk.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <glade/glade.h>
#include <gtk/gtk.h>
#include <atk/atkrelation.h>
diff --git a/src/gui-util.h b/src/gui-util.h
index 01e80d8..30ba476 100644
--- a/src/gui-util.h
+++ b/src/gui-util.h
@@ -6,9 +6,8 @@
#include "command-context.h"
#include "gutils.h"
-#include <goffice/app/error-info.h>
+#include <goffice/goffice.h>
#include "numbers.h"
-#include <goffice/gtk/goffice-gtk.h>
#include <gtk/gtk.h>
#include <glade/glade-xml.h>
diff --git a/src/gutils.c b/src/gutils.c
index f3c7fc6..db157e7 100644
--- a/src/gutils.c
+++ b/src/gutils.c
@@ -17,9 +17,7 @@
#include "ranges.h"
#include "mathfunc.h"
-#include <goffice/utils/go-format.h>
-#include <goffice/utils/go-locale.h>
-#include <goffice/utils/go-file.h>
+#include <goffice/goffice.h>
#include <stdlib.h>
#include <math.h>
diff --git a/src/gutils.h b/src/gutils.h
index 3c02ba2..c7d7e7e 100644
--- a/src/gutils.h
+++ b/src/gutils.h
@@ -3,7 +3,7 @@
# define _GNM_GUTILS_H_
#include "gnumeric.h"
-#include <goffice/utils/regutf8.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/history.c b/src/history.c
index 1db33c3..934f7bf 100644
--- a/src/history.c
+++ b/src/history.c
@@ -7,7 +7,7 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include <goffice/utils/go-file.h>
+#include <goffice/goffice.h>
#include "gnumeric.h"
#include "history.h"
#include <string.h>
diff --git a/src/hlink.c b/src/hlink.c
index 052dd69..f8c235b 100644
--- a/src/hlink.c
+++ b/src/hlink.c
@@ -37,7 +37,7 @@
#include "value.h"
#include "mstyle.h"
-#include <goffice/utils/go-file.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#define GET_CLASS(instance) G_TYPE_INSTANCE_GET_CLASS (instance, GNM_HLINK_TYPE, GnmHLinkClass)
diff --git a/src/io-context-gtk.c b/src/io-context-gtk.c
index 43e2bdf..2bbd3c2 100644
--- a/src/io-context-gtk.c
+++ b/src/io-context-gtk.c
@@ -14,7 +14,7 @@
#include "gnumeric.h"
#include "gui-util.h"
#include "io-context-gtk.h"
-#include <goffice/app/io-context-priv.h>
+#include <goffice/goffice.h>
#include "application.h"
#include "libgnumeric.h"
#include "dialogs.h"
diff --git a/src/io-context-gtk.h b/src/io-context-gtk.h
index 32ef9ad..3148666 100644
--- a/src/io-context-gtk.h
+++ b/src/io-context-gtk.h
@@ -5,7 +5,7 @@
#include <stdarg.h>
#include "gui-gnumeric.h"
#include <gtk/gtk.h>
-#include <goffice/app/io-context.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/item-cursor.c b/src/item-cursor.c
index 27206f3..ba82db0 100644
--- a/src/item-cursor.c
+++ b/src/item-cursor.c
@@ -34,7 +34,7 @@
#include "sheet-autofill.h"
#include <gsf/gsf-impl-utils.h>
#include <gtk/gtk.h>
-#include <goffice/app/go-cmd-context-impl.h>
+#include <goffice/goffice.h>
#define GNUMERIC_ITEM "CURSOR"
#include "item-debug.h"
diff --git a/src/item-edit.c b/src/item-edit.c
index b2487bf..274c545 100644
--- a/src/item-edit.c
+++ b/src/item-edit.c
@@ -41,7 +41,7 @@
#include <goffice/cut-n-paste/foocanvas/foo-canvas.h>
#include <gsf/gsf-impl-utils.h>
#include <string.h>
-#include <goffice/utils/go-font.h>
+#include <goffice/goffice.h>
static FooCanvasItemClass *parent_class;
diff --git a/src/libgnumeric.c b/src/libgnumeric.c
index cd0a150..bfb05cc 100644
--- a/src/libgnumeric.c
+++ b/src/libgnumeric.c
@@ -57,11 +57,6 @@
#include "wbc-gtk-impl.h"
#include <go-string.h>
#include <goffice/goffice.h>
-#include <goffice/utils/go-file.h>
-#include <goffice/app/go-plugin.h>
-#include <goffice/app/go-plugin-service.h>
-#include <goffice/app/go-cmd-context.h>
-#include <goffice/app/go-plugin-loader-module.h>
#include <glade/glade.h>
#ifdef HAVE_SYS_RESOURCE_H
diff --git a/src/main-application.c b/src/main-application.c
index cb97246..8776854 100644
--- a/src/main-application.c
+++ b/src/main-application.c
@@ -20,13 +20,12 @@
#endif
#include "command-context.h"
-#include <goffice/app/io-context.h>
+#include <goffice/goffice.h>
#include "io-context-gtk.h"
/* TODO: Get rid of this one */
#include "command-context-stderr.h"
#include "wbc-gtk-impl.h"
#include "workbook-view.h"
-#include <goffice/app/go-plugin.h>
#include "workbook.h"
#include "gui-file.h"
#include "gnumeric-gconf.h"
@@ -39,8 +38,6 @@
#include <gtk/gtk.h>
#include <glib/gstdio.h>
-#include <goffice/utils/go-file.h>
-#include <goffice/app/go-cmd-context.h>
#include <sys/types.h>
#include <fcntl.h>
diff --git a/src/mathfunc.c b/src/mathfunc.c
index 69fdfea..56caf84 100644
--- a/src/mathfunc.c
+++ b/src/mathfunc.c
@@ -62,7 +62,7 @@
#include <unistd.h>
#include <locale.h>
#include <string.h>
-#include <goffice/math/go-math.h>
+#include <goffice/goffice.h>
#include <glib/gstdio.h>
#if defined (HAVE_IEEEFP_H) || defined (HAVE_IEEE754_H)
diff --git a/src/mstyle.c b/src/mstyle.c
index 8afd8db..a689cb3 100644
--- a/src/mstyle.c
+++ b/src/mstyle.c
@@ -19,8 +19,7 @@
#include "gutils.h"
#include "gnumeric-gconf.h"
#include <go-string.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-font.h>
+#include <goffice/goffice.h>
#define DEBUG_STYLES
#ifndef USE_MSTYLE_POOL
diff --git a/src/number-match.c b/src/number-match.c
index 831b638..f68cc14 100644
--- a/src/number-match.c
+++ b/src/number-match.c
@@ -25,10 +25,7 @@
#include "value.h"
#include "mathfunc.h"
#include "numbers.h"
-#include <goffice/utils/regutf8.h>
-#include <goffice/utils/datetime.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-locale.h>
+#include <goffice/goffice.h>
#include <stdio.h>
#include <string.h>
diff --git a/src/numbers.h b/src/numbers.h
index 19229f0..cac6c4d 100644
--- a/src/numbers.h
+++ b/src/numbers.h
@@ -3,7 +3,7 @@
# define _GNM_NUMBERS_H_
#include <gnumeric-features.h>
-#include <goffice/math/go-math.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/parse-util.c b/src/parse-util.c
index e98b772..541484b 100644
--- a/src/parse-util.c
+++ b/src/parse-util.c
@@ -39,9 +39,7 @@
#include "expr-impl.h"
#include "gutils.h"
#include <go-string.h>
-#include <goffice/app/go-doc.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-file.h>
+#include <goffice/goffice.h>
#include <errno.h>
#include <stdlib.h>
diff --git a/src/parser.y b/src/parser.y
index 0938ce0..42bcdaf 100644
--- a/src/parser.y
+++ b/src/parser.y
@@ -28,9 +28,7 @@
#include "style.h"
#include "value.h"
#include <go-string.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/app/go-doc.h>
-#include <goffice/utils/go-locale.h>
+#include <goffice/goffice.h>
#include <string.h>
#include <errno.h>
diff --git a/src/print-info.c b/src/print-info.c
index a35e5bc..303e856 100644
--- a/src/print-info.c
+++ b/src/print-info.c
@@ -27,11 +27,7 @@
#include "gnumeric-gconf-priv.h"
#include "parse-util.h"
-#include <goffice/app/go-doc.h>
-#include <goffice/app/go-cmd-context.h>
-#include <goffice/utils/go-file.h>
-#include <goffice/utils/datetime.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <glib/gi18n-lib.h>
#include <string.h>
diff --git a/src/print.c b/src/print.c
index eb2f778..2c0afd4 100644
--- a/src/print.c
+++ b/src/print.c
@@ -40,8 +40,7 @@
#include "parse-util.h"
#include "style-font.h"
#include "gnumeric-gconf.h"
-#include <goffice/utils/go-font.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <gtk/gtk.h>
diff --git a/src/rangefunc.h b/src/rangefunc.h
index 4baa2e3..083f6d1 100644
--- a/src/rangefunc.h
+++ b/src/rangefunc.h
@@ -3,7 +3,7 @@
# define _GNM_RANGEFUNC_H_
#include "numbers.h"
-#include <goffice/math/go-rangefunc.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/regression.h b/src/regression.h
index d7457f1..ffdaed1 100644
--- a/src/regression.h
+++ b/src/regression.h
@@ -3,7 +3,7 @@
# define _GNM_REGRESSION_H_
#include "numbers.h"
-#include <goffice/math/go-regression.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/rendered-value.c b/src/rendered-value.c
index 2fd7da2..b88d5d3 100644
--- a/src/rendered-value.c
+++ b/src/rendered-value.c
@@ -40,8 +40,7 @@
#include "workbook.h"
#include <string.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-font.h>
+#include <goffice/goffice.h>
#undef DEBUG_BOUNDING_BOX
diff --git a/src/search.h b/src/search.h
index 8631753..97ef710 100644
--- a/src/search.h
+++ b/src/search.h
@@ -5,7 +5,7 @@
#include <gnumeric.h>
#include <position.h>
#include <numbers.h>
-#include <goffice/utils/regutf8.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/selection.c b/src/selection.c
index 782477e..e31abeb 100644
--- a/src/selection.c
+++ b/src/selection.c
@@ -1307,9 +1307,7 @@ sv_selection_walk_step (SheetView *sv, gboolean forward, gboolean horizontal)
sv_make_cell_visible (sv, destination.col, destination.row, FALSE);
}
-#include <goffice/graph/gog-series.h>
-#include <goffice/graph/gog-plot-impl.h>
-#include <goffice/data/go-data.h>
+#include <goffice/goffice.h>
#include <expr.h>
#include <graph.h>
diff --git a/src/selection.h b/src/selection.h
index d1ae40f..ae3a463 100644
--- a/src/selection.h
+++ b/src/selection.h
@@ -3,7 +3,7 @@
# define _GNM_SELECTION_H_
#include "gnumeric.h"
-#include <goffice/graph/goffice-graph.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/session.c b/src/session.c
index 506cf87..826a4e5 100644
--- a/src/session.c
+++ b/src/session.c
@@ -32,7 +32,7 @@
#include <wbc-gtk.h>
#include <gui-file.h>
#include <gui-util.h>
-#include <goffice/app/go-doc.h>
+#include <goffice/goffice.h>
#include <glib/gi18n-lib.h>
#include <libgnomeui/gnome-client.h>
diff --git a/src/sheet-autofill.c b/src/sheet-autofill.c
index 3e4044a..3807e2d 100644
--- a/src/sheet-autofill.c
+++ b/src/sheet-autofill.c
@@ -24,8 +24,7 @@
#include "ranges.h"
#include "sheet-merge.h"
#include "gnm-format.h"
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-format.h>
+#include <goffice/goffice.h>
#include <string.h>
#include <errno.h>
diff --git a/src/sheet-control-gui.c b/src/sheet-control-gui.c
index 8411ced..50f6040 100644
--- a/src/sheet-control-gui.c
+++ b/src/sheet-control-gui.c
@@ -64,9 +64,7 @@
#include "gnm-sheet-slicer.h"
#include <go-data-slicer-field.h>
-#include <goffice/utils/go-file.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/app/io-context.h>
+#include <goffice/goffice.h>
#include <gdk/gdkkeysyms.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/src/sheet-filter.h b/src/sheet-filter.h
index b2248be..1409424 100644
--- a/src/sheet-filter.h
+++ b/src/sheet-filter.h
@@ -3,7 +3,7 @@
# define _GNM_SHEET_FILTER_H_
#include "gnumeric.h"
-#include <goffice/utils/go-undo.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/sheet-object-cell-comment.c b/src/sheet-object-cell-comment.c
index 59cbdcc..2ab6c8f 100644
--- a/src/sheet-object-cell-comment.c
+++ b/src/sheet-object-cell-comment.c
@@ -32,8 +32,7 @@
#include "sheet-control-gui-priv.h"
#include "dialogs.h"
#include "gui-util.h"
-#include <goffice/utils/go-libxml-extras.h>
-#include <goffice/utils/go-format.h>
+#include <goffice/goffice.h>
#include <string.h>
#include <libxml/globals.h>
diff --git a/src/sheet-object-graph.c b/src/sheet-object-graph.c
index ff90c6a..87ef035 100644
--- a/src/sheet-object-graph.c
+++ b/src/sheet-object-graph.c
@@ -38,21 +38,7 @@
#include "sheet.h"
#include <graph.h>
-#include <goffice/graph/gog-graph.h>
-#include <goffice/graph/gog-object.h>
-#include <goffice/graph/gog-object-xml.h>
-#include <goffice/graph/gog-plot.h>
-#include <goffice/graph/gog-data-allocator.h>
-#include <goffice/graph/gog-data-set.h>
-#include <goffice/graph/gog-renderer.h>
-#include <goffice/graph/gog-control-foocanvas.h>
-#include <goffice/utils/go-file.h>
-#include <goffice/utils/go-units.h>
-#include <goffice/utils/go-libxml-extras.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-format.h>
-#include <goffice/app/go-cmd-context.h>
-#include <goffice/gtk/go-graph-widget.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include <gsf/gsf-utils.h>
diff --git a/src/sheet-object-graph.h b/src/sheet-object-graph.h
index 7773f94..52d75af 100644
--- a/src/sheet-object-graph.h
+++ b/src/sheet-object-graph.h
@@ -4,8 +4,7 @@
#include "sheet-object.h"
#include "gui-gnumeric.h"
-#include <goffice/graph/goffice-graph.h>
-#include <goffice/graph/gog-guru.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/sheet-object-image.c b/src/sheet-object-image.c
index 6aae73b..939911c 100644
--- a/src/sheet-object-image.c
+++ b/src/sheet-object-image.c
@@ -19,12 +19,9 @@
#include "application.h"
#include "xml-io.h"
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-libxml-extras.h>
-#include <goffice/utils/go-file.h>
+#include <goffice/goffice.h>
#include <goffice/cut-n-paste/foocanvas/foo-canvas-pixbuf.h>
#include <goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h>
-#include <goffice/gtk/go-pixbuf.h>
#include <gsf/gsf-impl-utils.h>
#include <gsf/gsf-output-stdio.h>
#include <gsf/gsf-utils.h>
diff --git a/src/sheet-object-widget.c b/src/sheet-object-widget.c
index 2bcc57d..a7f8a49 100644
--- a/src/sheet-object-widget.c
+++ b/src/sheet-object-widget.c
@@ -48,9 +48,7 @@
#include "commands.h"
#include "gnm-format.h"
-#include <goffice/gtk/go-combo-text.h>
-#include <goffice/utils/go-libxml-extras.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include <libxml/globals.h>
diff --git a/src/sheet-object.c b/src/sheet-object.c
index 3bd472e..e76a0b5 100644
--- a/src/sheet-object.c
+++ b/src/sheet-object.c
@@ -31,13 +31,12 @@
#include "sheet-object-graph.h"
#include "sheet-object-image.h"
#include "graph.h"
-#include <goffice/app/io-context.h>
+#include <goffice/goffice.h>
#include "application.h"
#include "gutils.h"
#include <libxml/globals.h>
#include <goffice/cut-n-paste/foocanvas/foo-canvas.h>
-#include <goffice/utils/go-glib-extras.h>
#include <gsf/gsf-impl-utils.h>
#include <string.h>
diff --git a/src/sheet-object.h b/src/sheet-object.h
index c975302..cbfa9be 100644
--- a/src/sheet-object.h
+++ b/src/sheet-object.h
@@ -5,7 +5,7 @@
#include "gnumeric.h"
#include <gtk/gtk.h>
#include <gsf/gsf-output.h>
-#include <goffice/utils/go-undo.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/sheet-style.c b/src/sheet-style.c
index a372c6b..56ee707 100644
--- a/src/sheet-style.c
+++ b/src/sheet-style.c
@@ -32,7 +32,7 @@
#include "parse-util.h"
#include "cell.h"
#include "gutils.h"
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <glib/gi18n-lib.h>
#include <string.h>
#include <math.h>
diff --git a/src/sheet.c b/src/sheet.c
index 285d60c..974b150 100644
--- a/src/sheet.c
+++ b/src/sheet.c
@@ -63,9 +63,7 @@
#include "scenarios.h"
#include "cell-draw.h"
#include <go-string.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-pango-extras.h>
-#include <goffice/utils/go-format.h>
+#include <goffice/goffice.h>
#include <glib/gi18n-lib.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/src/sheet.h b/src/sheet.h
index 4a18917..13e01db 100644
--- a/src/sheet.h
+++ b/src/sheet.h
@@ -6,7 +6,7 @@
#include "colrow.h"
#include "position.h"
#include <pango/pango.h>
-#include <goffice/utils/go-undo.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/sort.c b/src/sort.c
index a4e0643..a64ac47 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -17,7 +17,7 @@
#include "value.h"
#include "sheet.h"
#include "ranges.h"
-#include <goffice/utils/go-locale.h>
+#include <goffice/goffice.h>
#include <stdlib.h>
typedef struct {
diff --git a/src/ssconvert.c b/src/ssconvert.c
index f867474..3cc275f 100644
--- a/src/ssconvert.c
+++ b/src/ssconvert.c
@@ -29,13 +29,7 @@
#include "command-context-stderr.h"
#include "workbook-view.h"
#include <dialogs/dialogs.h>
-#include <goffice/app/file.h>
-#include <goffice/app/io-context.h>
-#include <goffice/app/error-info.h>
-#include <goffice/app/go-doc.h>
-#include <goffice/app/go-cmd-context.h>
-#include <goffice/utils/go-file.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-utils.h>
#include <string.h>
#ifdef HAVE_SYS_RESOURCE_H
diff --git a/src/ssgrep.c b/src/ssgrep.c
index b80228b..8e95c0f 100644
--- a/src/ssgrep.c
+++ b/src/ssgrep.c
@@ -8,10 +8,8 @@
#include <gnumeric-config.h>
#include "gnumeric.h"
#include "libgnumeric.h"
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include "command-context-stderr.h"
-#include <goffice/app/io-context.h>
-#include <goffice/app/error-info.h>
#include "workbook-view.h"
#include "workbook.h"
#include "gutils.h"
@@ -25,8 +23,6 @@
#include "sheet-object-cell-comment.h"
#include <go-string.h>
-#include <goffice/utils/go-file.h>
-#include <goffice/app/go-cmd-context.h>
#include <gsf/gsf-input-stdio.h>
#include <gsf/gsf-input-textline.h>
#include <glib/gi18n.h>
diff --git a/src/ssindex.c b/src/ssindex.c
index f19a046..e1eac34 100644
--- a/src/ssindex.c
+++ b/src/ssindex.c
@@ -14,12 +14,9 @@
#include "libgnumeric.h"
#include "gutils.h"
#include "gnumeric-paths.h"
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include "command-context-stderr.h"
-#include <goffice/app/io-context.h>
-#include <goffice/app/error-info.h>
#include "workbook-view.h"
-#include <goffice/app/file.h>
#include "workbook.h"
#include "sheet.h"
#include "cell.h"
@@ -32,9 +29,6 @@
#include "sheet-object-graph.h"
#include "gnm-plugin.h"
-#include <goffice/utils/go-file.h>
-#include <goffice/app/go-cmd-context.h>
-#include <goffice/graph/gog-object.h>
#include <gsf/gsf-utils.h>
#include <gsf/gsf-libxml.h>
#include <gsf/gsf-output-stdio.h>
diff --git a/src/sstest.c b/src/sstest.c
index 19371f0..988d0fc 100644
--- a/src/sstest.c
+++ b/src/sstest.c
@@ -6,10 +6,8 @@
#include <gnumeric-config.h>
#include "gnumeric.h"
#include "libgnumeric.h"
-#include <goffice/app/go-plugin.h>
+#include <goffice/goffice.h>
#include "command-context-stderr.h"
-#include <goffice/app/io-context.h>
-#include <goffice/app/error-info.h>
#include "workbook-view.h"
#include "workbook.h"
#include "gutils.h"
@@ -25,9 +23,6 @@
#include "parse-util.h"
#include "sheet-object-cell-comment.h"
-#include <goffice/utils/go-file.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/app/go-cmd-context.h>
#include <gsf/gsf-input-stdio.h>
#include <gsf/gsf-input-textline.h>
#include <glib/gi18n.h>
diff --git a/src/stf-export.c b/src/stf-export.c
index ca2deda..ac50980 100644
--- a/src/stf-export.c
+++ b/src/stf-export.c
@@ -39,9 +39,7 @@
#include <gsf/gsf-output-iconv.h>
#include <gsf/gsf-output-memory.h>
#include <gsf/gsf-impl-utils.h>
-#include <goffice/utils/go-locale.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/app/file.h>
+#include <goffice/goffice.h>
#include <string.h>
#include <locale.h>
@@ -567,8 +565,6 @@ GSF_CLASS (GnmStfExport, gnm_stf_export,
#include "wbc-gtk.h"
-#include <goffice/app/io-context.h>
-#include <goffice/app/io-context-priv.h>
#include "dialog-stf-export.h"
#include "workbook-view.h"
diff --git a/src/stf-export.h b/src/stf-export.h
index 7b362c9..d03f68b 100644
--- a/src/stf-export.h
+++ b/src/stf-export.h
@@ -4,7 +4,7 @@
#include "gnumeric.h"
#include <gsf/gsf-output-csv.h>
-#include <goffice/app/goffice-app.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/stf-parse.c b/src/stf-parse.c
index 39d2c54..a94bc17 100644
--- a/src/stf-parse.c
+++ b/src/stf-parse.c
@@ -42,10 +42,7 @@
#include "number-match.h"
#include "gutils.h"
#include "parse-util.h"
-#include <goffice/utils/datetime.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-locale.h>
-#include <goffice/utils/go-format.h>
+#include <goffice/goffice.h>
#include <stdlib.h>
#include <stdio.h>
diff --git a/src/stf.c b/src/stf.c
index 955acff..173650e 100644
--- a/src/stf.c
+++ b/src/stf.c
@@ -26,16 +26,13 @@
#include "gnumeric.h"
#include "stf.h"
-#include <goffice/app/file.h>
+#include <goffice/goffice.h>
#include "cell.h"
#include "sheet.h"
#include "sheet-view.h"
#include "sheet-style.h"
#include "style.h"
#include "mstyle.h"
-#include <goffice/app/io-context-priv.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/app/go-doc.h>
#include "command-context.h"
#include "wbc-gtk.h"
#include "workbook-view.h"
diff --git a/src/style-color.h b/src/style-color.h
index 109b0ec..fc13dd9 100644
--- a/src/style-color.h
+++ b/src/style-color.h
@@ -4,7 +4,7 @@
#include "gnumeric.h"
#include "libgnumeric.h"
-#include <goffice/utils/go-color.h>
+#include <goffice/goffice.h>
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/src/style.c b/src/style.c
index 447e3a1..a36de40 100644
--- a/src/style.c
+++ b/src/style.c
@@ -27,7 +27,7 @@
#include <gdk/gdk.h>
#include <gtk/gtk.h>
#include <string.h>
-#include <goffice/utils/go-font.h>
+#include <goffice/goffice.h>
#undef DEBUG_REF_COUNT
#undef DEBUG_FONTS
diff --git a/src/symbol.c b/src/symbol.c
index 1d59589..af4f596 100644
--- a/src/symbol.c
+++ b/src/symbol.c
@@ -11,7 +11,7 @@
#include "gutils.h"
#include <string.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
/**
* symbol_lookup:
diff --git a/src/test-harness.c b/src/test-harness.c
index a074d36..6daceef 100644
--- a/src/test-harness.c
+++ b/src/test-harness.c
@@ -16,10 +16,7 @@
#include "sheet-style.h"
#include "style.h"
#include "style-color.h"
-#include <goffice/app/file.h>
-#include <goffice/app/io-context.h>
-#include <goffice/app/go-cmd-context.h>
-#include <goffice/utils/go-file.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-utils.h>
#include <string.h>
diff --git a/src/test-pango.c b/src/test-pango.c
index 11e13d2..ecbfacd 100644
--- a/src/test-pango.c
+++ b/src/test-pango.c
@@ -9,8 +9,7 @@
#include "command-context-stderr.h"
#include "wbc-gtk.h"
#include "workbook-view.h"
-#include <goffice/app/go-plugin.h>
-#include <goffice/app/go-doc.h>
+#include <goffice/goffice.h>
#include "selection.h"
#include "sheet-view.h"
#include "commands.h"
@@ -19,7 +18,6 @@
#include "gnumeric-paths.h"
#include "gnm-plugin.h"
-#include <goffice/app/io-context.h>
#include <gtk/gtk.h>
diff --git a/src/tools/analysis-exp-smoothing.c b/src/tools/analysis-exp-smoothing.c
index 9fa04eb..f7346f8 100644
--- a/src/tools/analysis-exp-smoothing.c
+++ b/src/tools/analysis-exp-smoothing.c
@@ -37,12 +37,7 @@
#include "func.h"
#include "numbers.h"
#include "sheet-object-graph.h"
-#include <goffice/graph/gog-graph.h>
-#include <goffice/graph/gog-object.h>
-#include <goffice/graph/gog-chart.h>
-#include <goffice/graph/gog-plot.h>
-#include <goffice/graph/gog-series.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
static GnmExpr const *
diff --git a/src/tools/analysis-frequency.c b/src/tools/analysis-frequency.c
index 25e50cc..78b2b94 100644
--- a/src/tools/analysis-frequency.c
+++ b/src/tools/analysis-frequency.c
@@ -34,12 +34,7 @@
#include "func.h"
#include "numbers.h"
#include "sheet-object-graph.h"
-#include <goffice/graph/gog-graph.h>
-#include <goffice/graph/gog-object.h>
-#include <goffice/graph/gog-chart.h>
-#include <goffice/graph/gog-plot.h>
-#include <goffice/graph/gog-series.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
static gboolean
analysis_tool_frequency_engine_run (data_analysis_output_t *dao,
diff --git a/src/tools/analysis-histogram.c b/src/tools/analysis-histogram.c
index ef54cc6..a6999d3 100644
--- a/src/tools/analysis-histogram.c
+++ b/src/tools/analysis-histogram.c
@@ -36,12 +36,7 @@
#include "func.h"
#include "numbers.h"
#include "sheet-object-graph.h"
-#include <goffice/graph/gog-graph.h>
-#include <goffice/graph/gog-object.h>
-#include <goffice/graph/gog-chart.h>
-#include <goffice/graph/gog-plot.h>
-#include <goffice/graph/gog-series.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
static GnmExpr const *
make_hist_expr (analysis_tools_data_histogram_t *info,
diff --git a/src/tools/analysis-kaplan-meier.c b/src/tools/analysis-kaplan-meier.c
index 13930eb..b060594 100644
--- a/src/tools/analysis-kaplan-meier.c
+++ b/src/tools/analysis-kaplan-meier.c
@@ -36,15 +36,7 @@
#include "numbers.h"
#include "sheet-object-graph.h"
#include "graph.h"
-#include <goffice/graph/gog-graph.h>
-#include <goffice/graph/gog-object.h>
-#include <goffice/graph/gog-chart.h>
-#include <goffice/graph/gog-plot.h>
-#include <goffice/graph/gog-series.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-marker.h>
-#include <goffice/utils/go-style.h>
-#include <goffice/utils/go-styled-object.h>
+#include <goffice/goffice.h>
static gboolean
analysis_tool_kaplan_meier_engine_run (data_analysis_output_t *dao,
diff --git a/src/tools/analysis-tools.c b/src/tools/analysis-tools.c
index e15444b..21f431e 100644
--- a/src/tools/analysis-tools.c
+++ b/src/tools/analysis-tools.c
@@ -53,12 +53,7 @@
#include "command-context.h"
#include "sheet-object-graph.h"
#include "graph.h"
-#include <goffice/graph/gog-graph.h>
-#include <goffice/graph/gog-object.h>
-#include <goffice/graph/gog-chart.h>
-#include <goffice/graph/gog-plot.h>
-#include <goffice/graph/gog-series.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <string.h>
#include <stdlib.h>
diff --git a/src/tools/auto-correct.c b/src/tools/auto-correct.c
index 90bcba0..fdec05c 100644
--- a/src/tools/auto-correct.c
+++ b/src/tools/auto-correct.c
@@ -33,8 +33,7 @@
#include "gutils.h"
#include "gnumeric-gconf.h"
#include "parse-util.h"
-#include <goffice/utils/go-format.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include <string.h>
diff --git a/src/tools/dao.c b/src/tools/dao.c
index da276e9..9ff5000 100644
--- a/src/tools/dao.c
+++ b/src/tools/dao.c
@@ -45,8 +45,7 @@
#include "style-color.h"
#include "style-border.h"
#include "graph.h"
-#include <goffice/app/go-doc.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <glib.h>
#include <glib/gi18n-lib.h>
diff --git a/src/tools/dao.h b/src/tools/dao.h
index d977339..aa17a21 100644
--- a/src/tools/dao.h
+++ b/src/tools/dao.h
@@ -31,7 +31,7 @@
#include "gnumeric.h"
#include "numbers.h"
#include "style.h"
-#include <goffice/data/goffice-data.h>
+#include <goffice/goffice.h>
#include "style-color.h"
#include "style-border.h"
#include "graph.h"
diff --git a/src/tools/data-shuffling.c b/src/tools/data-shuffling.c
index c08a7ef..90bfd0e 100644
--- a/src/tools/data-shuffling.c
+++ b/src/tools/data-shuffling.c
@@ -33,7 +33,7 @@
#include <ranges.h>
#include <value.h>
#include <command-context.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include "mathfunc.h"
#include "data-shuffling.h"
diff --git a/src/tools/fill-series.c b/src/tools/fill-series.c
index 9564458..cf89178 100644
--- a/src/tools/fill-series.c
+++ b/src/tools/fill-series.c
@@ -42,7 +42,7 @@
#include "mathfunc.h"
#include "fill-series.h"
#include "dao.h"
-#include <goffice/utils/datetime.h>
+#include <goffice/goffice.h>
static void
do_row_filling_wday (data_analysis_output_t *dao, fill_series_t *info)
diff --git a/src/tools/scenarios.c b/src/tools/scenarios.c
index b02ef98..7758bfa 100644
--- a/src/tools/scenarios.c
+++ b/src/tools/scenarios.c
@@ -39,7 +39,7 @@
#include "dao.h"
#include "style-color.h"
#include "parse-util.h"
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <string.h>
diff --git a/src/tools/solver/solver.c b/src/tools/solver/solver.c
index aa9dab2..37882ee 100644
--- a/src/tools/solver/solver.c
+++ b/src/tools/solver/solver.c
@@ -41,7 +41,7 @@
#include "analysis-tools.h"
#include "api.h"
#include "gutils.h"
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include "xml-io.h"
#include <math.h>
diff --git a/src/value-sheet.c b/src/value-sheet.c
index f3ab548..621509e 100644
--- a/src/value-sheet.c
+++ b/src/value-sheet.c
@@ -18,7 +18,7 @@
#include "workbook.h"
#include "parse-util.h"
#include <go-string.h>
-#include <goffice/utils/go-locale.h>
+#include <goffice/goffice.h>
/* Debugging utility to print a GnmValue */
void
diff --git a/src/value.c b/src/value.c
index fa185c5..da453be 100644
--- a/src/value.c
+++ b/src/value.c
@@ -27,8 +27,7 @@
#include <cell.h>
#include <number-match.h>
#include <go-string.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-locale.h>
+#include <goffice/goffice.h>
#include <stdlib.h>
#include <errno.h>
diff --git a/src/wbc-gtk-actions.c b/src/wbc-gtk-actions.c
index 6fd66b2..47b016f 100644
--- a/src/wbc-gtk-actions.c
+++ b/src/wbc-gtk-actions.c
@@ -64,13 +64,7 @@
#include "print.h"
#include "gnm-pane-impl.h"
-#include <goffice/app/io-context.h>
-#include <goffice/graph/gog-guru.h>
-#include <goffice/graph/gog-data-allocator.h>
-#include <goffice/graph/gog-data-set.h>
-#include <goffice/utils/go-file.h>
-#include <goffice/utils/go-locale.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include "widgets/widget-editable-label.h"
#include <gtk/gtk.h>
diff --git a/src/wbc-gtk-edit.c b/src/wbc-gtk-edit.c
index 1584607..80f911c 100644
--- a/src/wbc-gtk-edit.c
+++ b/src/wbc-gtk-edit.c
@@ -46,8 +46,7 @@
#include "value.h"
#include "widgets/gnumeric-expr-entry.h"
-#include <goffice/utils/go-font.h>
-#include <goffice/utils/go-pango-extras.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 57a89ed..baec8d9 100644
--- a/src/wbc-gtk-impl.h
+++ b/src/wbc-gtk-impl.h
@@ -9,13 +9,8 @@
#include "widgets/gnumeric-expr-entry.h"
#include "widgets/gnm-notebook.h"
-#include <goffice/app/file.h>
+#include <goffice/goffice.h>
#include <gtk/gtk.h>
-#include <goffice/gtk/go-action-combo-stack.h>
-#include <goffice/gtk/go-action-combo-color.h>
-#include <goffice/gtk/go-action-combo-text.h>
-#include <goffice/gtk/go-action-combo-pixmaps.h>
-#include <goffice/utils/go-undo.h>
#ifdef GNM_USE_HILDON
#include <hildon-widgets/hildon-program.h>
#endif
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 6a0cc60..dc1a495 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -56,15 +56,7 @@
#include "graph.h"
#include "selection.h"
-#include <goffice/graph/gog-data-allocator.h>
-#include <goffice/graph/gog-data-set.h>
-#include <goffice/graph/gog-series.h>
-#include <goffice/data/go-data.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-color.h>
-#include <goffice/utils/go-font.h>
-#include <goffice/utils/go-file.h>
-#include <goffice/app/go-cmd-context-impl.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include <gtk/gtk.h>
#include "gdk/gdkkeysyms.h"
diff --git a/src/widgets/gnm-dao.c b/src/widgets/gnm-dao.c
index 9af24b8..c380ce8 100644
--- a/src/widgets/gnm-dao.c
+++ b/src/widgets/gnm-dao.c
@@ -26,7 +26,7 @@
#include <value.h>
#include <workbook-control.h>
-#include <goffice/gtk/goffice-gtk.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
diff --git a/src/widgets/gnm-filter-combo-foo-view.c b/src/widgets/gnm-filter-combo-foo-view.c
index befb3fc..e5ac1de 100644
--- a/src/widgets/gnm-filter-combo-foo-view.c
+++ b/src/widgets/gnm-filter-combo-foo-view.c
@@ -36,8 +36,7 @@
#include "sheet-control-gui.h"
#include "../dialogs/dialogs.h"
-#include <goffice/gtk/goffice-gtk.h>
-#include <goffice/utils/regutf8.h>
+#include <goffice/goffice.h>
#include <goffice/cut-n-paste/foocanvas/foo-canvas-widget.h>
#include <gsf/gsf-impl-utils.h>
#include <gtk/gtk.h>
diff --git a/src/widgets/gnm-format-sel.h b/src/widgets/gnm-format-sel.h
index 6687a16..117a81a 100644
--- a/src/widgets/gnm-format-sel.h
+++ b/src/widgets/gnm-format-sel.h
@@ -22,7 +22,7 @@
#define GNM_FORMAT_SEL_H
#include "gnumeric.h"
-#include <goffice/gtk/go-format-sel.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/widgets/gnm-sheet-slicer-combo-foo-view.c b/src/widgets/gnm-sheet-slicer-combo-foo-view.c
index fbd75d0..0fd2b95 100644
--- a/src/widgets/gnm-sheet-slicer-combo-foo-view.c
+++ b/src/widgets/gnm-sheet-slicer-combo-foo-view.c
@@ -33,7 +33,7 @@
#include "gui-gnumeric.h"
#include "go-data-slicer-field.h"
#include "go-data-cache-field.h"
-#include <goffice/utils/regutf8.h>
+#include <goffice/goffice.h>
#include <goffice/cut-n-paste/foocanvas/foo-canvas-widget.h>
#include <gsf/gsf-impl-utils.h>
#include <gtk/gtk.h>
diff --git a/src/widgets/gnm-validation-combo-foo-view.c b/src/widgets/gnm-validation-combo-foo-view.c
index d9df14c..8b0e3ad 100644
--- a/src/widgets/gnm-validation-combo-foo-view.c
+++ b/src/widgets/gnm-validation-combo-foo-view.c
@@ -39,7 +39,7 @@
#include "value.h"
#include "gui-gnumeric.h"
-#include <goffice/utils/regutf8.h>
+#include <goffice/goffice.h>
#include <goffice/cut-n-paste/foocanvas/foo-canvas-widget.h>
#include <gsf/gsf-impl-utils.h>
#include <gtk/gtk.h>
diff --git a/src/widgets/gnumeric-expr-entry.c b/src/widgets/gnumeric-expr-entry.c
index 109a8f1..9220b43 100644
--- a/src/widgets/gnumeric-expr-entry.c
+++ b/src/widgets/gnumeric-expr-entry.c
@@ -31,10 +31,7 @@
#include <gnm-format.h>
#include <number-match.h>
#include <gnm-datetime.h>
-#include <goffice/utils/go-locale.h>
-#include <goffice/utils/go-font.h>
-#include <goffice/gtk/go-calendar-button.h>
-#include <goffice/graph/gog-data-allocator.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include <gtk/gtk.h>
diff --git a/src/widgets/widget-font-selector.c b/src/widgets/widget-font-selector.c
index fcd7797..177ae3d 100644
--- a/src/widgets/widget-font-selector.c
+++ b/src/widgets/widget-font-selector.c
@@ -20,8 +20,7 @@
#include <mstyle.h>
#include <preview-grid.h>
-#include <goffice/utils/go-font.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include <gtk/gtk.h>
#include <glade/glade.h>
diff --git a/src/workbook-control-priv.h b/src/workbook-control-priv.h
index ffc6ee4..a529292 100644
--- a/src/workbook-control-priv.h
+++ b/src/workbook-control-priv.h
@@ -3,7 +3,7 @@
# define _GNM_WORKBOOK_CONTROL_PRIV_H_
#include "workbook-control.h"
-#include <goffice/app/go-doc-control-impl.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/workbook-control.c b/src/workbook-control.c
index 55b9ea9..5e91b00 100644
--- a/src/workbook-control.c
+++ b/src/workbook-control.c
@@ -35,7 +35,7 @@
#include "ranges.h"
#include "expr-name.h"
#include "command-context.h"
-#include <goffice/utils/go-file.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
enum {
diff --git a/src/workbook-priv.h b/src/workbook-priv.h
index a1d6964..a4f6ac4 100644
--- a/src/workbook-priv.h
+++ b/src/workbook-priv.h
@@ -3,9 +3,7 @@
# define _GNM_WORKBOOK_PRIV_H_
#include "workbook.h"
-#include <goffice/app/file.h>
-#include <goffice/app/go-doc-impl.h>
-#include <goffice/utils/datetime.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/workbook-view.c b/src/workbook-view.c
index e393f68..a858f12 100644
--- a/src/workbook-view.c
+++ b/src/workbook-view.c
@@ -50,12 +50,7 @@
#include "auto-format.h"
#include "sheet-object.h"
-#include <goffice/app/file.h>
-#include <goffice/app/go-doc.h>
-#include <goffice/app/io-context.h>
-#include <goffice/utils/go-file.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-locale.h>
+#include <goffice/goffice.h>
#include <gsf/gsf.h>
#include <gsf/gsf-impl-utils.h>
#include <gsf/gsf-output-stdio.h>
diff --git a/src/workbook.c b/src/workbook.c
index e20ec77..61a5a87 100644
--- a/src/workbook.c
+++ b/src/workbook.c
@@ -38,10 +38,7 @@
#include "style-color.h"
#include "sheet-style.h"
-#include <goffice/app/file.h>
-#include <goffice/app/io-context.h>
-#include <goffice/utils/go-file.h>
-#include <goffice/utils/go-glib-extras.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-doc-meta-data.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/src/workbook.h b/src/workbook.h
index fab92c2..9c356d3 100644
--- a/src/workbook.h
+++ b/src/workbook.h
@@ -3,7 +3,7 @@
# define _GNM_WORKBOOK_H_
#include "gnumeric.h"
-#include <goffice/app/file.h>
+#include <goffice/goffice.h>
#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/src/xml-io.c b/src/xml-io.c
index 314f759..8d99dad 100644
--- a/src/xml-io.c
+++ b/src/xml-io.c
@@ -30,7 +30,7 @@
#include "solver.h"
#include "scenarios.h"
#include "print-info.h"
-#include <goffice/app/file.h>
+#include <goffice/goffice.h>
#include "expr.h"
#include "expr-impl.h"
#include "expr-name.h"
@@ -39,7 +39,6 @@
#include "validation.h"
#include "sheet-merge.h"
#include "sheet-filter.h"
-#include <goffice/app/io-context.h>
#include "command-context.h"
#include "workbook-control.h"
#include "workbook-view.h"
@@ -53,9 +52,6 @@
#include "gutils.h"
#include "gnumeric-gconf.h"
-#include <goffice/utils/go-libxml-extras.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/app/error-info.h>
#include <gsf/gsf-libxml.h>
#include <gsf/gsf-doc-meta-data.h>
#include <gsf/gsf-input.h>
diff --git a/src/xml-io.h b/src/xml-io.h
index 0ddd7e6..c6d96e5 100644
--- a/src/xml-io.h
+++ b/src/xml-io.h
@@ -4,8 +4,7 @@
#include <gnumeric.h>
#include <xml-io-version.h>
-#include <goffice/utils/goffice-utils.h>
-#include <goffice/app/file.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-libxml.h>
#include <libxml/tree.h>
#include <libxml/xmlmemory.h>
diff --git a/src/xml-sax-read.c b/src/xml-sax-read.c
index e9220e0..c196f9d 100644
--- a/src/xml-sax-read.c
+++ b/src/xml-sax-read.c
@@ -60,13 +60,7 @@
#include "xml-io.h"
#include "gutils.h"
-#include <goffice/app/io-context.h>
-#include <goffice/app/go-doc.h>
-#include <goffice/app/go-plugin.h>
-#include <goffice/app/error-info.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-format.h>
-#include <goffice/utils/datetime.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-libxml.h>
#include <gsf/gsf-input.h>
@@ -81,8 +75,6 @@
#include <string.h>
#include <errno.h>
-GNM_PLUGIN_MODULE_HEADER;
-
#define CXML2C(s) ((char const *)(s))
static inline gboolean
diff --git a/src/xml-sax-write.c b/src/xml-sax-write.c
index a70c732..ecf043a 100644
--- a/src/xml-sax-write.c
+++ b/src/xml-sax-write.c
@@ -57,8 +57,7 @@
#include <gnumeric-gconf.h>
#include <go-string.h>
-#include <goffice/app/go-doc.h>
-#include <goffice/app/file.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-libxml.h>
#include <gsf/gsf-output-gzip.h>
#include <gsf/gsf-doc-meta-data.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
