[goffice] Introduce master include file.
- From: Morten Welinder <mortenw src gnome org>
- To: svn-commits-list gnome org
- Subject: [goffice] Introduce master include file.
- Date: Tue, 9 Jun 2009 23:23:08 -0400 (EDT)
commit fe4f0dbe02cbb544030dfbed1ddeb850d8c7f50b
Author: Morten Welinder <terra gnome org>
Date: Tue Jun 9 23:21:56 2009 -0400
Introduce master include file.
---
ChangeLog | 4 ++
NEWS | 1 +
goffice/app/go-conf.c | 4 +--
goffice/app/go-doc.c | 1 -
goffice/app/go-doc.h | 4 +--
goffice/app/go-error-stack.h | 3 +-
goffice/app/goffice-app.h | 19 ++++++++++
goffice/data/go-data.h | 2 +-
goffice/data/goffice-data.h | 4 ++
goffice/goffice.h | 26 +++++++++++---
goffice/graph/goffice-graph.h | 45 +++++++++++++++++++++++-
goffice/graph/gog-3d-box.h | 4 +--
goffice/graph/gog-axis-line-impl.h | 6 +---
goffice/graph/gog-axis-line.c | 17 +--------
goffice/graph/gog-axis-line.h | 3 +-
goffice/graph/gog-axis.c | 26 +-------------
goffice/graph/gog-axis.h | 5 +--
goffice/graph/gog-chart-impl.h | 5 +--
goffice/graph/gog-chart-map-3d.c | 5 +--
goffice/graph/gog-chart-map-3d.h | 6 +---
goffice/graph/gog-chart-map.c | 10 +----
goffice/graph/gog-chart-map.h | 6 +---
goffice/graph/gog-chart.h | 4 +--
goffice/graph/gog-child-button.c | 12 +------
goffice/graph/gog-child-button.h | 3 +-
goffice/graph/gog-control-foocanvas.h | 3 +-
goffice/graph/gog-data-allocator.h | 4 +--
goffice/graph/gog-data-set.c | 7 +---
goffice/graph/gog-data-set.h | 4 +--
goffice/graph/gog-equation.h | 3 +-
goffice/graph/gog-error-bar.h | 6 +---
goffice/graph/gog-graph-impl.h | 5 +--
goffice/graph/gog-graph.h | 8 +----
goffice/graph/gog-grid-line.c | 20 +----------
goffice/graph/gog-grid-line.h | 3 +-
goffice/graph/gog-grid.h | 3 +-
goffice/graph/gog-guru.h | 4 +--
goffice/graph/gog-label.c | 18 +---------
goffice/graph/gog-label.h | 3 +-
goffice/graph/gog-legend.h | 3 +-
goffice/graph/gog-object-xml.h | 4 +--
goffice/graph/gog-object.c | 9 +----
goffice/graph/gog-object.h | 8 +----
goffice/graph/gog-outlined-object.c | 9 +----
goffice/graph/gog-outlined-object.h | 4 +--
goffice/graph/gog-plot-engine.h | 3 +-
goffice/graph/gog-plot-impl.h | 7 +---
goffice/graph/gog-plot.h | 5 +--
goffice/graph/gog-reg-curve.c | 21 +----------
goffice/graph/gog-reg-curve.h | 4 +--
goffice/graph/gog-renderer.h | 9 +----
goffice/graph/gog-series-impl.h | 7 +---
goffice/graph/gog-series-lines.c | 10 +-----
goffice/graph/gog-series-lines.h | 4 +--
goffice/graph/gog-series.c | 15 +-------
goffice/graph/gog-series.h | 7 +---
goffice/graph/gog-smoothed-curve.c | 12 +-----
goffice/graph/gog-smoothed-curve.h | 4 +--
goffice/graph/gog-styled-object.c | 9 +----
goffice/graph/gog-styled-object.h | 4 +--
goffice/graph/gog-theme.h | 5 +--
goffice/graph/gog-trend-line.c | 7 +---
goffice/graph/gog-trend-line.h | 2 +-
goffice/graph/gog-view.c | 9 +----
goffice/graph/gog-view.h | 3 +-
goffice/gtk/go-3d-rotation-sel.c | 6 ++--
goffice/gtk/go-3d-rotation-sel.h | 4 +--
goffice/gtk/go-action-combo-color.h | 3 +-
goffice/gtk/go-action-combo-pixmaps.h | 3 +-
goffice/gtk/go-color-group.c | 3 +-
goffice/gtk/go-color-group.h | 5 +--
goffice/gtk/go-color-palette.c | 4 +--
goffice/gtk/go-color-palette.h | 3 +-
goffice/gtk/go-color-selector.h | 3 +-
goffice/gtk/go-combo-color.h | 5 +--
goffice/gtk/go-font-sel.c | 5 +--
goffice/gtk/go-font-sel.h | 3 +-
goffice/gtk/go-format-sel.c | 11 +-----
goffice/gtk/go-format-sel.h | 3 +-
goffice/gtk/go-gradient-selector.c | 5 +--
goffice/gtk/go-gradient-selector.h | 3 +-
goffice/gtk/go-graph-widget.h | 6 +--
goffice/gtk/go-image-sel.h | 4 +--
goffice/gtk/go-line-selector.h | 3 +-
goffice/gtk/go-marker-selector.c | 5 +--
goffice/gtk/go-marker-selector.h | 3 +-
goffice/gtk/go-palette.c | 5 +--
goffice/gtk/go-pattern-selector.c | 6 +--
goffice/gtk/go-pattern-selector.h | 3 +-
goffice/gtk/go-rotation-sel.c | 6 ++--
goffice/gtk/go-rotation-sel.h | 3 +-
goffice/gtk/go-selector.h | 2 +-
goffice/gtk/goffice-gtk.c | 9 ++---
goffice/gtk/goffice-gtk.h | 34 +++++++++++++++++-
goffice/math/Makefile.am | 1 +
goffice/math/go-complex.h | 4 ++-
goffice/math/goffice-math.h | 14 +++++++
goffice/utils/datetime.h | 3 +-
goffice/utils/go-bezier.h | 4 +--
goffice/utils/go-color.h | 5 +--
goffice/utils/go-editor.h | 10 ++----
goffice/utils/go-file.c | 3 +-
goffice/utils/go-file.h | 2 +-
goffice/utils/go-font.h | 5 ---
goffice/utils/go-format.h | 7 ----
goffice/utils/go-geometry.h | 5 +--
goffice/utils/go-glib-extras.h | 9 ++---
goffice/utils/go-gradient.h | 2 -
goffice/utils/go-image.h | 4 +--
goffice/utils/go-libxml-extras.h | 4 +--
goffice/utils/go-line.h | 33 +-----------------
goffice/utils/go-marker.c | 5 +--
goffice/utils/go-marker.h | 5 +--
goffice/utils/go-path.h | 2 -
goffice/utils/go-pattern.h | 4 +--
goffice/utils/go-persist.h | 3 +-
goffice/utils/go-style.c | 24 +------------
goffice/utils/go-style.h | 9 +----
goffice/utils/go-styled-object.h | 3 +-
goffice/utils/goffice-utils.h | 62 +++++++++++++++++++++++++++++++++
120 files changed, 333 insertions(+), 557 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9dfc0fa..b6c922f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-06-09 Morten Welinder <terra gnome org>
+
+ * */*.[ch]: Introduce <goffice/goffice.h> as master include file.
+
2009-06-03 Andreas J. Guelzow <aguelzow pyrshep ca>
* goffice/utils/go-format.c (go_format_output_currency_to_odf):
diff --git a/NEWS b/NEWS
index b1aa286..4b852e2 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ Morten:
* Add functions to generate number formats.
* Make format classification function public.
* Fix inc/dec precision for accounting format.
+ * Introduce master include file.
--------------------------------------------------------------------------
goffice 0.7.7:
diff --git a/goffice/app/go-conf.c b/goffice/app/go-conf.c
index d3f8a7f..42bbcdc 100644
--- a/goffice/app/go-conf.c
+++ b/goffice/app/go-conf.c
@@ -26,10 +26,8 @@
*/
#include <goffice-config.h>
+#include <goffice/goffice.h>
#include <go-conf.h>
-#include <goffice/utils/goffice-utils.h>
-#include <goffice/utils/go-format.h>
-#include <goffice/utils/go-locale.h>
#define NO_DEBUG_GCONF
#ifndef NO_DEBUG_GCONF
diff --git a/goffice/app/go-doc.c b/goffice/app/go-doc.c
index aa87665..e98d60c 100644
--- a/goffice/app/go-doc.c
+++ b/goffice/app/go-doc.c
@@ -23,7 +23,6 @@
#include <goffice/goffice-config.h>
#include <goffice/app/goffice-app.h>
#include <goffice/app/go-doc-impl.h>
-#include <goffice/utils/go-glib-extras.h>
#include <gsf/gsf-doc-meta-data.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/goffice/app/go-doc.h b/goffice/app/go-doc.h
index 4f28963..735fefd 100644
--- a/goffice/app/go-doc.h
+++ b/goffice/app/go-doc.h
@@ -21,9 +21,7 @@
#ifndef GO_DOC_H
#define GO_DOC_H
-#include <goffice/app/goffice-app.h>
-#include <goffice/utils/go-image.h>
-#include <glib-object.h>
+#include <goffice/goffice.h>
#include <gsf/gsf.h>
G_BEGIN_DECLS
diff --git a/goffice/app/go-error-stack.h b/goffice/app/go-error-stack.h
index 565312f..482e554 100644
--- a/goffice/app/go-error-stack.h
+++ b/goffice/app/go-error-stack.h
@@ -21,8 +21,7 @@
#ifndef GO_ERROR_STACK_H
#define GO_ERROR_STACK_H
-#include <glib-object.h>
-#include <goffice/app/goffice-app.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/app/goffice-app.h b/goffice/app/goffice-app.h
index 7f3c4f4..e95d401 100644
--- a/goffice/app/goffice-app.h
+++ b/goffice/app/goffice-app.h
@@ -59,4 +59,23 @@ typedef enum {
G_END_DECLS
+#include <goffice/goffice.h>
+#include <goffice/utils/goffice-utils.h>
+
+#include <goffice/app/error-info.h>
+#include <goffice/app/file.h>
+#include <goffice/app/go-cmd-context.h>
+#include <goffice/app/go-cmd-context-impl.h>
+#include <goffice/app/go-conf.h>
+#include <goffice/app/go-doc-control.h>
+#include <goffice/app/go-doc-control-impl.h>
+#include <goffice/app/go-doc.h>
+#include <goffice/app/go-doc-impl.h>
+#include <goffice/app/go-plugin.h>
+#include <goffice/app/go-plugin-loader.h>
+#include <goffice/app/go-plugin-loader-module.h>
+#include <goffice/app/go-plugin-service.h>
+#include <goffice/app/go-plugin-service-impl.h>
+#include <goffice/app/io-context.h>
+
#endif /* GOFFICE_GRAPH_H */
diff --git a/goffice/data/go-data.h b/goffice/data/go-data.h
index 884ee32..68008f1 100644
--- a/goffice/data/go-data.h
+++ b/goffice/data/go-data.h
@@ -23,7 +23,7 @@
#define GO_DATA_H
#include <goffice/data/goffice-data.h>
-#include <goffice/utils/goffice-utils.h>
+#include <goffice/goffice.h>
#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/goffice/data/goffice-data.h b/goffice/data/goffice-data.h
index f4f1ebe..ed5b239 100644
--- a/goffice/data/goffice-data.h
+++ b/goffice/data/goffice-data.h
@@ -38,4 +38,8 @@ typedef struct {
G_END_DECLS
+#include <goffice/data/go-data.h>
+#include <goffice/data/go-data-impl.h>
+#include <goffice/data/go-data-simple.h>
+
#endif /* GOFFICE_DATA_H */
diff --git a/goffice/goffice.h b/goffice/goffice.h
index f26cf15..848e37c 100644
--- a/goffice/goffice.h
+++ b/goffice/goffice.h
@@ -22,11 +22,7 @@
#define GOFFICE_H
#include <glib.h>
-
-G_BEGIN_DECLS
-
-void libgoffice_init (void);
-void libgoffice_shutdown (void);
+#include <goffice/goffice-features.h>
#ifndef GO_VAR_DECL
# ifdef WIN32
@@ -40,6 +36,26 @@ void libgoffice_shutdown (void);
# endif
#endif /* GO_VAR_DECL */
+
+#include <glib-object.h>
+#ifdef GOFFICE_WITH_GTK
+#include <gtk/gtk.h>
+#endif
+
+#include <goffice/app/goffice-app.h>
+#include <goffice/utils/goffice-utils.h>
+#include <goffice/data/goffice-data.h>
+#include <goffice/math/goffice-math.h>
+#ifdef GOFFICE_WITH_GTK
+#include <goffice/gtk/goffice-gtk.h>
+#endif
+#include <goffice/graph/goffice-graph.h>
+
+G_BEGIN_DECLS
+
+void libgoffice_init (void);
+void libgoffice_shutdown (void);
+
G_END_DECLS
#endif /* GOFFICE_H */
diff --git a/goffice/graph/goffice-graph.h b/goffice/graph/goffice-graph.h
index f4ab9de..4f72bf8 100644
--- a/goffice/graph/goffice-graph.h
+++ b/goffice/graph/goffice-graph.h
@@ -75,7 +75,7 @@ typedef struct {
double w, h;
} GogViewRequisition;
-typedef struct {
+typedef struct _GogViewAllocation {
double w, h;
double x, y;
} GogViewAllocation;
@@ -205,4 +205,47 @@ extern int goffice_graph_debug_level;
G_END_DECLS
+#include <goffice/goffice.h>
+
+#include <goffice/graph/gog-object.h>
+#include <goffice/graph/gog-styled-object.h>
+#include <goffice/graph/gog-trend-line.h>
+#include <goffice/graph/gog-view.h>
+#include <goffice/graph/gog-outlined-object.h>
+#include <goffice/graph/gog-data-set.h>
+#include <goffice/graph/gog-series.h>
+#include <goffice/graph/gog-series-impl.h>
+
+#include <goffice/graph/gog-3d-box.h>
+#include <goffice/graph/gog-axis-line.h>
+#include <goffice/graph/gog-axis-line-impl.h>
+#include <goffice/graph/gog-axis.h>
+#include <goffice/graph/gog-chart.h>
+#include <goffice/graph/gog-chart-impl.h>
+#include <goffice/graph/gog-chart-map.h>
+#include <goffice/graph/gog-chart-map-3d.h>
+#include <goffice/graph/gog-child-button.h>
+#include <goffice/graph/gog-control-foocanvas.h>
+#include <goffice/graph/gog-data-allocator.h>
+#ifdef GOFFICE_WITH_LASEM
+#include <goffice/graph/gog-equation.h>
+#endif
+#include <goffice/graph/gog-error-bar.h>
+#include <goffice/graph/gog-graph.h>
+#include <goffice/graph/gog-graph-impl.h>
+#include <goffice/graph/gog-grid.h>
+#include <goffice/graph/gog-grid-line.h>
+#include <goffice/graph/gog-guru.h>
+#include <goffice/graph/gog-label.h>
+#include <goffice/graph/gog-legend.h>
+#include <goffice/graph/gog-object-xml.h>
+#include <goffice/graph/gog-plot-engine.h>
+#include <goffice/graph/gog-plot.h>
+#include <goffice/graph/gog-plot-impl.h>
+#include <goffice/graph/gog-reg-curve.h>
+#include <goffice/graph/gog-renderer.h>
+#include <goffice/graph/gog-series-lines.h>
+#include <goffice/graph/gog-smoothed-curve.h>
+#include <goffice/graph/gog-theme.h>
+
#endif /* GOFFICE_GRAPH_H */
diff --git a/goffice/graph/gog-3d-box.h b/goffice/graph/gog-3d-box.h
index 022b3e9..c02dbde 100644
--- a/goffice/graph/gog-3d-box.h
+++ b/goffice/graph/gog-3d-box.h
@@ -22,9 +22,7 @@
#ifndef GOG_3D_BOX_H
#define GOG_3D_BOX_H
-#include <goffice/graph/goffice-graph.h>
-#include <goffice/graph/gog-object.h>
-#include <goffice/math/go-matrix3x3.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-axis-line-impl.h b/goffice/graph/gog-axis-line-impl.h
index d3c4644..c900aa0 100644
--- a/goffice/graph/gog-axis-line-impl.h
+++ b/goffice/graph/gog-axis-line-impl.h
@@ -22,11 +22,7 @@
#ifndef GOG_AXIS_LINE_IMPL_H
#define GOG_AXIS_LINE_IMPL_H
-#include <goffice/graph/gog-axis-line.h>
-#include <goffice/graph/gog-data-set.h>
-#include <goffice/graph/gog-styled-object.h>
-#include <goffice/graph/gog-view.h>
-#include <glib-object.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-axis-line.c b/goffice/graph/gog-axis-line.c
index a880713..2987dc8 100644
--- a/goffice/graph/gog-axis-line.c
+++ b/goffice/graph/gog-axis-line.c
@@ -20,25 +20,10 @@
*/
#include <goffice/goffice-config.h>
-
-#include <goffice/graph/gog-axis-line-impl.h>
-#include <goffice/graph/gog-axis.h>
-#include <goffice/graph/gog-chart.h>
-#include <goffice/graph/gog-chart-map.h>
-#include <goffice/graph/gog-chart-map-3d.h>
-#include <goffice/graph/gog-data-allocator.h>
-#include <goffice/graph/gog-renderer.h>
-#include <goffice/utils/go-style.h>
-#include <goffice/graph/gog-theme.h>
-#include <goffice/math/go-math.h>
-#include <goffice/utils/go-persist.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
-#ifdef GOFFICE_WITH_GTK
-#include <goffice/gtk/goffice-gtk.h>
-#endif
-
#include <glib/gi18n-lib.h>
#include <string.h>
diff --git a/goffice/graph/gog-axis-line.h b/goffice/graph/gog-axis-line.h
index 67572ee..b004046 100644
--- a/goffice/graph/gog-axis-line.h
+++ b/goffice/graph/gog-axis-line.h
@@ -22,8 +22,7 @@
#ifndef GOG_AXIS_BASE_H
#define GOG_AXIS_BASE_H
-#include <goffice/graph/goffice-graph.h>
-#include <glib-object.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-axis.c b/goffice/graph/gog-axis.c
index 606a1e0..acd94e7 100644
--- a/goffice/graph/gog-axis.c
+++ b/goffice/graph/gog-axis.c
@@ -20,35 +20,11 @@
*/
#include <goffice/goffice-config.h>
-#include <goffice/graph/gog-axis.h>
-#include <goffice/graph/gog-axis-line-impl.h>
-#include <goffice/graph/gog-grid-line.h>
-#include <goffice/graph/gog-theme.h>
-#include <goffice/graph/gog-data-set.h>
-#include <goffice/graph/gog-data-allocator.h>
-#include <goffice/graph/gog-view.h>
-#include <goffice/graph/gog-chart.h>
-#include <goffice/graph/gog-label.h>
-#include <goffice/graph/gog-plot.h>
-#include <goffice/graph/gog-plot-impl.h>
-#include <goffice/graph/gog-renderer.h>
-#include <goffice/math/go-math.h>
-#include <goffice/utils/go-format.h>
-#include <goffice/utils/datetime.h>
-#include <goffice/utils/go-persist.h>
-#include <goffice/utils/go-glib-extras.h>
-#include <goffice/utils/go-style.h>
-#include <goffice/utils/go-styled-object.h>
-#include <goffice/data/go-data-simple.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
-#ifdef GOFFICE_WITH_GTK
-#include <goffice/gtk/goffice-gtk.h>
-#include <goffice/gtk/go-format-sel.h>
-#endif
-
#include <string.h>
/* It's not important that this is accurate. */
diff --git a/goffice/graph/gog-axis.h b/goffice/graph/gog-axis.h
index 4ccf82d..e9771f2 100644
--- a/goffice/graph/gog-axis.h
+++ b/goffice/graph/gog-axis.h
@@ -22,10 +22,7 @@
#ifndef GOG_AXIS_H
#define GOG_AXIS_H
-#include <goffice/graph/gog-axis-line.h>
-#include <goffice/graph/goffice-graph.h>
-#include <goffice/data/go-data.h>
-#include <glib-object.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-chart-impl.h b/goffice/graph/gog-chart-impl.h
index f0b72e0..9c8bd80 100644
--- a/goffice/graph/gog-chart-impl.h
+++ b/goffice/graph/gog-chart-impl.h
@@ -22,10 +22,7 @@
#ifndef GOG_CHART_IMPL_H
#define GOG_CHART_IMPL_H
-#include <goffice/graph/goffice-graph.h>
-#include <goffice/graph/gog-chart.h>
-#include <goffice/graph/gog-outlined-object.h>
-#include <glib-object.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-chart-map-3d.c b/goffice/graph/gog-chart-map-3d.c
index ff810ed..dae1112 100644
--- a/goffice/graph/gog-chart-map-3d.c
+++ b/goffice/graph/gog-chart-map-3d.c
@@ -19,9 +19,8 @@
* USA
*/
-#include <goffice/graph/gog-chart-map-3d.h>
-#include <goffice/graph/gog-3d-box.h>
-#include <goffice/math/go-matrix3x3.h>
+#include <goffice/goffice-config.h>
+#include <goffice/goffice.h>
struct _GogChartMap3D {
GogChart *chart;
diff --git a/goffice/graph/gog-chart-map-3d.h b/goffice/graph/gog-chart-map-3d.h
index 68b8c07..ca318b6 100644
--- a/goffice/graph/gog-chart-map-3d.h
+++ b/goffice/graph/gog-chart-map-3d.h
@@ -22,11 +22,7 @@
#ifndef GOG_CHART_MAP_3D_H
#define GOG_CHART_MAP_3D_H
-#include <goffice/graph/gog-axis.h>
-#include <goffice/graph/gog-chart.h>
-#include <goffice/graph/gog-series.h>
-#include <goffice/utils/go-path.h>
-#include <goffice/utils/go-line.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-chart-map.c b/goffice/graph/gog-chart-map.c
index 1c15777..67680cf 100644
--- a/goffice/graph/gog-chart-map.c
+++ b/goffice/graph/gog-chart-map.c
@@ -19,14 +19,8 @@
* USA
*/
-#include <goffice/graph/gog-chart-map.h>
-#include <goffice/math/go-cspline.h>
-#include <goffice/math/go-math.h>
-#include <goffice/math/go-rangefunc.h>
-#include <goffice/utils/go-bezier.h>
-#include <goffice/utils/go-line.h>
-#include <goffice/utils/go-path.h>
-#include <goffice/utils/go-geometry.h>
+#include <goffice/goffice-config.h>
+#include <goffice/goffice.h>
struct _GogChartMap {
GogChart *chart;
diff --git a/goffice/graph/gog-chart-map.h b/goffice/graph/gog-chart-map.h
index ec23cf2..df7b5ac 100644
--- a/goffice/graph/gog-chart-map.h
+++ b/goffice/graph/gog-chart-map.h
@@ -22,11 +22,7 @@
#ifndef GOG_CHART_MAP_H
#define GOG_CHART_MAP_H
-#include <goffice/graph/gog-axis.h>
-#include <goffice/graph/gog-chart.h>
-#include <goffice/graph/gog-series.h>
-#include <goffice/utils/go-path.h>
-#include <goffice/utils/go-line.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-chart.h b/goffice/graph/gog-chart.h
index e476ff8..842910e 100644
--- a/goffice/graph/gog-chart.h
+++ b/goffice/graph/gog-chart.h
@@ -22,9 +22,7 @@
#ifndef GOG_CHART_H
#define GOG_CHART_H
-#include <goffice/graph/goffice-graph.h>
-#include <goffice/graph/gog-axis.h>
-#include <glib-object.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-child-button.c b/goffice/graph/gog-child-button.c
index 4308b52..37924f6 100644
--- a/goffice/graph/gog-child-button.c
+++ b/goffice/graph/gog-child-button.c
@@ -20,18 +20,8 @@
* USA
*/
-#include "gog-child-button.h"
-
-#include <goffice/graph/gog-chart.h>
-#include <goffice/graph/gog-graph.h>
-#include <goffice/graph/gog-plot-engine.h>
-#include <goffice/graph/gog-plot.h>
-#include <goffice/graph/gog-trend-line.h>
-#include <goffice/gtk/goffice-gtk.h>
-#include <goffice/gtk/go-pixbuf.h>
#include <goffice/goffice-config.h>
-
-#include <gtk/gtk.h>
+#include <goffice/goffice.h>
#include <gdk/gdkpixbuf.h>
#include <gdk/gdkkeysyms.h>
diff --git a/goffice/graph/gog-child-button.h b/goffice/graph/gog-child-button.h
index 462b3a0..ed3883e 100644
--- a/goffice/graph/gog-child-button.h
+++ b/goffice/graph/gog-child-button.h
@@ -23,8 +23,7 @@
#ifndef GOG_CHILD_BUTTON_H
#define GOG_CHILD_BUTTON_H
-#include <gtk/gtk.h>
-#include <goffice/graph/gog-object.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-control-foocanvas.h b/goffice/graph/gog-control-foocanvas.h
index 6271a5e..f493ce2 100644
--- a/goffice/graph/gog-control-foocanvas.h
+++ b/goffice/graph/gog-control-foocanvas.h
@@ -21,9 +21,8 @@
#ifndef GOG_CONTROL_FOOCANVAS_H
#define GOG_CONTROL_FOOCANVAS_H
-#include <goffice/graph/goffice-graph.h>
+#include <goffice/goffice.h>
#include <goffice/cut-n-paste/foocanvas/foo-canvas.h>
-#include <goffice/graph/gog-renderer.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-data-allocator.h b/goffice/graph/gog-data-allocator.h
index 61972b7..8a81c73 100644
--- a/goffice/graph/gog-data-allocator.h
+++ b/goffice/graph/gog-data-allocator.h
@@ -22,9 +22,7 @@
#ifndef GOG_DATA_ALLOCATOR_H
#define GOG_DATA_ALLOCATOR_H
-#include <goffice/graph/goffice-graph.h>
-#include <goffice/utils/go-format.h>
-#include <glib-object.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-data-set.c b/goffice/graph/gog-data-set.c
index 7a9146f..2adea7e 100644
--- a/goffice/graph/gog-data-set.c
+++ b/goffice/graph/gog-data-set.c
@@ -20,12 +20,7 @@
*/
#include <goffice/goffice-config.h>
-#include <goffice/graph/gog-data-set.h>
-#include <goffice/graph/gog-object.h>
-#include <goffice/graph/gog-graph.h>
-#include <goffice/data/go-data.h>
-#include <goffice/data/go-data-simple.h>
-#include <goffice/math/go-math.h>
+#include <goffice/goffice.h>
GType
gog_dataset_get_type (void)
diff --git a/goffice/graph/gog-data-set.h b/goffice/graph/gog-data-set.h
index ac00521..3c37974 100644
--- a/goffice/graph/gog-data-set.h
+++ b/goffice/graph/gog-data-set.h
@@ -22,9 +22,7 @@
#ifndef GOG_DATA_SET_H
#define GOG_DATA_SET_H
-#include <goffice/graph/goffice-graph.h>
-#include <goffice/data/goffice-data.h>
-#include <glib-object.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-equation.h b/goffice/graph/gog-equation.h
index 73f1191..8eb5f29 100644
--- a/goffice/graph/gog-equation.h
+++ b/goffice/graph/gog-equation.h
@@ -22,8 +22,7 @@
#ifndef GOG_EQUATION_H
#define GOG_EQUATION_H
-#include <goffice/graph/goffice-graph.h>
-#include <glib-object.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-error-bar.h b/goffice/graph/gog-error-bar.h
index df546f6..2316e5c 100644
--- a/goffice/graph/gog-error-bar.h
+++ b/goffice/graph/gog-error-bar.h
@@ -22,11 +22,7 @@
#ifndef GOG_ERROR_BAR_H
#define GOG_ERROR_BAR_H
-#include <goffice/goffice-features.h>
-#include <goffice/utils/go-color.h>
-#include "gog-series.h"
-#include "gog-data-set.h"
-#include "gog-axis.h"
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-graph-impl.h b/goffice/graph/gog-graph-impl.h
index 1edfe2f..de84f19 100644
--- a/goffice/graph/gog-graph-impl.h
+++ b/goffice/graph/gog-graph-impl.h
@@ -22,10 +22,7 @@
#ifndef GOG_GRAPH_IMPL_H
#define GOG_GRAPH_IMPL_H
-#include <goffice/graph/goffice-graph.h>
-#include <goffice/graph/gog-graph.h>
-#include <goffice/graph/gog-outlined-object.h>
-#include <glib-object.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-graph.h b/goffice/graph/gog-graph.h
index 9a4a2f5..5db1960 100644
--- a/goffice/graph/gog-graph.h
+++ b/goffice/graph/gog-graph.h
@@ -21,15 +21,9 @@
#ifndef GOG_GRAPH_H
#define GOG_GRAPH_H
-#include <goffice/graph/goffice-graph.h>
-#include <goffice/graph/gog-view.h>
-#include <goffice/data/goffice-data.h>
-#include <goffice/utils/go-image.h>
+#include <goffice/goffice.h>
#include <gsf/gsf.h>
-
-#include <glib-object.h>
-
#include <cairo.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-grid-line.c b/goffice/graph/gog-grid-line.c
index 176e8b2..17813fb 100644
--- a/goffice/graph/gog-grid-line.c
+++ b/goffice/graph/gog-grid-line.c
@@ -20,25 +20,7 @@
*/
#include <goffice/goffice-config.h>
-#include <goffice/graph/gog-axis.h>
-#include <goffice/graph/gog-chart.h>
-#include <goffice/graph/gog-chart-map.h>
-#include <goffice/graph/gog-chart-map-3d.h>
-#include <goffice/graph/gog-data-allocator.h>
-#include <goffice/graph/gog-grid-line.h>
-#include <goffice/graph/gog-renderer.h>
-#include <goffice/utils/go-style.h>
-#include <goffice/utils/go-styled-object.h>
-#include <goffice/graph/gog-theme.h>
-#include <goffice/graph/gog-view.h>
-#include <goffice/data/go-data.h>
-
-#include <goffice/math/go-math.h>
-#include <goffice/utils/go-format.h>
-
-#ifdef GOFFICE_WITH_GTK
-#include <goffice/gtk/goffice-gtk.h>
-#endif
+#include <goffice/goffice.h>
#include <glib/gi18n-lib.h>
diff --git a/goffice/graph/gog-grid-line.h b/goffice/graph/gog-grid-line.h
index ff84186..0770818 100644
--- a/goffice/graph/gog-grid-line.h
+++ b/goffice/graph/gog-grid-line.h
@@ -22,8 +22,7 @@
#ifndef GOG_GRID_LINE_H
#define GOG_GRID_LINE_H
-#include <goffice/graph/goffice-graph.h>
-#include <glib-object.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-grid.h b/goffice/graph/gog-grid.h
index 1ee12c1..a4e58b9 100644
--- a/goffice/graph/gog-grid.h
+++ b/goffice/graph/gog-grid.h
@@ -21,8 +21,7 @@
#ifndef GOG_GRID_H
#define GOG_GRID_H
-#include <goffice/graph/goffice-graph.h>
-#include <glib-object.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-guru.h b/goffice/graph/gog-guru.h
index 4bf326a..406d083 100644
--- a/goffice/graph/gog-guru.h
+++ b/goffice/graph/gog-guru.h
@@ -21,9 +21,7 @@
#ifndef GOG_GURU_H
#define GOG_GURU_H
-#include <goffice/graph/goffice-graph.h>
-#include <goffice/app/goffice-app.h>
-#include <gtk/gtk.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-label.c b/goffice/graph/gog-label.c
index 53b8c4a..f216ab0 100644
--- a/goffice/graph/gog-label.c
+++ b/goffice/graph/gog-label.c
@@ -21,27 +21,11 @@
*/
#include <goffice/goffice-config.h>
-#include <goffice/graph/gog-axis.h>
-#include <goffice/graph/gog-chart.h>
-#include <goffice/graph/gog-data-set.h>
-#include <goffice/graph/gog-label.h>
-#include <goffice/graph/gog-outlined-object.h>
-#include <goffice/utils/go-style.h>
-#include <goffice/graph/gog-theme.h>
-#include <goffice/graph/gog-view.h>
-#include <goffice/graph/gog-renderer.h>
-#include <goffice/graph/gog-reg-curve.h>
-#include <goffice/graph/gog-data-allocator.h>
-#include <goffice/data/go-data.h>
-#include <goffice/utils/go-persist.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
-#ifdef GOFFICE_WITH_GTK
-#include <goffice/gtk/goffice-gtk.h>
-#endif
-
static GType gog_text_view_get_type (void);
enum {
diff --git a/goffice/graph/gog-label.h b/goffice/graph/gog-label.h
index 6219231..6808960 100644
--- a/goffice/graph/gog-label.h
+++ b/goffice/graph/gog-label.h
@@ -22,8 +22,7 @@
#ifndef GOG_LABEL_H
#define GOG_LABEL_H
-#include <goffice/graph/goffice-graph.h>
-#include <glib-object.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-legend.h b/goffice/graph/gog-legend.h
index 86d3809..bb28cdb 100644
--- a/goffice/graph/gog-legend.h
+++ b/goffice/graph/gog-legend.h
@@ -21,8 +21,7 @@
#ifndef GOG_LEGEND_H
#define GOG_LEGEND_H
-#include <goffice/graph/goffice-graph.h>
-#include <glib-object.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-object-xml.h b/goffice/graph/gog-object-xml.h
index dd299e6..a6b70a6 100644
--- a/goffice/graph/gog-object-xml.h
+++ b/goffice/graph/gog-object-xml.h
@@ -21,9 +21,7 @@
#ifndef GOG_OBJECT_XML_H
#define GOG_OBJECT_XML_H
-#include <goffice/graph/goffice-graph.h>
-#include <goffice/utils/goffice-utils.h>
-#include <glib-object.h>
+#include <goffice/goffice.h>
#include <libxml/tree.h>
#include <gsf/gsf-libxml.h>
diff --git a/goffice/graph/gog-object.c b/goffice/graph/gog-object.c
index 36a826d..df63a91 100644
--- a/goffice/graph/gog-object.c
+++ b/goffice/graph/gog-object.c
@@ -20,20 +20,13 @@
*/
#include <goffice/goffice-config.h>
-#include <goffice/graph/gog-object.h>
-#include <goffice/graph/gog-graph-impl.h> /* for gog_graph_request_update */
-#include <goffice/graph/gog-data-set.h>
-#include <goffice/data/go-data.h>
-#include <goffice/utils/go-persist.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
#include <string.h>
#include <stdlib.h>
-#ifdef GOFFICE_WITH_GTK
-#include <goffice/gtk/goffice-gtk.h>
-#endif
typedef struct {
char const *label;
diff --git a/goffice/graph/gog-object.h b/goffice/graph/gog-object.h
index 64f2023..96b0bcc 100644
--- a/goffice/graph/gog-object.h
+++ b/goffice/graph/gog-object.h
@@ -21,13 +21,7 @@
#ifndef GOG_OBJECT_H
#define GOG_OBJECT_H
-#include <goffice/graph/goffice-graph.h>
-#include <goffice/app/goffice-app.h>
-#include <goffice/utils/go-editor.h>
-#include <glib-object.h>
-#ifdef GOFFICE_WITH_GTK
-#include <gtk/gtk.h>
-#endif
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-outlined-object.c b/goffice/graph/gog-outlined-object.c
index f701830..ec76d44 100644
--- a/goffice/graph/gog-outlined-object.c
+++ b/goffice/graph/gog-outlined-object.c
@@ -20,14 +20,7 @@
*/
#include <goffice/goffice-config.h>
-#include <goffice/graph/gog-outlined-object.h>
-#include <goffice/utils/go-style.h>
-#include <goffice/graph/gog-theme.h>
-#include <goffice/graph/gog-graph.h>
-#include <goffice/graph/gog-view.h>
-#include <goffice/graph/gog-renderer.h>
-#include <goffice/utils/go-persist.h>
-#include <goffice/utils/go-units.h>
+#include <goffice/goffice.h>
#include <glib/gi18n-lib.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/goffice/graph/gog-outlined-object.h b/goffice/graph/gog-outlined-object.h
index 310f1c3..c42873e 100644
--- a/goffice/graph/gog-outlined-object.h
+++ b/goffice/graph/gog-outlined-object.h
@@ -21,9 +21,7 @@
#ifndef GOG_OUTLINED_OBJECT_H
#define GOG_OUTLINED_OBJECT_H
-#include <goffice/graph/goffice-graph.h>
-#include <goffice/graph/gog-styled-object.h>
-#include <goffice/graph/gog-view.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-plot-engine.h b/goffice/graph/gog-plot-engine.h
index 4e5a876..7529738 100644
--- a/goffice/graph/gog-plot-engine.h
+++ b/goffice/graph/gog-plot-engine.h
@@ -21,8 +21,7 @@
#ifndef GOG_PLOT_ENGINE_H
#define GOG_PLOT_ENGINE_H
-#include <goffice/graph/goffice-graph.h>
-#include <glib-object.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-plot-impl.h b/goffice/graph/gog-plot-impl.h
index 3be6227..1747330 100644
--- a/goffice/graph/gog-plot-impl.h
+++ b/goffice/graph/gog-plot-impl.h
@@ -22,12 +22,7 @@
#ifndef GOG_PLOT_IMPL_H
#define GOG_PLOT_IMPL_H
-#include <goffice/graph/goffice-graph.h>
-#include <goffice/graph/gog-plot.h>
-#include <goffice/graph/gog-series-impl.h>
-#include <goffice/graph/gog-object.h>
-#include <goffice/graph/gog-view.h>
-#include <glib-object.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-plot.h b/goffice/graph/gog-plot.h
index 5dc4d93..5c1c5f9 100644
--- a/goffice/graph/gog-plot.h
+++ b/goffice/graph/gog-plot.h
@@ -21,10 +21,7 @@
#ifndef GOG_PLOT_H
#define GOG_PLOT_H
-#include <goffice/graph/goffice-graph.h>
-#include <goffice/utils/goffice-utils.h>
-#include <goffice/data/goffice-data.h>
-#include <glib-object.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-reg-curve.c b/goffice/graph/gog-reg-curve.c
index e40e21d..1e56113 100644
--- a/goffice/graph/gog-reg-curve.c
+++ b/goffice/graph/gog-reg-curve.c
@@ -20,28 +20,11 @@
*/
#include <goffice/goffice-config.h>
-#include <goffice/graph/gog-reg-curve.h>
-#include <goffice/graph/gog-data-allocator.h>
-#include <goffice/graph/gog-plot-engine.h>
-#include <goffice/utils/go-style.h>
-#include <goffice/graph/gog-theme.h>
-#include <goffice/graph/gog-view.h>
-#include <goffice/graph/gog-series-impl.h>
-#include <goffice/graph/gog-plot-impl.h>
-#include <goffice/graph/gog-axis.h>
-#include <goffice/graph/gog-renderer.h>
-#include <goffice/graph/gog-chart-map.h>
-#include <goffice/data/go-data.h>
-#include <goffice/math/go-math.h>
-#include <goffice/utils/go-line.h>
-#include <goffice/utils/go-persist.h>
+#include <goffice/goffice.h>
+
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
-#ifdef GOFFICE_WITH_GTK
-#include <goffice/gtk/goffice-gtk.h>
-#endif
-
#define GOG_REG_CURVE_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GOG_TYPE_REG_CURVE, GogRegCurveClass))
static GObjectClass *reg_curve_parent_klass;
diff --git a/goffice/graph/gog-reg-curve.h b/goffice/graph/gog-reg-curve.h
index 020825d..a9a1015 100644
--- a/goffice/graph/gog-reg-curve.h
+++ b/goffice/graph/gog-reg-curve.h
@@ -22,9 +22,7 @@
#ifndef GOG_REG_CURVE_H
#define GOG_REG_CURVE_H
-#include <goffice/graph/gog-trend-line.h>
-#include <goffice/graph/gog-series.h>
-#include <goffice/graph/gog-data-set.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-renderer.h b/goffice/graph/gog-renderer.h
index 1f12edf..7edb0bf 100644
--- a/goffice/graph/gog-renderer.h
+++ b/goffice/graph/gog-renderer.h
@@ -21,18 +21,11 @@
#ifndef GOG_RENDERER_H
#define GOG_RENDERER_H
-#include <goffice/goffice-features.h>
-#include <goffice/graph/goffice-graph.h>
-#include <goffice/utils/go-geometry.h>
-#include <goffice/utils/go-image.h>
-#include <goffice/utils/go-path.h>
-#include <goffice/utils/go-style.h>
-#include <glib-object.h>
+#include <goffice/goffice.h>
#include <gsf/gsf.h>
#ifdef GOFFICE_WITH_GTK
-#include <goffice/gtk/goffice-gtk.h>
#include <gdk/gdk.h>
#else
typedef struct _GdkPixbuf GdkPixbuf;
diff --git a/goffice/graph/gog-series-impl.h b/goffice/graph/gog-series-impl.h
index f803759..e709d6d 100644
--- a/goffice/graph/gog-series-impl.h
+++ b/goffice/graph/gog-series-impl.h
@@ -22,12 +22,7 @@
#ifndef GO_SERIES_IMPL_H
#define GO_SERIES_IMPL_H
-#include <goffice/graph/goffice-graph.h>
-#include <goffice/graph/gog-styled-object.h>
-#include <goffice/graph/gog-series.h>
-#include <goffice/graph/gog-data-set.h>
-#include <goffice/utils/go-style.h>
-#include <glib-object.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-series-lines.c b/goffice/graph/gog-series-lines.c
index b73975c..72d8695 100644
--- a/goffice/graph/gog-series-lines.c
+++ b/goffice/graph/gog-series-lines.c
@@ -20,15 +20,7 @@
*/
#include <goffice/goffice-config.h>
-#include <goffice/graph/gog-plot.h>
-#include <goffice/graph/gog-renderer.h>
-#include <goffice/graph/gog-series-impl.h>
-#include <goffice/utils/go-style.h>
-#include <goffice/graph/gog-theme.h>
-#include <goffice/utils/go-marker.h>
-#include <goffice/utils/go-style.h>
-#include <goffice/utils/go-styled-object.h>
-#include "gog-series-lines.h"
+#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include <string.h>
diff --git a/goffice/graph/gog-series-lines.h b/goffice/graph/gog-series-lines.h
index 108fbb2..9c26a5f 100644
--- a/goffice/graph/gog-series-lines.h
+++ b/goffice/graph/gog-series-lines.h
@@ -22,9 +22,7 @@
#ifndef GOG_SERIES_LINES_H
#define GOG_SERIES_LINES_H
-#include <goffice/graph/goffice-graph.h>
-#include <goffice/graph/gog-styled-object.h>
-#include <goffice/utils/go-path.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-series.c b/goffice/graph/gog-series.c
index 7f4c76a..3326918 100644
--- a/goffice/graph/gog-series.c
+++ b/goffice/graph/gog-series.c
@@ -20,24 +20,11 @@
*/
#include <goffice/goffice-config.h>
-#include <goffice/graph/gog-series-impl.h>
-#include <goffice/graph/gog-data-allocator.h>
-#include <goffice/graph/gog-plot-impl.h>
-#include <goffice/graph/gog-theme.h>
-#include <goffice/utils/go-style.h>
-#include <goffice/graph/gog-error-bar.h>
-#include <goffice/data/go-data.h>
-#include <goffice/utils/go-persist.h>
-#include <goffice/utils/go-style.h>
-#include <goffice/utils/go-styled-object.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
-#ifdef GOFFICE_WITH_GTK
-#include <goffice/gtk/goffice-gtk.h>
-#endif
-
#include <string.h>
/* Keep in sync with GogSeriesFillType enum */
diff --git a/goffice/graph/gog-series.h b/goffice/graph/gog-series.h
index c70b1c8..13eaf98 100644
--- a/goffice/graph/gog-series.h
+++ b/goffice/graph/gog-series.h
@@ -21,10 +21,7 @@
#ifndef GOG_SERIES_H
#define GOG_SERIES_H
-#include <goffice/graph/goffice-graph.h>
-#include <goffice/data/goffice-data.h>
-#include <goffice/graph/gog-object.h>
-#include <goffice/graph/gog-styled-object.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
@@ -81,8 +78,6 @@ void gog_series_set_fill_type (GogSeries *series, GogSeriesFillType fill_ty
GogDataset *gog_series_get_interpolation_params (GogSeries const *series);
#ifdef GOFFICE_WITH_GTK
-#include <gtk/gtk.h>
-
void gog_series_populate_fill_type_combo (GogSeries const *series, GtkComboBox *combo);
GogSeriesFillType gog_series_get_fill_type_from_combo (GogSeries const *series, GtkComboBox *combo);
#endif
diff --git a/goffice/graph/gog-smoothed-curve.c b/goffice/graph/gog-smoothed-curve.c
index c1f7ea6..6be7ac4 100644
--- a/goffice/graph/gog-smoothed-curve.c
+++ b/goffice/graph/gog-smoothed-curve.c
@@ -20,16 +20,8 @@
*/
#include <goffice/goffice-config.h>
-#include "gog-smoothed-curve.h"
-#include <goffice/graph/gog-axis.h>
-#include <goffice/graph/gog-plot-impl.h>
-#include <goffice/graph/gog-plot-engine.h>
-#include <goffice/graph/gog-renderer.h>
-#include <goffice/graph/gog-chart-map.h>
-#include <goffice/graph/gog-series-impl.h>
-#include <goffice/utils/go-style.h>
-#include <goffice/graph/gog-theme.h>
-#include <goffice/graph/gog-view.h>
+#include <goffice/goffice.h>
+
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
diff --git a/goffice/graph/gog-smoothed-curve.h b/goffice/graph/gog-smoothed-curve.h
index 336f83b..aba5f63 100644
--- a/goffice/graph/gog-smoothed-curve.h
+++ b/goffice/graph/gog-smoothed-curve.h
@@ -22,9 +22,7 @@
#ifndef GOG_SMOOTHED_CURVE_H
#define GOG_SMOOTHED_CURVE_H
-#include <goffice/graph/gog-trend-line.h>
-#include <goffice/graph/gog-series.h>
-#include <goffice/graph/gog-data-set.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-styled-object.c b/goffice/graph/gog-styled-object.c
index 444b7ad..b71df92 100644
--- a/goffice/graph/gog-styled-object.c
+++ b/goffice/graph/gog-styled-object.c
@@ -20,14 +20,7 @@
*/
#include <goffice/goffice-config.h>
-#include <goffice/graph/gog-styled-object.h>
-#include <goffice/graph/gog-theme.h>
-#include <goffice/graph/gog-graph.h>
-#include <goffice/app/go-doc.h>
-#include <goffice/utils/go-persist.h>
-#include <goffice/graph/goffice-graph.h>
-#include <goffice/utils/go-style.h>
-#include <goffice/utils/go-styled-object.h>
+#include <goffice/goffice.h>
#include <glib/gi18n-lib.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/goffice/graph/gog-styled-object.h b/goffice/graph/gog-styled-object.h
index 6d7c02d..f84e858 100644
--- a/goffice/graph/gog-styled-object.h
+++ b/goffice/graph/gog-styled-object.h
@@ -21,9 +21,7 @@
#ifndef GOG_STYLED_OBJECT_H
#define GOG_STYLED_OBJECT_H
-#include <goffice/graph/goffice-graph.h>
-#include <goffice/graph/gog-object.h>
-#include <goffice/utils/goffice-utils.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-theme.h b/goffice/graph/gog-theme.h
index f9f62a1..bdf882f 100644
--- a/goffice/graph/gog-theme.h
+++ b/goffice/graph/gog-theme.h
@@ -21,10 +21,7 @@
#ifndef GOG_THEME_H
#define GOG_THEME_H
-#include <goffice/graph/goffice-graph.h>
-#include <goffice/graph/goffice-graph.h>
-#include <goffice/utils/go-style.h>
-#include <glib-object.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-trend-line.c b/goffice/graph/gog-trend-line.c
index 2986481..3fc3fde 100644
--- a/goffice/graph/gog-trend-line.c
+++ b/goffice/graph/gog-trend-line.c
@@ -20,11 +20,8 @@
*/
#include <goffice/goffice-config.h>
-#include "gog-trend-line.h"
-#include <goffice/graph/gog-object-xml.h>
-#include <goffice/graph/gog-plot-engine.h>
-#include <goffice/graph/gog-theme.h>
-#include <goffice/utils/go-style.h>
+#include <goffice/goffice.h>
+
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
diff --git a/goffice/graph/gog-trend-line.h b/goffice/graph/gog-trend-line.h
index 30f8a97..f8bf0cc 100644
--- a/goffice/graph/gog-trend-line.h
+++ b/goffice/graph/gog-trend-line.h
@@ -22,7 +22,7 @@
#ifndef GOG_TREND_LINE_H
#define GOG_TREND_LINE_H
-#include <goffice/graph/gog-styled-object.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/graph/gog-view.c b/goffice/graph/gog-view.c
index 622f536..f872456 100644
--- a/goffice/graph/gog-view.c
+++ b/goffice/graph/gog-view.c
@@ -20,14 +20,7 @@
*/
#include <goffice/goffice-config.h>
-
-#include <goffice/graph/gog-view.h>
-#include <goffice/graph/gog-object.h>
-#include <goffice/graph/gog-renderer.h>
-#include <goffice/utils/go-styled-object.h>
-#include <goffice/utils/go-style.h>
-
-#include <goffice/utils/go-color.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
diff --git a/goffice/graph/gog-view.h b/goffice/graph/gog-view.h
index 46c6dcd..b81a4af 100644
--- a/goffice/graph/gog-view.h
+++ b/goffice/graph/gog-view.h
@@ -21,8 +21,7 @@
#ifndef GOG_VIEW_H
#define GOG_VIEW_H
-#include <goffice/graph/goffice-graph.h>
-#include <glib-object.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/gtk/go-3d-rotation-sel.c b/goffice/gtk/go-3d-rotation-sel.c
index 17756c7..21a5f71 100644
--- a/goffice/gtk/go-3d-rotation-sel.c
+++ b/goffice/gtk/go-3d-rotation-sel.c
@@ -17,17 +17,17 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
* USA.
*/
+
#include <goffice/goffice-config.h>
-#include "go-3d-rotation-sel.h"
+#include <goffice/goffice.h>
-#include <goffice/gtk/goffice-gtk.h>
-#include <goffice/math/go-math.h>
#include <goffice/cut-n-paste/foocanvas/foo-canvas.h>
#include <goffice/cut-n-paste/foocanvas/foo-canvas-util.h>
#include <goffice/cut-n-paste/foocanvas/foo-canvas-line.h>
#include <goffice/cut-n-paste/foocanvas/foo-canvas-widget.h>
#include <goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h>
#include <goffice/cut-n-paste/foocanvas/foo-canvas-polygon.h>
+
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
#include <string.h>
diff --git a/goffice/gtk/go-3d-rotation-sel.h b/goffice/gtk/go-3d-rotation-sel.h
index 7d1315a..16d58c4 100644
--- a/goffice/gtk/go-3d-rotation-sel.h
+++ b/goffice/gtk/go-3d-rotation-sel.h
@@ -19,9 +19,7 @@
#ifndef _GO_3D_ROTATION_SEL_H_
#define _GO_3D_ROTATION_SEL_H_
-#include <gtk/gtk.h>
-#include <goffice/utils/goffice-utils.h>
-#include <goffice/math/go-matrix3x3.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/gtk/go-action-combo-color.h b/goffice/gtk/go-action-combo-color.h
index 66aa7d2..bdfbc8b 100644
--- a/goffice/gtk/go-action-combo-color.h
+++ b/goffice/gtk/go-action-combo-color.h
@@ -22,8 +22,7 @@
#ifndef _GO_ACTION_COMBO_COLOR_H_
#define _GO_ACTION_COMBO_COLOR_H_
-#include <glib-object.h>
-#include <goffice/utils/go-color.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/gtk/go-action-combo-pixmaps.h b/goffice/gtk/go-action-combo-pixmaps.h
index 9479e72..64bc2aa 100644
--- a/goffice/gtk/go-action-combo-pixmaps.h
+++ b/goffice/gtk/go-action-combo-pixmaps.h
@@ -22,8 +22,7 @@
#ifndef _GO_ACTION_COMBO_PIXMAPS_H_
#define _GO_ACTION_COMBO_PIXMAPS_H_
-#include <glib-object.h>
-#include <goffice/gtk/go-combo-pixmaps.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/gtk/go-color-group.c b/goffice/gtk/go-color-group.c
index 87aa856..55ddc06 100644
--- a/goffice/gtk/go-color-group.c
+++ b/goffice/gtk/go-color-group.c
@@ -27,7 +27,8 @@
*/
#include <goffice/goffice-config.h>
-#include "go-color-group.h"
+#include <goffice/goffice.h>
+
#include <gsf/gsf-impl-utils.h>
#include <string.h>
diff --git a/goffice/gtk/go-color-group.h b/goffice/gtk/go-color-group.h
index cc9bf8e..752bc8a 100644
--- a/goffice/gtk/go-color-group.h
+++ b/goffice/gtk/go-color-group.h
@@ -1,6 +1,6 @@
/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
/*
- * go-color-group.h - Utility to keep a shered memory of custom colors
+ * go-color-group.h - Utility to keep a shared memory of custom colors
* between arbitrary widgets.
* Copyright 2000, Michael Levy
* Copyright 2001, Almer S. Tigelaar
@@ -30,8 +30,7 @@
#ifndef _GO_COLOR_GROUP_H_
#define _GO_COLOR_GROUP_H_
-#include <glib-object.h>
-#include <goffice/utils/go-color.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/gtk/go-color-palette.c b/goffice/gtk/go-color-palette.c
index f2b3eb3..e1ceb94 100644
--- a/goffice/gtk/go-color-palette.c
+++ b/goffice/gtk/go-color-palette.c
@@ -28,11 +28,9 @@
*/
#include <goffice/goffice-config.h>
-#include "go-color-palette.h"
-#include <goffice/gtk/goffice-gtk.h>
+#include <goffice/goffice.h>
#include <goffice/utils/go-marshalers.h>
-#include <goffice/utils/go-color.h>
#include <gdk/gdkkeysyms.h>
#include <gdk/gdk.h>
#include <glib/gi18n-lib.h>
diff --git a/goffice/gtk/go-color-palette.h b/goffice/gtk/go-color-palette.h
index 003a8f6..2c1b9eb 100644
--- a/goffice/gtk/go-color-palette.h
+++ b/goffice/gtk/go-color-palette.h
@@ -30,8 +30,7 @@
#ifndef _GO_COLOR_PALETTE_H_
#define _GO_COLOR_PALETTE_H_
-#include <goffice/gtk/go-color-group.h>
-#include <gtk/gtk.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/gtk/go-color-selector.h b/goffice/gtk/go-color-selector.h
index d66176e..74272e3 100644
--- a/goffice/gtk/go-color-selector.h
+++ b/goffice/gtk/go-color-selector.h
@@ -22,8 +22,7 @@
#ifndef GO_COLOR_SELECTOR_H
#define GO_COLOR_SELECTOR_H
-#include <goffice/utils/go-color.h>
-#include <goffice/gtk/go-selector.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/gtk/go-combo-color.h b/goffice/gtk/go-combo-color.h
index ee7048b..a9972b4 100644
--- a/goffice/gtk/go-combo-color.h
+++ b/goffice/gtk/go-combo-color.h
@@ -30,10 +30,7 @@
#ifndef _GO_COMBO_COLOR_H_
#define _GO_COMBO_COLOR_H_
-#include <glib-object.h>
-#include <goffice/gtk/go-color-group.h>
-#include <goffice/utils/go-color.h>
-#include <gtk/gtk.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/gtk/go-font-sel.c b/goffice/gtk/go-font-sel.c
index 77a10af..8f7a898 100644
--- a/goffice/gtk/go-font-sel.c
+++ b/goffice/gtk/go-font-sel.c
@@ -9,10 +9,7 @@
* Almer S. Tigelaar (almer gnome org)
*/
#include <goffice/goffice-config.h>
-#include "go-font-sel.h"
-#include <goffice/utils/go-font.h>
-#include <goffice/gtk/goffice-gtk.h>
-#include <goffice/utils/go-color.h>
+#include <goffice/goffice.h>
#include <goffice/cut-n-paste/foocanvas/foo-canvas.h>
#include <goffice/cut-n-paste/foocanvas/foo-canvas-text.h>
diff --git a/goffice/gtk/go-font-sel.h b/goffice/gtk/go-font-sel.h
index ef3c474..2944e01 100644
--- a/goffice/gtk/go-font-sel.h
+++ b/goffice/gtk/go-font-sel.h
@@ -19,8 +19,7 @@
#ifndef _GO_FONT_SEL_H_
#define _GO_FONT_SEL_H_
-#include <gtk/gtk.h>
-#include <goffice/utils/goffice-utils.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/gtk/go-format-sel.c b/goffice/gtk/go-format-sel.c
index de4369c..989a4e4 100644
--- a/goffice/gtk/go-format-sel.c
+++ b/goffice/gtk/go-format-sel.c
@@ -20,15 +20,8 @@
*/
#include <goffice/goffice-config.h>
-#include "go-format-sel.h"
-
-#include "goffice/gtk/goffice-gtk.h"
-#include "goffice/gtk/go-combo-text.h"
-#include "goffice/utils/go-format.h"
-#include "goffice/utils/go-locale.h"
-#include "goffice/utils/go-color.h"
-#include "goffice/utils/go-marshalers.h"
-#include "goffice/utils/go-glib-extras.h"
+#include <goffice/goffice.h>
+#include <goffice/utils/go-marshalers.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
diff --git a/goffice/gtk/go-format-sel.h b/goffice/gtk/go-format-sel.h
index 908bcec..2e9cce6 100644
--- a/goffice/gtk/go-format-sel.h
+++ b/goffice/gtk/go-format-sel.h
@@ -20,8 +20,7 @@
#ifndef _GO_FORMAT_SEL_H_
#define _GO_FORMAT_SEL_H_
-#include <gtk/gtk.h>
-#include <goffice/utils/goffice-utils.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/gtk/go-gradient-selector.c b/goffice/gtk/go-gradient-selector.c
index 794de31..3016339 100644
--- a/goffice/gtk/go-gradient-selector.c
+++ b/goffice/gtk/go-gradient-selector.c
@@ -19,9 +19,8 @@
* USA
*/
-#include "go-gradient-selector.h"
-
-#include <goffice/utils/go-color.h>
+#include <goffice/goffice-config.h>
+#include <goffice/goffice.h>
typedef struct {
GOColor start_color;
diff --git a/goffice/gtk/go-gradient-selector.h b/goffice/gtk/go-gradient-selector.h
index 5cef186..34a8868 100644
--- a/goffice/gtk/go-gradient-selector.h
+++ b/goffice/gtk/go-gradient-selector.h
@@ -22,8 +22,7 @@
#ifndef GO_GRADIENT_SELECTOR_H
#define GO_GRADIENT_SELECTOR_H
-#include <goffice/utils/go-gradient.h>
-#include <goffice/gtk/go-selector.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/gtk/go-graph-widget.h b/goffice/gtk/go-graph-widget.h
index 14dc5bd..40f587c 100644
--- a/goffice/gtk/go-graph-widget.h
+++ b/goffice/gtk/go-graph-widget.h
@@ -21,10 +21,8 @@
#ifndef _GO_GRAPH_WIDGET_H_
#define _GO_GRAPH_WIDGET_H_
-#include <glib-object.h>
-#include <gtk/gtk.h>
-#include <goffice/graph/gog-chart.h>
-#include <goffice/graph/gog-graph.h>
+#include <goffice/goffice.h>
+#include <goffice/graph/goffice-graph.h>
G_BEGIN_DECLS
diff --git a/goffice/gtk/go-image-sel.h b/goffice/gtk/go-image-sel.h
index 8a07617..d59e1f7 100644
--- a/goffice/gtk/go-image-sel.h
+++ b/goffice/gtk/go-image-sel.h
@@ -23,9 +23,7 @@
#ifndef GO_IMAGE_SEL_H
#define GO_IMAGE_SEL_H
-#include <goffice/app/go-app.h>
-#include <goffice/utils/go-image.h>
-#include <gtk/gtk.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/gtk/go-line-selector.h b/goffice/gtk/go-line-selector.h
index ee04d28..76b31c5 100644
--- a/goffice/gtk/go-line-selector.h
+++ b/goffice/gtk/go-line-selector.h
@@ -22,8 +22,7 @@
#ifndef GO_LINE_SELECTOR_H
#define GO_LINE_SELECTOR_H
-#include <goffice/utils/go-line.h>
-#include <goffice/gtk/go-selector.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/gtk/go-marker-selector.c b/goffice/gtk/go-marker-selector.c
index d6db612..af98f7e 100644
--- a/goffice/gtk/go-marker-selector.c
+++ b/goffice/gtk/go-marker-selector.c
@@ -19,10 +19,9 @@
* USA
*/
-#include "go-marker-selector.h"
-#include "goffice-gtk.h"
+#include <goffice/goffice-config.h>
+#include <goffice/goffice.h>
-#include <goffice/utils/go-color.h>
typedef struct {
GOColor outline_color;
diff --git a/goffice/gtk/go-marker-selector.h b/goffice/gtk/go-marker-selector.h
index 9850a0a..a49a536 100644
--- a/goffice/gtk/go-marker-selector.h
+++ b/goffice/gtk/go-marker-selector.h
@@ -22,8 +22,7 @@
#ifndef GO_MARKER_SELECTOR_H
#define GO_MARKER_SELECTOR_H
-#include <goffice/utils/go-marker.h>
-#include <goffice/gtk/go-selector.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/gtk/go-palette.c b/goffice/gtk/go-palette.c
index f4626fa..6d84d84 100644
--- a/goffice/gtk/go-palette.c
+++ b/goffice/gtk/go-palette.c
@@ -20,9 +20,8 @@
*/
#include <goffice/goffice-config.h>
-#include <goffice/utils/go-image.h>
-#include <goffice/gtk/goffice-gtk.h>
-#include "go-palette.h"
+#include <goffice/goffice.h>
+
#include <glib/gi18n-lib.h>
#include <gdk/gdkkeysyms.h>
diff --git a/goffice/gtk/go-pattern-selector.c b/goffice/gtk/go-pattern-selector.c
index f4cd5da..3201446 100644
--- a/goffice/gtk/go-pattern-selector.c
+++ b/goffice/gtk/go-pattern-selector.c
@@ -19,10 +19,8 @@
* USA
*/
-#include "go-pattern-selector.h"
-#include "goffice-gtk.h"
-
-#include <goffice/utils/go-color.h>
+#include <goffice/goffice-config.h>
+#include <goffice/goffice.h>
typedef struct {
GOColor foreground;
diff --git a/goffice/gtk/go-pattern-selector.h b/goffice/gtk/go-pattern-selector.h
index f216aed..32a99b8 100644
--- a/goffice/gtk/go-pattern-selector.h
+++ b/goffice/gtk/go-pattern-selector.h
@@ -22,8 +22,7 @@
#ifndef GO_PATTERN_SELECTOR_H
#define GO_PATTERN_SELECTOR_H
-#include <goffice/utils/go-pattern.h>
-#include <goffice/gtk/go-selector.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/gtk/go-rotation-sel.c b/goffice/gtk/go-rotation-sel.c
index 40c9484..ed97090 100644
--- a/goffice/gtk/go-rotation-sel.c
+++ b/goffice/gtk/go-rotation-sel.c
@@ -16,16 +16,16 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+
#include <goffice/goffice-config.h>
-#include "go-rotation-sel.h"
+#include <goffice/goffice.h>
-#include <goffice/gtk/goffice-gtk.h>
-#include <goffice/math/go-math.h>
#include <goffice/cut-n-paste/foocanvas/foo-canvas.h>
#include <goffice/cut-n-paste/foocanvas/foo-canvas-util.h>
#include <goffice/cut-n-paste/foocanvas/foo-canvas-line.h>
#include <goffice/cut-n-paste/foocanvas/foo-canvas-widget.h>
#include <goffice/cut-n-paste/foocanvas/foo-canvas-rect-ellipse.h>
+
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
#include <string.h>
diff --git a/goffice/gtk/go-rotation-sel.h b/goffice/gtk/go-rotation-sel.h
index bbc526c..6b467f3 100644
--- a/goffice/gtk/go-rotation-sel.h
+++ b/goffice/gtk/go-rotation-sel.h
@@ -19,8 +19,7 @@
#ifndef _GO_ROTATION_SEL_H_
#define _GO_ROTATION_SEL_H_
-#include <gtk/gtk.h>
-#include <goffice/utils/goffice-utils.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/gtk/go-selector.h b/goffice/gtk/go-selector.h
index d8e9955..6a5e8c2 100644
--- a/goffice/gtk/go-selector.h
+++ b/goffice/gtk/go-selector.h
@@ -22,7 +22,7 @@
#ifndef GO_SELECTOR_H
#define GO_SELECTOR_H
-#include <goffice/gtk/go-palette.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/gtk/goffice-gtk.c b/goffice/gtk/goffice-gtk.c
index 9815db2..60c5dac 100644
--- a/goffice/gtk/goffice-gtk.c
+++ b/goffice/gtk/goffice-gtk.c
@@ -18,14 +18,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
* USA
*/
-#include <goffice/goffice-config.h>
-#include "goffice-gtk.h"
-#include <goffice/app/go-cmd-context.h>
-#include <goffice/utils/go-file.h>
+#include <goffice/goffice-config.h>
+#include <goffice/goffice.h>
#include <goffice/goffice-priv.h>
-#include <goffice/gtk/go-pixbuf.h>
-#include <gtk/gtk.h>
+
#include <gdk/gdkkeysyms.h>
#include <atk/atkrelation.h>
#include <atk/atkrelationset.h>
diff --git a/goffice/gtk/goffice-gtk.h b/goffice/gtk/goffice-gtk.h
index c5dab1f..2c4ae9d 100644
--- a/goffice/gtk/goffice-gtk.h
+++ b/goffice/gtk/goffice-gtk.h
@@ -21,8 +21,38 @@
#include <gtk/gtk.h>
#include <glade/glade-xml.h>
-#include <goffice/app/goffice-app.h>
-#include <goffice/utils/go-image.h>
+#include <goffice/goffice.h>
+
+#include <goffice/gtk/go-palette.h>
+#include <goffice/gtk/go-selector.h>
+
+#include <goffice/gtk/go-3d-rotation-sel.h>
+#include <goffice/gtk/go-action-combo-color.h>
+#include <goffice/gtk/go-action-combo-pixmaps.h>
+#include <goffice/gtk/go-action-combo-stack.h>
+#include <goffice/gtk/go-action-combo-text.h>
+#include <goffice/gtk/go-calendar-button.h>
+#include <goffice/gtk/go-charmap-sel.h>
+#include <goffice/gtk/go-color-group.h>
+#include <goffice/gtk/go-color-palette.h>
+#include <goffice/gtk/go-color-selector.h>
+#include <goffice/gtk/go-combo-box.h>
+#include <goffice/gtk/go-combo-color.h>
+#include <goffice/gtk/go-combo-pixmaps.h>
+#include <goffice/gtk/go-combo-text.h>
+#include <goffice/gtk/go-font-sel.h>
+#include <goffice/gtk/go-format-sel.h>
+#include <goffice/gtk/go-gradient-selector.h>
+#include <goffice/gtk/go-graph-widget.h>
+#include <goffice/gtk/go-image-sel.h>
+#include <goffice/gtk/go-line-selector.h>
+#include <goffice/gtk/go-locale-sel.h>
+#include <goffice/gtk/go-marker-selector.h>
+#include <goffice/gtk/go-optionmenu.h>
+#include <goffice/gtk/go-pattern-selector.h>
+#include <goffice/gtk/go-pixbuf.h>
+#include <goffice/gtk/go-rotation-sel.h>
+
G_BEGIN_DECLS
diff --git a/goffice/math/Makefile.am b/goffice/math/Makefile.am
index 8906819..70a8bd1 100644
--- a/goffice/math/Makefile.am
+++ b/goffice/math/Makefile.am
@@ -13,6 +13,7 @@ libgoffice_math_la_SOURCES = \
libgoffice_math_ladir = $(goffice_include_dir)/math
libgoffice_math_la_HEADERS = \
+ goffice-math.h \
go-math.h \
go-rangefunc.h \
go-regression.h \
diff --git a/goffice/math/go-complex.h b/goffice/math/go-complex.h
index f996b01..3c4e5e2 100644
--- a/goffice/math/go-complex.h
+++ b/goffice/math/go-complex.h
@@ -1,7 +1,7 @@
#ifndef GOFFICE_COMPLEX_H
#define GOFFICE_COMPLEX_H
-#include "go-math.h"
+#include <glib.h>
G_BEGIN_DECLS
@@ -13,6 +13,8 @@ typedef struct {
long double re, im;
} go_complexl;
+#include "go-math.h"
+
/* ------------------------------------------------------------------------- */
char *go_complex_to_string (go_complex const *src, char const *reformat,
diff --git a/goffice/math/goffice-math.h b/goffice/math/goffice-math.h
new file mode 100644
index 0000000..7762d3c
--- /dev/null
+++ b/goffice/math/goffice-math.h
@@ -0,0 +1,14 @@
+#ifndef __GOFFICE_MATH_H
+#define __GOFFICE_MATH_H
+
+#include <goffice/math/go-complex.h>
+#include <goffice/math/go-cspline.h>
+#include <goffice/math/go-distribution.h>
+#include <goffice/math/go-fft.h>
+#include <goffice/math/go-math.h>
+#include <goffice/math/go-matrix3x3.h>
+#include <goffice/math/go-rangefunc.h>
+#include <goffice/math/go-regression.h>
+#include <goffice/math/go-R.h>
+
+#endif
diff --git a/goffice/utils/datetime.h b/goffice/utils/datetime.h
index ac82f79..f3359ea 100644
--- a/goffice/utils/datetime.h
+++ b/goffice/utils/datetime.h
@@ -1,8 +1,7 @@
#ifndef _GO_DATETIME_H_
#define _GO_DATETIME_H_
-#include <goffice/utils/goffice-utils.h>
-#include <glib.h>
+#include <goffice/goffice.h>
#include <time.h>
G_BEGIN_DECLS
diff --git a/goffice/utils/go-bezier.h b/goffice/utils/go-bezier.h
index 69361c5..33560fc 100644
--- a/goffice/utils/go-bezier.h
+++ b/goffice/utils/go-bezier.h
@@ -23,9 +23,7 @@
#ifndef GO_BEZIER_H
#define GO_BEZIER_H
-#include <glib.h>
-#include <cairo.h>
-#include "go-path.h"
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/utils/go-color.h b/goffice/utils/go-color.h
index 4a35e37..ef4e826 100644
--- a/goffice/utils/go-color.h
+++ b/goffice/utils/go-color.h
@@ -26,10 +26,7 @@
#ifndef GO_COLOR_H
#define GO_COLOR_H
-#include <glib.h>
-#include <goffice/goffice-features.h>
-#include <goffice/utils/goffice-utils.h>
-#include <pango/pango.h>
+#include <goffice/goffice.h>
#ifdef GOFFICE_WITH_GTK
#include <gdk/gdk.h>
diff --git a/goffice/utils/go-editor.h b/goffice/utils/go-editor.h
index ced69f3..6617008 100644
--- a/goffice/utils/go-editor.h
+++ b/goffice/utils/go-editor.h
@@ -22,11 +22,7 @@
#ifndef GO_EDITOR_H
#define GO_EDITOR_H
-#ifdef GOFFICE_WITH_GTK
-# include <gtk/gtk.h>
-#else
-# include <glib.h>
-#endif
+#include <goffice/goffice.h>
G_BEGIN_DECLS
@@ -35,11 +31,11 @@ typedef struct {
gpointer widget; /* GtkWidget* */
} GOEditorPage;
-typedef struct {
+struct _GOEditor {
unsigned *store_page; /* pointer to a place for storing last edited page */
GSList *pages; /* GOEditorPage */
GData *registered_widgets;
-} GOEditor;
+};
GOEditor *go_editor_new (void);
void go_editor_free (GOEditor *editor);
diff --git a/goffice/utils/go-file.c b/goffice/utils/go-file.c
index fcc98d8..ab7d29e 100644
--- a/goffice/utils/go-file.c
+++ b/goffice/utils/go-file.c
@@ -22,8 +22,7 @@
*/
#include <goffice/goffice-config.h>
-#include "go-file.h"
-#include "go-glib-extras.h"
+#include <goffice/goffice.h>
#include <gsf/gsf-input-memory.h>
#include <gsf/gsf-input-stdio.h>
#include <gsf/gsf-output-stdio.h>
diff --git a/goffice/utils/go-file.h b/goffice/utils/go-file.h
index a16d1c7..8926c38 100644
--- a/goffice/utils/go-file.h
+++ b/goffice/utils/go-file.h
@@ -20,7 +20,7 @@
#ifndef GO_FILE_H
#define GO_FILE_H
-#include <glib.h>
+#include <goffice/goffice.h>
#include <gsf/gsf.h>
#include <time.h>
diff --git a/goffice/utils/go-font.h b/goffice/utils/go-font.h
index a8e0f08..31b5db7 100644
--- a/goffice/utils/go-font.h
+++ b/goffice/utils/go-font.h
@@ -21,12 +21,7 @@
#ifndef GO_FONT_H
#define GO_FONT_H
-#include <glib.h>
#include <goffice/goffice.h>
-#include <goffice/goffice-features.h>
-#include <goffice/utils/goffice-utils.h>
-#include <pango/pango-font.h>
-#include <pango/pango-context.h>
G_BEGIN_DECLS
diff --git a/goffice/utils/go-format.h b/goffice/utils/go-format.h
index ecce13c..c1814b7 100644
--- a/goffice/utils/go-format.h
+++ b/goffice/utils/go-format.h
@@ -22,15 +22,8 @@
#define GO_FORMAT_H
#include <goffice/goffice.h>
-#include <goffice/goffice-features.h>
-#include <goffice/utils/goffice-utils.h>
-#include <pango/pango-attributes.h>
-#include <pango/pango-layout.h>
-#include <glib.h>
#include <gsf/gsf-libxml.h>
-#include <glib-object.h>
-
G_BEGIN_DECLS
/* Keep these sequential, they are used as the index for go_format_builtins */
diff --git a/goffice/utils/go-geometry.h b/goffice/utils/go-geometry.h
index 059fe86..425805a 100644
--- a/goffice/utils/go-geometry.h
+++ b/goffice/utils/go-geometry.h
@@ -22,8 +22,7 @@
#ifndef GO_GEOMETRY_H
#define GO_GEOMETRY_H
-#include <goffice/graph/goffice-graph.h>
-#include <glib-object.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
@@ -61,7 +60,7 @@ typedef struct {
double alpha; /* Angle from x axis to w edge, in radians */
} GOGeometryOBR;
-#define GOGeometryAABR GogViewAllocation /* x, y: top left corner */
+typedef struct _GogViewAllocation GOGeometryAABR;
void go_geometry_cartesian_to_polar (double x, double y, double *rho, double *theta);
double go_geometry_point_to_segment (double xp, double yp, double xs, double ys, double w, double h);
diff --git a/goffice/utils/go-glib-extras.h b/goffice/utils/go-glib-extras.h
index 02e21ce..2951f26 100644
--- a/goffice/utils/go-glib-extras.h
+++ b/goffice/utils/go-glib-extras.h
@@ -1,10 +1,7 @@
#ifndef GO_GLIB_EXTRAS_H
#define GO_GLIB_EXTRAS_H
-#include <goffice/utils/goffice-utils.h>
-#include <glib.h>
-#include <sys/types.h>
-#include <glib-object.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
@@ -77,14 +74,14 @@ void go_strescape (GString *target, char const *str);
char const *go_strunescape (GString *target, char const *str);
void go_string_append_gstring (GString *target, const GString *src);
void go_string_append_c_n (GString *target, char c, gsize n);
-char const *go_guess_encoding (char const *raw, size_t len,
+char const *go_guess_encoding (char const *raw, gsize len,
char const *user_guess,
char **utf8_str);
char const *go_get_real_name (void);
void go_destroy_password (char *passwd);
-GOMemChunk *go_mem_chunk_new (char const *name, size_t user_atom_size, size_t chunk_size);
+GOMemChunk *go_mem_chunk_new (char const *name, gsize user_atom_size, gsize chunk_size);
void go_mem_chunk_destroy (GOMemChunk *chunk, gboolean expect_leaks);
gpointer go_mem_chunk_alloc (GOMemChunk *chunk);
gpointer go_mem_chunk_alloc0 (GOMemChunk *chunk);
diff --git a/goffice/utils/go-gradient.h b/goffice/utils/go-gradient.h
index dda3c29..355b43a 100644
--- a/goffice/utils/go-gradient.h
+++ b/goffice/utils/go-gradient.h
@@ -22,8 +22,6 @@
#define GO_GRADIENT_H
#include <glib.h>
-#include <goffice/goffice-features.h>
-#include <goffice/utils/goffice-utils.h>
G_BEGIN_DECLS
diff --git a/goffice/utils/go-image.h b/goffice/utils/go-image.h
index a80d3b1..8e17c2a 100644
--- a/goffice/utils/go-image.h
+++ b/goffice/utils/go-image.h
@@ -19,9 +19,7 @@
#ifndef GO_IMAGE_H
#define GO_IMAGE_H
-#include <glib-object.h>
-#include <goffice/goffice-features.h>
-#include <goffice/utils/goffice-utils.h>
+#include <goffice/goffice.h>
#include <gsf/gsf-libxml.h>
#include <cairo.h>
diff --git a/goffice/utils/go-libxml-extras.h b/goffice/utils/go-libxml-extras.h
index 2efcc0a..ce6725c 100644
--- a/goffice/utils/go-libxml-extras.h
+++ b/goffice/utils/go-libxml-extras.h
@@ -21,9 +21,7 @@
#ifndef GO_LIBXML_EXTRAS_H
#define GO_LIBXML_EXTRAS_H
-#include <glib.h>
-#include <glib-object.h>
-#include <goffice/utils/goffice-utils.h>
+#include <goffice/goffice.h>
#include <libxml/tree.h>
#include <gsf/gsf-libxml.h>
diff --git a/goffice/utils/go-line.h b/goffice/utils/go-line.h
index c68b983..0a55a14 100644
--- a/goffice/utils/go-line.h
+++ b/goffice/utils/go-line.h
@@ -22,41 +22,10 @@
#ifndef GO_LINE_H
#define GO_LINE_H
-#include <goffice/graph/goffice-graph.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
-typedef enum {
- GO_LINE_NONE,
- GO_LINE_SOLID,
- GO_LINE_S_DOT,
- GO_LINE_S_DASH_DOT,
- GO_LINE_S_DASH_DOT_DOT,
- GO_LINE_DASH_DOT_DOT_DOT,
- GO_LINE_DOT,
- GO_LINE_S_DASH,
- GO_LINE_DASH,
- GO_LINE_LONG_DASH,
- GO_LINE_DASH_DOT,
- GO_LINE_DASH_DOT_DOT,
- GO_LINE_MAX
-} GOLineDashType;
-
-typedef enum {
- GO_LINE_INTERPOLATION_LINEAR,
- GO_LINE_INTERPOLATION_SPLINE,
- GO_LINE_INTERPOLATION_CLOSED_SPLINE,
- GO_LINE_INTERPOLATION_CUBIC_SPLINE,
- GO_LINE_INTERPOLATION_PARABOLIC_CUBIC_SPLINE,
- GO_LINE_INTERPOLATION_CUBIC_CUBIC_SPLINE,
- GO_LINE_INTERPOLATION_CLAMPED_CUBIC_SPLINE,
- GO_LINE_INTERPOLATION_STEP_START,
- GO_LINE_INTERPOLATION_STEP_END,
- GO_LINE_INTERPOLATION_STEP_CENTER_X,
- GO_LINE_INTERPOLATION_STEP_CENTER_Y,
- GO_LINE_INTERPOLATION_MAX
-} GOLineInterpolation;
-
typedef struct {
double offset;
unsigned int n_dash;
diff --git a/goffice/utils/go-marker.c b/goffice/utils/go-marker.c
index 00183af..a59c2ef 100644
--- a/goffice/utils/go-marker.c
+++ b/goffice/utils/go-marker.c
@@ -20,10 +20,7 @@
*/
#include <goffice/goffice-config.h>
-#include "go-marker.h"
-#include "go-color.h"
-#include <goffice/math/go-math.h>
-#include <goffice/utils/go-cairo.h>
+#include <goffice/goffice.h>
#include <glib/gi18n-lib.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/goffice/utils/go-marker.h b/goffice/utils/go-marker.h
index e208b02..2734dfb 100644
--- a/goffice/utils/go-marker.h
+++ b/goffice/utils/go-marker.h
@@ -22,10 +22,7 @@
#ifndef GO_MARKER_H
#define GO_MARKER_H
-#include <glib-object.h>
-#include <goffice/goffice-features.h>
-#include <goffice/utils/goffice-utils.h>
-#include <cairo.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/utils/go-path.h b/goffice/utils/go-path.h
index 7e3997d..f1661f4 100644
--- a/goffice/utils/go-path.h
+++ b/goffice/utils/go-path.h
@@ -58,8 +58,6 @@ typedef void (GOPathCurveToFunc) (void *closure, GOPathPoint const *point0,
GOPathPoint const *point2);
typedef void (GOPathClosePathFunc) (void *closure);
-typedef struct _GOPath GOPath;
-
#define GO_IS_PATH(x) ((x) != NULL)
GOPath *go_path_new (void);
diff --git a/goffice/utils/go-pattern.h b/goffice/utils/go-pattern.h
index 08955de..567bdc1 100644
--- a/goffice/utils/go-pattern.h
+++ b/goffice/utils/go-pattern.h
@@ -21,9 +21,7 @@
#ifndef GO_PATTERN_H
#define GO_PATTERN_H
-#include <glib.h>
-#include <goffice/goffice-features.h>
-#include <goffice/utils/goffice-utils.h>
+#include <goffice/goffice.h>
#include <libxml/tree.h>
#include <cairo.h>
diff --git a/goffice/utils/go-persist.h b/goffice/utils/go-persist.h
index 58ac43a..40d70dc 100644
--- a/goffice/utils/go-persist.h
+++ b/goffice/utils/go-persist.h
@@ -21,8 +21,7 @@
#ifndef GO_PERSIST_H
#define GO_PERSIST_H
-#include <goffice/utils/goffice-utils.h>
-#include <glib-object.h>
+#include <goffice/goffice.h>
#include <libxml/tree.h>
#include <gsf/gsf-libxml.h>
diff --git a/goffice/utils/go-style.c b/goffice/utils/go-style.c
index 38fe82e..fbb5253 100644
--- a/goffice/utils/go-style.c
+++ b/goffice/utils/go-style.c
@@ -21,32 +21,10 @@
*/
#include <goffice/goffice-config.h>
+#include <goffice/goffice.h>
#include <goffice/app/go-doc.h>
-#include <goffice/math/go-math.h>
-#include <goffice/utils/go-color.h>
-#include <goffice/utils/go-font.h>
-#include <goffice/utils/go-file.h>
-#include <goffice/utils/go-image.h>
-#include <goffice/utils/go-libxml-extras.h>
-#include <goffice/utils/go-line.h>
-#include <goffice/utils/go-marker.h>
-#include <goffice/utils/go-persist.h>
-#include <goffice/utils/go-style.h>
-#include <goffice/utils/go-styled-object.h>
#ifdef GOFFICE_WITH_GTK
-#include <goffice/gtk/goffice-gtk.h>
-#include <goffice/gtk/go-pixbuf.h>
-#include <goffice/gtk/go-font-sel.h>
-#include <goffice/gtk/go-palette.h>
-#include <goffice/gtk/go-rotation-sel.h>
-#include <goffice/gtk/go-color-selector.h>
-#include <goffice/gtk/go-gradient-selector.h>
-#include <goffice/gtk/go-line-selector.h>
-#include <goffice/gtk/go-marker-selector.h>
-#include <goffice/gtk/go-pattern-selector.h>
-#include <goffice/gtk/go-image-sel.h>
-
#include <glade/glade-xml.h>
#include <gdk-pixbuf/gdk-pixdata.h>
#endif
diff --git a/goffice/utils/go-style.h b/goffice/utils/go-style.h
index 889e9ab..985b4a0 100644
--- a/goffice/utils/go-style.h
+++ b/goffice/utils/go-style.h
@@ -21,15 +21,8 @@
#ifndef GO_UTILS_STYLE_H
#define GO_UTILS_STYLE_H
-#include <goffice/utils/goffice-utils.h>
-#include <goffice/app/goffice-app.h>
-#include <goffice/utils/go-font.h>
+#include <goffice/goffice.h>
#include <goffice/utils/go-editor.h>
-#include <goffice/utils/go-gradient.h>
-#include <goffice/utils/go-line.h>
-#include <goffice/utils/go-pattern.h>
-#include <glib-object.h>
-#include <cairo.h>
G_BEGIN_DECLS
diff --git a/goffice/utils/go-styled-object.h b/goffice/utils/go-styled-object.h
index 91d6434..10369b4 100644
--- a/goffice/utils/go-styled-object.h
+++ b/goffice/utils/go-styled-object.h
@@ -23,8 +23,7 @@
#ifndef GO_STYLED_OBJECT_H
#define GO_STYLED_OBJECT_H
-#include <glib-object.h>
-#include <goffice/app/go-doc.h>
+#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/goffice/utils/goffice-utils.h b/goffice/utils/goffice-utils.h
index 3dfea0c..4853f2a 100644
--- a/goffice/utils/goffice-utils.h
+++ b/goffice/utils/goffice-utils.h
@@ -27,6 +27,7 @@
G_BEGIN_DECLS
typedef guint32 GOColor;
+typedef struct _GOEditor GOEditor;
typedef struct _GOFont GOFont;
typedef struct _GOFontMetrics GOFontMetrics;
typedef struct _GOPattern GOPattern;
@@ -34,6 +35,7 @@ typedef struct _GOMarker GOMarker;
typedef struct _GOFormat GOFormat;
typedef struct _GODateConventions GODateConventions;
typedef struct _GOImage GOImage;
+typedef struct _GOPath GOPath;
typedef struct _GOStyle GOStyle;
typedef struct _GOStyledObject GOStyledObject;
@@ -42,6 +44,66 @@ typedef struct _GOMemChunk GOMemChunk;
typedef const char *(*GOTranslateFunc)(char const *path, gpointer func_data);
+typedef enum {
+ GO_LINE_NONE,
+ GO_LINE_SOLID,
+ GO_LINE_S_DOT,
+ GO_LINE_S_DASH_DOT,
+ GO_LINE_S_DASH_DOT_DOT,
+ GO_LINE_DASH_DOT_DOT_DOT,
+ GO_LINE_DOT,
+ GO_LINE_S_DASH,
+ GO_LINE_DASH,
+ GO_LINE_LONG_DASH,
+ GO_LINE_DASH_DOT,
+ GO_LINE_DASH_DOT_DOT,
+ GO_LINE_MAX
+} GOLineDashType;
+
+typedef enum {
+ GO_LINE_INTERPOLATION_LINEAR,
+ GO_LINE_INTERPOLATION_SPLINE,
+ GO_LINE_INTERPOLATION_CLOSED_SPLINE,
+ GO_LINE_INTERPOLATION_CUBIC_SPLINE,
+ GO_LINE_INTERPOLATION_PARABOLIC_CUBIC_SPLINE,
+ GO_LINE_INTERPOLATION_CUBIC_CUBIC_SPLINE,
+ GO_LINE_INTERPOLATION_CLAMPED_CUBIC_SPLINE,
+ GO_LINE_INTERPOLATION_STEP_START,
+ GO_LINE_INTERPOLATION_STEP_END,
+ GO_LINE_INTERPOLATION_STEP_CENTER_X,
+ GO_LINE_INTERPOLATION_STEP_CENTER_Y,
+ GO_LINE_INTERPOLATION_MAX
+} GOLineInterpolation;
+
+
G_END_DECLS
+#include <goffice/goffice.h>
+
+#include <goffice/utils/datetime.h>
+#include <goffice/utils/go-bezier.h>
+#include <goffice/utils/go-cairo.h>
+#include <goffice/utils/go-color.h>
+#include <goffice/utils/go-editor.h>
+#include <goffice/utils/go-file.h>
+#include <goffice/utils/go-font.h>
+#include <goffice/utils/go-format.h>
+#include <goffice/utils/go-geometry.h>
+#include <goffice/utils/go-glib-extras.h>
+#include <goffice/utils/go-gradient.h>
+#include <goffice/utils/go-image.h>
+#include <goffice/utils/go-libxml-extras.h>
+#include <goffice/utils/go-line.h>
+#include <goffice/utils/go-locale.h>
+#include <goffice/utils/go-marker.h>
+#include <goffice/utils/go-pango-extras.h>
+#include <goffice/utils/go-path.h>
+#include <goffice/utils/go-pattern.h>
+#include <goffice/utils/go-persist.h>
+#include <goffice/utils/go-styled-object.h>
+#include <goffice/utils/go-style.h>
+#include <goffice/utils/go-undo.h>
+#include <goffice/utils/go-units.h>
+#include <goffice/utils/regutf8.h>
+
#endif /* GOFFICE_UTILS_H */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
