[gnumeric] Compilation: include cleanups.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Compilation: include cleanups.
- Date: Wed, 16 May 2018 11:58:51 +0000 (UTC)
commit 0170e2aa8d0e697d110532011c28b6f545923ee9
Author: Morten Welinder <terra gnome org>
Date: Wed May 16 07:58:21 2018 -0400
Compilation: include cleanups.
plugins/applix/applix-write.c | 32 +++---
plugins/excel/boot.c | 10 +-
plugins/excel/excel-xml-read.c | 42 ++++----
plugins/excel/excel.h | 2 +-
plugins/excel/ms-chart.c | 2 +-
plugins/excel/ms-excel-read.c | 2 +-
plugins/excel/ms-excel-util.c | 2 +-
plugins/excel/ms-excel-write.c | 6 +-
plugins/excel/ms-excel-write.h | 2 +-
plugins/excel/ms-excel-xf.h | 6 +-
plugins/excel/xls-write-pivot.c | 10 +-
plugins/excel/xlsx-read-drawing.c | 2 +-
plugins/excel/xlsx-read.c | 70 +++++++-------
plugins/excel/xlsx-utils.c | 12 +-
plugins/excel/xlsx-write.c | 66 ++++++------
plugins/fn-numtheory/numtheory.c | 4 +-
plugins/fn-r/extra.c | 2 +-
plugins/fn-r/extra.h | 2 +-
plugins/gda/plugin-gda.c | 14 ++--
plugins/glpk/boot.h | 2 +-
plugins/glpk/gnm-glpk.c | 14 ++--
plugins/guile/guile-support.h | 2 +-
plugins/guile/plugin.c | 14 ++--
plugins/guile/smob-value.c | 2 +-
plugins/guile/smob-value.h | 2 +-
plugins/html/boot.h | 2 +-
plugins/html/font.c | 2 +-
plugins/html/html.c | 28 +++---
plugins/html/html.h | 2 +-
plugins/html/roff.c | 12 +-
plugins/html/roff.h | 2 +-
plugins/lotus-123/lotus-formula.h | 2 +-
plugins/lpsolve/boot.h | 2 +-
plugins/lpsolve/gnm-lpsolve.c | 12 +-
plugins/nlsolve/boot.h | 2 +-
plugins/nlsolve/gnm-nlsolve.c | 16 ++--
plugins/openoffice/openoffice-read.c | 2 +-
plugins/plan-perfect/pln.h | 2 +-
plugins/psiconv/boot.c | 4 +-
plugins/psiconv/psiconv-plugin.h | 2 +-
plugins/psiconv/psiconv-read.c | 32 +++---
plugins/python-loader/py-gnumeric.c | 24 +++---
plugins/python-loader/python-loader.c | 22 ++--
plugins/sample_datasource/sample_datasource.c | 14 ++--
plugins/sc/sc.c | 32 +++---
plugins/sylk/sylk-write.c | 24 +++---
plugins/sylk/sylk.c | 30 +++---
src/Makefile.am | 2 +-
src/application.c | 38 ++++----
src/application.h | 2 +-
src/auto-format.c | 20 ++--
src/auto-format.h | 2 +-
src/cell-draw.c | 18 ++--
src/cell-draw.h | 2 +-
src/cell.c | 28 +++---
src/cell.h | 4 +-
src/cellspan.c | 20 ++--
src/cellspan.h | 2 +-
src/clipboard.c | 38 ++++----
src/clipboard.h | 2 +-
src/cmd-edit.c | 36 ++++----
src/cmd-edit.h | 2 +-
src/collect.c | 24 +++---
src/collect.h | 4 +-
src/colrow.c | 26 +++---
src/colrow.h | 2 +-
src/command-context-stderr.c | 6 +-
src/command-context-stderr.h | 2 +-
src/command-context.c | 6 +-
src/command-context.h | 2 +-
src/commands.c | 104 ++++++++++----------
src/commands.h | 4 +-
src/complete-sheet.c | 14 ++--
src/complete-sheet.h | 4 +-
src/complete.c | 4 +-
src/complex.c | 6 +-
src/complex.h | 2 +-
src/consolidate.c | 26 +++---
src/consolidate.h | 2 +-
src/criteria.c | 2 +-
src/dependent.c | 30 +++---
src/dependent.h | 2 +-
src/dialogs/dao-gui-utils.c | 10 +-
src/dialogs/dao-gui-utils.h | 4 +-
src/dialogs/dialog-about.c | 2 +-
src/dialogs/dialog-advanced-filter.c | 10 +-
src/dialogs/dialog-analysis-tool-chi-squared.c | 8 +-
src/dialogs/dialog-analysis-tool-frequency.c | 8 +-
src/dialogs/dialog-analysis-tool-kaplan-meier.c | 8 +-
src/dialogs/dialog-analysis-tool-normality.c | 8 +-
src/dialogs/dialog-analysis-tool-one-mean.c | 8 +-
.../dialog-analysis-tool-principal-components.c | 8 +-
src/dialogs/dialog-analysis-tool-sign-test.c | 10 +-
.../dialog-analysis-tool-wilcoxon-mann-whitney.c | 8 +-
src/dialogs/dialog-analysis-tools.c | 12 +-
src/dialogs/dialog-autofilter.c | 4 +-
src/dialogs/dialog-autoformat.c | 4 +-
src/dialogs/dialog-autosave.c | 4 +-
src/dialogs/dialog-cell-comment.c | 4 +-
src/dialogs/dialog-cell-format-cond.c | 4 +-
src/dialogs/dialog-cell-format.c | 4 +-
src/dialogs/dialog-cell-sort.c | 4 +-
src/dialogs/dialog-col-row.c | 4 +-
src/dialogs/dialog-col-width.c | 4 +-
src/dialogs/dialog-consolidate.c | 6 +-
src/dialogs/dialog-data-slicer.c | 4 +-
src/dialogs/dialog-data-table.c | 4 +-
src/dialogs/dialog-define-names.c | 4 +-
src/dialogs/dialog-delete-cells.c | 4 +-
src/dialogs/dialog-doc-metadata.c | 4 +-
src/dialogs/dialog-fill-series.c | 8 +-
src/dialogs/dialog-formula-guru.c | 4 +-
src/dialogs/dialog-function-select.c | 4 +-
src/dialogs/dialog-goal-seek.c | 4 +-
src/dialogs/dialog-goto-cell.c | 4 +-
src/dialogs/dialog-hyperlink.c | 8 +-
src/dialogs/dialog-insert-cells.c | 4 +-
src/dialogs/dialog-merge.c | 4 +-
src/dialogs/dialog-password.c | 4 +-
src/dialogs/dialog-paste-special.c | 4 +-
src/dialogs/dialog-plugin-manager.c | 4 +-
src/dialogs/dialog-preferences.c | 22 ++--
src/dialogs/dialog-printer-setup.c | 4 +-
src/dialogs/dialog-quit.c | 2 +-
src/dialogs/dialog-random-generator-cor.c | 8 +-
src/dialogs/dialog-random-generator.c | 8 +-
src/dialogs/dialog-recent.c | 2 +-
src/dialogs/dialog-row-height.c | 4 +-
src/dialogs/dialog-scenarios.c | 8 +-
src/dialogs/dialog-search-replace.c | 4 +-
src/dialogs/dialog-search.c | 4 +-
src/dialogs/dialog-sheet-compare.c | 6 +-
src/dialogs/dialog-sheet-order.c | 4 +-
src/dialogs/dialog-sheet-rename.c | 4 +-
src/dialogs/dialog-sheet-resize.c | 4 +-
src/dialogs/dialog-sheetobject-size.c | 4 +-
src/dialogs/dialog-shuffle.c | 4 +-
src/dialogs/dialog-simulation.c | 6 +-
src/dialogs/dialog-so-list.c | 4 +-
src/dialogs/dialog-so-styled.c | 16 ++--
src/dialogs/dialog-solver.c | 4 +-
src/dialogs/dialog-stf-csv-page.c | 4 +-
src/dialogs/dialog-stf-export.c | 2 +-
src/dialogs/dialog-stf-export.h | 2 +-
src/dialogs/dialog-stf-fixed-page.c | 2 +-
src/dialogs/dialog-stf-format-page.c | 2 +-
src/dialogs/dialog-stf-main-page.c | 2 +-
src/dialogs/dialog-stf-preview.c | 4 +-
src/dialogs/dialog-stf.c | 2 +-
src/dialogs/dialog-stf.h | 4 +-
src/dialogs/dialog-tabulate.c | 32 +++---
src/dialogs/dialog-view.c | 6 +-
src/dialogs/dialog-workbook-attr.c | 4 +-
src/dialogs/dialog-zoom.c | 4 +-
src/dialogs/dialogs.h | 4 +-
src/dialogs/tool-dialogs.h | 6 +-
src/expr-deriv.c | 18 ++--
src/expr-deriv.h | 4 +-
src/expr-impl.h | 6 +-
src/expr-name.c | 20 ++--
src/expr-name.h | 4 +-
src/expr.c | 34 +++---
src/expr.h | 4 +-
src/file-autoft.c | 12 +-
src/file-autoft.h | 4 +-
src/format-template.c | 16 ++--
src/format-template.h | 2 +-
src/func.c | 36 ++++----
src/func.h | 4 +-
src/gnm-cell-combo.c | 6 +-
src/gnm-cell-combo.h | 2 +-
src/gnm-command-impl.h | 2 +-
src/gnm-commands-slicer.c | 18 ++--
src/gnm-commands-slicer.h | 2 +-
src/gnm-data-cache-source.c | 8 +-
src/gnm-data-cache-source.h | 2 +-
src/gnm-datetime.c | 8 +-
src/gnm-datetime.h | 4 +-
src/gnm-format.c | 6 +-
src/gnm-format.h | 2 +-
src/gnm-graph-window.c | 4 +-
src/gnm-pane.c | 54 +++++-----
src/gnm-pane.h | 2 +-
src/gnm-plugin.c | 10 +-
src/gnm-random.c | 10 +-
src/gnm-random.h | 2 +-
src/gnm-sheet-slicer-combo.c | 10 +-
src/gnm-sheet-slicer-combo.h | 4 +-
src/gnm-sheet-slicer.c | 12 +-
src/gnm-sheet-slicer.h | 2 +-
src/gnm-so-filled.c | 14 ++--
src/gnm-so-line.c | 10 +-
src/gnm-so-path.c | 16 ++--
src/gnm-so-polygon.c | 12 +-
src/gnumeric-conf.c | 8 +-
src/gnumeric-conf.h | 4 +-
src/gnumeric-simple-canvas.c | 8 +-
src/gnumeric-simple-canvas.h | 2 +-
src/go-data-cache-field.c | 6 +-
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.c | 6 +-
src/go-data-cache.h | 2 +-
src/go-data-slicer-field.c | 8 +-
src/go-data-slicer-field.h | 2 +-
src/go-data-slicer.c | 6 +-
src/go-data-slicer.h | 2 +-
src/go-val.c | 4 +-
src/go-val.h | 4 +-
src/graph.c | 30 +++---
src/graph.h | 4 +-
src/gui-clipboard.c | 56 +++++-----
src/gui-clipboard.h | 2 +-
src/gui-file.c | 28 +++---
src/gui-file.h | 2 +-
src/gui-util.c | 30 +++---
src/gui-util.h | 4 +-
src/gutils.c | 16 ++--
src/gutils.h | 2 +-
src/history.c | 4 +-
src/history.h | 2 +-
src/hlink-impl.h | 2 +-
src/hlink.c | 32 +++---
src/hlink.h | 4 +-
src/input-msg.c | 4 +-
src/input-msg.h | 2 +-
src/io-context-gtk.c | 14 ++--
src/io-context-gtk.h | 2 +-
src/item-bar.c | 30 +++---
src/item-bar.h | 2 +-
src/item-cursor.c | 50 +++++-----
src/item-cursor.h | 2 +-
src/item-edit.c | 44 ++++----
src/item-edit.h | 2 +-
src/item-grid.c | 54 +++++-----
src/item-grid.h | 2 +-
src/libgnumeric.c | 72 +++++++-------
src/libgnumeric.h | 2 +-
src/main-application.c | 34 +++---
src/mathfunc.c | 8 +-
src/mathfunc.h | 4 +-
src/mstyle.c | 36 ++++----
src/mstyle.h | 4 +-
src/number-match.c | 18 ++--
src/number-match.h | 2 +-
src/parse-util.c | 34 +++---
src/parse-util.h | 4 +-
src/parser.y | 28 +++---
src/pattern.c | 6 +-
src/pattern.h | 2 +-
src/position.c | 18 ++--
src/position.h | 2 +-
src/preview-grid-impl.h | 2 +-
src/preview-grid.c | 28 +++---
src/preview-grid.h | 2 +-
src/print-cell.c | 42 ++++----
src/print-cell.h | 4 +-
src/print-info.c | 32 +++---
src/print-info.h | 4 +-
src/print.c | 50 +++++-----
src/print.h | 2 +-
src/rangefunc-strings.c | 4 +-
src/rangefunc-strings.h | 2 +-
src/rangefunc.c | 12 +-
src/rangefunc.h | 2 +-
src/ranges.c | 30 +++---
src/ranges.h | 2 +-
src/regression.h | 2 +-
src/rendered-value.c | 32 +++---
src/rendered-value.h | 2 +-
src/search.c | 26 +++---
src/selection.c | 38 ++++----
src/selection.h | 2 +-
src/session.c | 2 +-
src/session.h | 2 +-
src/sheet-autofill.c | 26 +++---
src/sheet-autofill.h | 2 +-
src/sheet-control-gui-priv.h | 6 +-
src/sheet-control-gui.c | 80 ++++++++--------
src/sheet-control-gui.h | 4 +-
src/sheet-control-priv.h | 2 +-
src/sheet-control.c | 6 +-
src/sheet-control.h | 2 +-
src/sheet-diff.c | 24 +++---
src/sheet-diff.h | 2 +-
src/sheet-filter-combo.h | 2 +-
src/sheet-filter.c | 32 +++---
src/sheet-filter.h | 2 +-
src/sheet-merge.c | 26 +++---
src/sheet-merge.h | 2 +-
src/sheet-object-cell-comment.c | 20 ++--
src/sheet-object-cell-comment.h | 2 +-
src/sheet-object-component.c | 18 ++--
src/sheet-object-component.h | 4 +-
src/sheet-object-graph.c | 34 +++---
src/sheet-object-graph.h | 4 +-
src/sheet-object-image.c | 24 +++---
src/sheet-object-image.h | 2 +-
src/sheet-object-impl.h | 2 +-
src/sheet-object-widget-impl.h | 4 +-
src/sheet-object-widget.c | 56 +++++-----
src/sheet-object-widget.h | 2 +-
src/sheet-object.c | 56 +++++-----
src/sheet-object.h | 2 +-
src/sheet-style.c | 22 ++--
src/sheet-style.h | 4 +-
src/sheet-utils.c | 6 +-
src/sheet-utils.h | 2 +-
src/sheet-view.c | 44 ++++----
src/sheet-view.h | 2 +-
src/sheet.c | 82 ++++++++--------
src/sheet.h | 8 +-
src/sort.c | 18 ++--
src/sort.h | 2 +-
src/ssconvert.c | 40 ++++----
src/ssdiff.c | 44 ++++----
src/ssgrep.c | 30 +++---
src/ssindex.c | 34 +++---
src/sstest.c | 44 ++++----
src/stf-export.c | 30 +++---
src/stf-export.h | 2 +-
src/stf-parse.c | 34 +++---
src/stf.c | 52 +++++-----
src/style-border.c | 12 +-
src/style-border.h | 2 +-
src/style-color.c | 6 +-
src/style-color.h | 4 +-
src/style-conditions.c | 16 ++--
src/style-conditions.h | 2 +-
src/style-font.h | 4 +-
src/style.c | 24 +++---
src/style.h | 6 +-
src/tools/analysis-anova.c | 24 +++---
src/tools/analysis-anova.h | 8 +-
src/tools/analysis-auto-expression.c | 16 ++--
src/tools/analysis-auto-expression.h | 10 +-
src/tools/analysis-chi-squared.c | 16 ++--
src/tools/analysis-chi-squared.h | 10 +-
src/tools/analysis-exp-smoothing.c | 22 ++--
src/tools/analysis-exp-smoothing.h | 8 +-
src/tools/analysis-frequency.c | 20 ++--
src/tools/analysis-frequency.h | 8 +-
src/tools/analysis-histogram.c | 20 ++--
src/tools/analysis-histogram.h | 8 +-
src/tools/analysis-kaplan-meier.c | 22 ++--
src/tools/analysis-kaplan-meier.h | 8 +-
src/tools/analysis-normality.c | 22 ++--
src/tools/analysis-normality.h | 8 +-
src/tools/analysis-one-mean-test.c | 16 ++--
src/tools/analysis-one-mean-test.h | 10 +-
src/tools/analysis-principal-components.c | 16 ++--
src/tools/analysis-principal-components.h | 10 +-
src/tools/analysis-sign-test.c | 16 ++--
src/tools/analysis-sign-test.h | 10 +-
src/tools/analysis-signed-rank-test.c | 16 ++--
src/tools/analysis-signed-rank-test.h | 12 +-
src/tools/analysis-tools.c | 46 +++++-----
src/tools/analysis-tools.h | 10 +-
src/tools/analysis-wilcoxon-mann-whitney.c | 16 ++--
src/tools/analysis-wilcoxon-mann-whitney.h | 10 +-
src/tools/auto-correct.c | 12 +-
src/tools/auto-correct.h | 2 +-
src/tools/dao.c | 34 +++---
src/tools/dao.h | 12 +-
src/tools/data-shuffling.c | 6 +-
src/tools/fill-series.c | 26 +++---
src/tools/filter.c | 4 +-
src/tools/gnm-solver.c | 36 ++++----
src/tools/goal-seek.c | 8 +-
src/tools/goal-seek.h | 2 +-
src/tools/random-generator-cor.c | 18 ++--
src/tools/random-generator-cor.h | 6 +-
src/tools/random-generator.c | 30 +++---
src/tools/random-generator.h | 6 +-
src/tools/scenarios.c | 6 +-
src/tools/simulation.c | 4 +-
src/tools/tabulate.c | 38 ++++----
src/tools/tabulate.h | 6 +-
src/tools/tools.h | 4 +-
src/undo.c | 14 ++--
src/undo.h | 8 +-
src/validation-combo.h | 2 +-
src/validation.c | 34 +++---
src/validation.h | 4 +-
src/value-sheet.c | 16 ++--
src/value.c | 20 ++--
src/value.h | 8 +-
src/wbc-gtk-actions.c | 90 +++++++++---------
src/wbc-gtk-edit.c | 56 +++++-----
src/wbc-gtk-impl.h | 12 +-
src/wbc-gtk.c | 78 ++++++++--------
src/wbc-gtk.h | 8 +-
src/widgets/gnm-cell-combo-view-impl.h | 4 +-
src/widgets/gnm-cell-combo-view.c | 16 ++--
src/widgets/gnm-cell-combo-view.h | 2 +-
src/widgets/gnm-dao.c | 4 +-
src/widgets/gnm-filter-combo-view.c | 34 +++---
src/widgets/gnm-fontbutton.c | 2 +-
src/widgets/gnm-format-sel.c | 8 +-
src/widgets/gnm-format-sel.h | 2 +-
src/widgets/gnm-notebook.c | 4 +-
src/widgets/gnm-radiobutton.c | 2 +-
src/widgets/gnm-sheet-sel.c | 10 +-
src/widgets/gnm-sheet-sel.h | 4 +-
src/widgets/gnm-sheet-slicer-combo-view.c | 20 ++--
src/widgets/gnm-so-anchor-mode-chooser.c | 2 +-
src/widgets/gnm-so-anchor-mode-chooser.h | 4 +-
src/widgets/gnm-validation-combo-view.c | 28 +++---
src/widgets/gnm-workbook-sel.c | 8 +-
src/widgets/gnm-workbook-sel.h | 2 +-
src/widgets/gnumeric-cell-renderer-expr-entry.c | 6 +-
src/widgets/gnumeric-cell-renderer-expr-entry.h | 4 +-
src/widgets/gnumeric-cell-renderer-text.c | 2 +-
src/widgets/gnumeric-cell-renderer-toggle.c | 4 +-
src/widgets/gnumeric-dashed-canvas-line.c | 2 +-
src/widgets/gnumeric-dashed-canvas-line.h | 2 +-
src/widgets/gnumeric-expr-entry.c | 4 +-
src/widgets/gnumeric-expr-entry.h | 4 +-
src/widgets/gnumeric-lazy-list.c | 2 +-
src/widgets/gnumeric-text-view.c | 4 +-
src/widgets/gnumeric-text-view.h | 2 +-
src/workbook-cmd-format.c | 42 ++++----
src/workbook-cmd-format.h | 2 +-
src/workbook-control-priv.h | 2 +-
src/workbook-control.c | 32 +++---
src/workbook-control.h | 4 +-
src/workbook-priv.h | 2 +-
src/workbook-view.c | 58 ++++++------
src/workbook-view.h | 4 +-
src/workbook.c | 52 +++++-----
src/workbook.h | 4 +-
src/xml-sax-read.c | 78 ++++++++--------
433 files changed, 2752 insertions(+), 2752 deletions(-)
---
diff --git a/plugins/applix/applix-write.c b/plugins/applix/applix-write.c
index 013835b..e90bdc3 100644
--- a/plugins/applix/applix-write.c
+++ b/plugins/applix/applix-write.c
@@ -26,23 +26,23 @@
#include <gnumeric-config.h>
#include <gnumeric.h>
#include "applix.h"
-#include "application.h"
-#include "expr.h"
-#include "value.h"
-#include "sheet.h"
-#include "number-match.h"
-#include "cell.h"
-#include "parse-util.h"
-#include "sheet-style.h"
-#include "style.h"
-#include "style-border.h"
-#include "style-color.h"
-#include "selection.h"
-#include "position.h"
-#include "ranges.h"
+#include <application.h>
+#include <expr.h>
+#include <value.h>
+#include <sheet.h>
+#include <number-match.h>
+#include <cell.h>
+#include <parse-util.h>
+#include <sheet-style.h>
+#include <style.h>
+#include <style-border.h>
+#include <style-color.h>
+#include <selection.h>
+#include <position.h>
+#include <ranges.h>
#include <goffice/goffice.h>
-#include "workbook-view.h"
-#include "workbook.h"
+#include <workbook-view.h>
+#include <workbook.h>
#include <string.h>
#include <gsf/gsf-output.h>
diff --git a/plugins/excel/boot.c b/plugins/excel/boot.c
index 37a4fa9..458a0c3 100644
--- a/plugins/excel/boot.c
+++ b/plugins/excel/boot.c
@@ -24,11 +24,11 @@
#include <gnumeric-config.h>
#include <gnumeric.h>
-#include "libgnumeric.h"
-#include "command-context.h"
-#include "workbook-view.h"
-#include "workbook.h"
-#include "gnm-plugin.h"
+#include <libgnumeric.h>
+#include <command-context.h>
+#include <workbook-view.h>
+#include <workbook.h>
+#include <gnm-plugin.h>
#include "excel.h"
#include "ms-excel-write.h"
diff --git a/plugins/excel/excel-xml-read.c b/plugins/excel/excel-xml-read.c
index dc5ddf3..0b6388e 100644
--- a/plugins/excel/excel-xml-read.c
+++ b/plugins/excel/excel-xml-read.c
@@ -22,27 +22,27 @@
*/
#include <gnumeric-config.h>
#include <gnumeric.h>
-#include "xml-io-version.h"
-#include "sheet-view.h"
-#include "sheet-style.h"
-#include "sheet-merge.h"
-#include "sheet.h"
-#include "ranges.h"
-#include "style.h"
-#include "style-border.h"
-#include "style-color.h"
-#include "gnm-format.h"
-#include "cell.h"
-#include "position.h"
-#include "expr.h"
-#include "expr-name.h"
-#include "validation.h"
-#include "value.h"
-#include "selection.h"
-#include "command-context.h"
-#include "workbook-view.h"
-#include "workbook.h"
-#include "gutils.h"
+#include <xml-io-version.h>
+#include <sheet-view.h>
+#include <sheet-style.h>
+#include <sheet-merge.h>
+#include <sheet.h>
+#include <ranges.h>
+#include <style.h>
+#include <style-border.h>
+#include <style-color.h>
+#include <gnm-format.h>
+#include <cell.h>
+#include <position.h>
+#include <expr.h>
+#include <expr-name.h>
+#include <validation.h>
+#include <value.h>
+#include <selection.h>
+#include <command-context.h>
+#include <workbook-view.h>
+#include <workbook.h>
+#include <gutils.h>
#include <goffice/goffice.h>
#include <gsf/gsf-libxml.h>
diff --git a/plugins/excel/excel.h b/plugins/excel/excel.h
index 6b31f2d..a631ec4 100644
--- a/plugins/excel/excel.h
+++ b/plugins/excel/excel.h
@@ -12,7 +12,7 @@
#ifndef GNM_MS_EXCEL_H
#define GNM_MS_EXCEL_H
-#include "gnumeric.h"
+#include <gnumeric.h>
#include "ms-biff.h"
void excel_read_workbook (GOIOContext *context, WorkbookView *new_wb,
diff --git a/plugins/excel/ms-chart.c b/plugins/excel/ms-chart.c
index 9ce59f4..e2b2d07 100644
--- a/plugins/excel/ms-chart.c
+++ b/plugins/excel/ms-chart.c
@@ -18,7 +18,7 @@
#include "ms-excel-write.h"
#include "ms-escher.h"
#include "ms-formula-write.h"
-#include "compilation.h"
+#include <compilation.h>
#include <parse-util.h>
#include <gnm-format.h>
diff --git a/plugins/excel/ms-excel-read.c b/plugins/excel/ms-excel-read.c
index 3e9da45..f29763b 100644
--- a/plugins/excel/ms-excel-read.c
+++ b/plugins/excel/ms-excel-read.c
@@ -49,7 +49,7 @@
#include <func.h>
#include <style.h>
#include <style-conditions.h>
-#include "style-font.h"
+#include <style-font.h>
#include <gnm-format.h>
#include <print-info.h>
#include <selection.h>
diff --git a/plugins/excel/ms-excel-util.c b/plugins/excel/ms-excel-util.c
index cc4d700..b6de0f0 100644
--- a/plugins/excel/ms-excel-util.c
+++ b/plugins/excel/ms-excel-util.c
@@ -13,7 +13,7 @@
#include <glib.h>
#include "boot.h"
-#include "style.h"
+#include <style.h>
#include "ms-excel-util.h"
#include <goffice/goffice.h>
#include <glib/gi18n-lib.h>
diff --git a/plugins/excel/ms-excel-write.c b/plugins/excel/ms-excel-write.c
index 6682223..ea56093 100644
--- a/plugins/excel/ms-excel-write.c
+++ b/plugins/excel/ms-excel-write.c
@@ -22,9 +22,9 @@
#include "boot.h"
#include "ms-biff.h"
#include "excel.h"
-#include "ranges.h"
-#include "pattern.h"
-#include "sheet-filter.h"
+#include <ranges.h>
+#include <pattern.h>
+#include <sheet-filter.h>
#include "ms-excel-write.h"
#include "ms-excel-xf.h"
#include "ms-escher.h"
diff --git a/plugins/excel/ms-excel-write.h b/plugins/excel/ms-excel-write.h
index f3e970d..fc59a86 100644
--- a/plugins/excel/ms-excel-write.h
+++ b/plugins/excel/ms-excel-write.h
@@ -15,7 +15,7 @@
#include "ms-biff.h"
#include "ms-excel-biff.h"
#include "ms-excel-util.h"
-#include "style.h"
+#include <style.h>
#include <goffice-data.h>
typedef struct {
diff --git a/plugins/excel/ms-excel-xf.h b/plugins/excel/ms-excel-xf.h
index ab746cd..4b64606 100644
--- a/plugins/excel/ms-excel-xf.h
+++ b/plugins/excel/ms-excel-xf.h
@@ -12,9 +12,9 @@
#ifndef GNM_MS_EXCEL_XF_H
#define GNM_MS_EXCEL_XF_H
-#include "style.h"
-#include "style-border.h"
-#include "style-color.h"
+#include <style.h>
+#include <style-border.h>
+#include <style-color.h>
#define STYLE_TOP (MSTYLE_BORDER_TOP - MSTYLE_BORDER_TOP)
#define STYLE_BOTTOM (MSTYLE_BORDER_BOTTOM - MSTYLE_BORDER_TOP)
diff --git a/plugins/excel/xls-write-pivot.c b/plugins/excel/xls-write-pivot.c
index 96add48..9780c11 100644
--- a/plugins/excel/xls-write-pivot.c
+++ b/plugins/excel/xls-write-pivot.c
@@ -23,11 +23,11 @@
#include <gnumeric-config.h>
#include <gnumeric.h>
#include "ms-excel-write.h"
-#include "gnm-datetime.h"
-#include "workbook.h"
-#include "go-val.h"
-#include "go-data-cache.h"
-#include "go-data-cache-field.h"
+#include <gnm-datetime.h>
+#include <workbook.h>
+#include <go-val.h>
+#include <go-data-cache.h>
+#include <go-data-cache-field.h>
#include <gsf/gsf-outfile.h>
#include <gsf/gsf-output.h>
diff --git a/plugins/excel/xlsx-read-drawing.c b/plugins/excel/xlsx-read-drawing.c
index a9833b0..6fcaed5 100644
--- a/plugins/excel/xlsx-read-drawing.c
+++ b/plugins/excel/xlsx-read-drawing.c
@@ -22,7 +22,7 @@
* USA
*/
-#include "sheet-object-widget.h"
+#include <sheet-object-widget.h>
#undef DEBUG_AXIS
#undef DEBUG_COLOR
diff --git a/plugins/excel/xlsx-read.c b/plugins/excel/xlsx-read.c
index 54b812b..e2d6055 100644
--- a/plugins/excel/xlsx-read.c
+++ b/plugins/excel/xlsx-read.c
@@ -23,46 +23,46 @@
#include "xlsx-utils.h"
#include "ms-excel-write.h"
-#include "sheet-view.h"
-#include "sheet-style.h"
-#include "sheet-merge.h"
-#include "sheet.h"
-#include "ranges.h"
-#include "style.h"
-#include "style-border.h"
-#include "style-color.h"
-#include "style-conditions.h"
-#include "gnm-format.h"
-#include "cell.h"
-#include "position.h"
-#include "expr.h"
-#include "expr-name.h"
-#include "print-info.h"
-#include "validation.h"
-#include "input-msg.h"
-#include "value.h"
-#include "sheet-filter.h"
-#include "hlink.h"
-#include "selection.h"
-#include "command-context.h"
-#include "workbook-view.h"
-#include "workbook.h"
-#include "gutils.h"
-#include "graph.h"
-#include "sheet-object-graph.h"
-#include "sheet-object-cell-comment.h"
-#include "gnm-sheet-slicer.h"
-#include "gnm-so-filled.h"
-#include "gnm-so-line.h"
-#include "sheet-object-image.h"
-#include "number-match.h"
+#include <sheet-view.h>
+#include <sheet-style.h>
+#include <sheet-merge.h>
+#include <sheet.h>
+#include <ranges.h>
+#include <style.h>
+#include <style-border.h>
+#include <style-color.h>
+#include <style-conditions.h>
+#include <gnm-format.h>
+#include <cell.h>
+#include <position.h>
+#include <expr.h>
+#include <expr-name.h>
+#include <print-info.h>
+#include <validation.h>
+#include <input-msg.h>
+#include <value.h>
+#include <sheet-filter.h>
+#include <hlink.h>
+#include <selection.h>
+#include <command-context.h>
+#include <workbook-view.h>
+#include <workbook.h>
+#include <gutils.h>
+#include <graph.h>
+#include <sheet-object-graph.h>
+#include <sheet-object-cell-comment.h>
+#include <gnm-sheet-slicer.h>
+#include <gnm-so-filled.h>
+#include <gnm-so-line.h>
+#include <sheet-object-image.h>
+#include <number-match.h>
#include "dead-kittens.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 */
+#include <goffice-data.h> /* MOVE TO GOFFCE with slicer code */
+#include <go-data-slicer-field.h> /* MOVE TO GOFFCE with slicer code */
#include <gsf/gsf-libxml.h>
#include <gsf/gsf-input.h>
diff --git a/plugins/excel/xlsx-utils.c b/plugins/excel/xlsx-utils.c
index 3673272..b19b77a 100644
--- a/plugins/excel/xlsx-utils.c
+++ b/plugins/excel/xlsx-utils.c
@@ -27,12 +27,12 @@
#include "xlsx-utils.h"
-#include "parse-util.h"
-#include "position.h"
-#include "workbook.h"
-#include "sheet.h"
-#include "func.h"
-#include "gnm-format.h"
+#include <parse-util.h>
+#include <position.h>
+#include <workbook.h>
+#include <sheet.h>
+#include <func.h>
+#include <gnm-format.h>
#include <goffice/goffice.h>
#include <glib-object.h>
#include <string.h>
diff --git a/plugins/excel/xlsx-write.c b/plugins/excel/xlsx-write.c
index 0a38bdb..0320a65 100644
--- a/plugins/excel/xlsx-write.c
+++ b/plugins/excel/xlsx-write.c
@@ -28,40 +28,40 @@
#include "ms-excel-write.h"
#include "xlsx-utils.h"
-#include "parse-util.h"
-#include "workbook.h"
-#include "workbook-priv.h"
-#include "workbook-view.h"
-#include "sheet.h"
-#include "sheet-style.h"
-#include "sheet-view.h"
-#include "sheet-filter.h"
-#include "sheet-filter-combo.h"
-#include "ranges.h"
-#include "value.h"
-#include "cell.h"
-#include "expr.h"
-#include "func.h"
-#include "style-color.h"
-#include "validation.h"
-#include "hlink.h"
-#include "input-msg.h"
-#include "print-info.h"
-#include "gutils.h"
-#include "sheet-object.h"
-#include "sheet-object-cell-comment.h"
-#include "sheet-object-graph.h"
-#include "sheet-object-widget.h"
-#include "sheet-object-image.h"
-#include "gnm-so-line.h"
-#include "gnm-so-filled.h"
-#include "graph.h"
-#include "style-border.h"
-#include "style-conditions.h"
-#include "gutils.h"
-#include "expr-name.h"
-
-#include "go-val.h"
+#include <parse-util.h>
+#include <workbook.h>
+#include <workbook-priv.h>
+#include <workbook-view.h>
+#include <sheet.h>
+#include <sheet-style.h>
+#include <sheet-view.h>
+#include <sheet-filter.h>
+#include <sheet-filter-combo.h>
+#include <ranges.h>
+#include <value.h>
+#include <cell.h>
+#include <expr.h>
+#include <func.h>
+#include <style-color.h>
+#include <validation.h>
+#include <hlink.h>
+#include <input-msg.h>
+#include <print-info.h>
+#include <gutils.h>
+#include <sheet-object.h>
+#include <sheet-object-cell-comment.h>
+#include <sheet-object-graph.h>
+#include <sheet-object-widget.h>
+#include <sheet-object-image.h>
+#include <gnm-so-line.h>
+#include <gnm-so-filled.h>
+#include <graph.h>
+#include <style-border.h>
+#include <style-conditions.h>
+#include <gutils.h>
+#include <expr-name.h>
+
+#include <go-val.h>
#include <gsf/gsf-output.h>
#include <gsf/gsf-outfile.h>
diff --git a/plugins/fn-numtheory/numtheory.c b/plugins/fn-numtheory/numtheory.c
index ff1cab0..0adf9ae 100644
--- a/plugins/fn-numtheory/numtheory.c
+++ b/plugins/fn-numtheory/numtheory.c
@@ -21,8 +21,8 @@
*/
#include <gnumeric-config.h>
#include <gnumeric.h>
-#include "func.h"
-#include "value.h"
+#include <func.h>
+#include <value.h>
#include <gnm-i18n.h>
#include <goffice/goffice.h>
#include <gnm-plugin.h>
diff --git a/plugins/fn-r/extra.c b/plugins/fn-r/extra.c
index f1dacb6..68c30d4 100644
--- a/plugins/fn-r/extra.c
+++ b/plugins/fn-r/extra.c
@@ -1,5 +1,5 @@
#include <gnumeric-config.h>
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <mathfunc.h>
#include <sf-dpq.h>
#include <sf-trig.h>
diff --git a/plugins/fn-r/extra.h b/plugins/fn-r/extra.h
index ffe5f5e..5eda4bb 100644
--- a/plugins/fn-r/extra.h
+++ b/plugins/fn-r/extra.h
@@ -1,7 +1,7 @@
#ifndef GNM_FN_R_EXTRA_H
#define GNM_FN_R_EXTRA_H
-#include "numbers.h"
+#include <numbers.h>
#include <glib.h>
gnm_float qcauchy (gnm_float p, gnm_float location, gnm_float scale, gboolean lower_tail, gboolean log_p);
diff --git a/plugins/gda/plugin-gda.c b/plugins/gda/plugin-gda.c
index ff17ed0..c64869a 100644
--- a/plugins/gda/plugin-gda.c
+++ b/plugins/gda/plugin-gda.c
@@ -27,13 +27,13 @@
#include <sql-parser/gda-sql-parser.h>
#include <string.h>
-#include "func.h"
-#include "expr.h"
-#include "value.h"
-#include "workbook.h"
-#include "sheet.h"
-#include "gnm-i18n.h"
-#include "gui-util.h"
+#include <func.h>
+#include <expr.h>
+#include <value.h>
+#include <workbook.h>
+#include <sheet.h>
+#include <gnm-i18n.h>
+#include <gui-util.h>
#include <goffice/goffice.h>
#include <gnm-plugin.h>
#include <dead-kittens.h>
diff --git a/plugins/glpk/boot.h b/plugins/glpk/boot.h
index 85142c5..0dd885c 100644
--- a/plugins/glpk/boot.h
+++ b/plugins/glpk/boot.h
@@ -1,7 +1,7 @@
#ifndef GNUMERIC_GLPK_BOOT_H
#define GNUMERIC_GLPK_BOOT_H
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <goffice/goffice.h>
#include <gsf/gsf-output.h>
#include <tools/gnm-solver.h>
diff --git a/plugins/glpk/gnm-glpk.c b/plugins/glpk/gnm-glpk.c
index 32326e6..298ad91 100644
--- a/plugins/glpk/gnm-glpk.c
+++ b/plugins/glpk/gnm-glpk.c
@@ -1,12 +1,12 @@
#include <gnumeric-config.h>
-#include "gnumeric.h"
+#include <gnumeric.h>
#include "boot.h"
-#include "cell.h"
-#include "sheet.h"
-#include "value.h"
-#include "ranges.h"
-#include "gutils.h"
-#include "gnumeric-conf.h"
+#include <cell.h>
+#include <sheet.h>
+#include <value.h>
+#include <ranges.h>
+#include <gutils.h>
+#include <gnumeric-conf.h>
#include <gsf/gsf-impl-utils.h>
#include <gsf/gsf-input-textline.h>
#include <gsf/gsf-input-stdio.h>
diff --git a/plugins/guile/guile-support.h b/plugins/guile/guile-support.h
index dabe239..91e7259 100644
--- a/plugins/guile/guile-support.h
+++ b/plugins/guile/guile-support.h
@@ -2,7 +2,7 @@
#define GNUMERIC_PLUGIN_GUILE_GUILE_SUPPORT_H
#include <libguile.h>
-#include "gnumeric.h"
+#include <gnumeric.h>
SCM value_to_scm (GnmValue const *val, GnmCellRef cell_ref);
GnmValue* scm_to_value (SCM scm);
diff --git a/plugins/guile/plugin.c b/plugins/guile/plugin.c
index bd38af2..c5856de 100644
--- a/plugins/guile/plugin.c
+++ b/plugins/guile/plugin.c
@@ -34,13 +34,13 @@
#include <goffice/goffice.h>
#include <gnm-plugin.h>
-#include "expr.h"
-#include "gutils.h"
-#include "func.h"
-#include "cell.h"
-#include "value.h"
-#include "libgnumeric.h"
-#include "command-context.h"
+#include <expr.h>
+#include <gutils.h>
+#include <func.h>
+#include <cell.h>
+#include <value.h>
+#include <libgnumeric.h>
+#include <command-context.h>
#include "guile-support.h"
#include "smob-value.h"
diff --git a/plugins/guile/smob-value.c b/plugins/guile/smob-value.c
index 869f327..3d3631b 100644
--- a/plugins/guile/smob-value.c
+++ b/plugins/guile/smob-value.c
@@ -29,7 +29,7 @@
#include <stdlib.h>
#include "smob-value.h"
-#include "value.h"
+#include <value.h>
int scm_i_scm2bool (SCM obj);
static long value_tag;
diff --git a/plugins/guile/smob-value.h b/plugins/guile/smob-value.h
index 4252a11..2b2faa4 100644
--- a/plugins/guile/smob-value.h
+++ b/plugins/guile/smob-value.h
@@ -26,7 +26,7 @@
#include <libguile.h>
-#include "value.h"
+#include <value.h>
void init_value_type (void);
diff --git a/plugins/html/boot.h b/plugins/html/boot.h
index ff0aa16..36a9f31 100644
--- a/plugins/html/boot.h
+++ b/plugins/html/boot.h
@@ -21,7 +21,7 @@
#ifndef GNUMERIC_HTML_BOOT_H
#define GNUMERIC_HTML_BOOT_H
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <goffice/goffice.h>
#endif
diff --git a/plugins/html/font.c b/plugins/html/font.c
index 167719a..2fe9b9e 100644
--- a/plugins/html/font.c
+++ b/plugins/html/font.c
@@ -21,7 +21,7 @@
#include <gnumeric-config.h>
#include <gnumeric.h>
#include "font.h"
-#include "style.h"
+#include <style.h>
static int
font_match (GnmStyle const *mstyle, char const **names)
diff --git a/plugins/html/html.c b/plugins/html/html.c
index c7076bf..7af340f 100644
--- a/plugins/html/html.c
+++ b/plugins/html/html.c
@@ -28,23 +28,23 @@
#include <gnumeric-config.h>
#include <gnumeric.h>
#include <goffice/goffice.h>
-#include "workbook-view.h"
-#include "workbook.h"
-#include "sheet-style.h"
-#include "style.h"
-#include "style-color.h"
+#include <workbook-view.h>
+#include <workbook.h>
+#include <sheet-style.h>
+#include <style.h>
+#include <style-color.h>
#include "html.h"
-#include "cell.h"
-#include "sheet.h"
-#include "sheet-merge.h"
-#include "value.h"
+#include <cell.h>
+#include <sheet.h>
+#include <sheet-merge.h>
+#include <value.h>
#include "font.h"
-#include "cellspan.h"
-#include "style-border.h"
+#include <cellspan.h>
+#include <style-border.h>
#include <rendered-value.h>
-#include "style.h"
-#include "hlink.h"
-#include "gutils.h"
+#include <style.h>
+#include <hlink.h>
+#include <gutils.h>
#include <gsf/gsf-output.h>
#include <string.h>
diff --git a/plugins/html/html.h b/plugins/html/html.h
index 7d64abd..24ecb61 100644
--- a/plugins/html/html.h
+++ b/plugins/html/html.h
@@ -21,7 +21,7 @@
#ifndef GNUMERIC_PLUGIN_HTML_H
#define GNUMERIC_PLUGIN_HTML_H
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <goffice/goffice.h>
void html32_file_save (GOFileSaver const *fs, GOIOContext *io_context,
diff --git a/plugins/html/roff.c b/plugins/html/roff.c
index 930cb3d..70eef5b 100644
--- a/plugins/html/roff.c
+++ b/plugins/html/roff.c
@@ -21,14 +21,14 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "workbook-view.h"
-#include "workbook.h"
-#include "sheet.h"
-#include "style.h"
+#include <workbook-view.h>
+#include <workbook.h>
+#include <sheet.h>
+#include <style.h>
#include "roff.h"
#include "font.h"
-#include "cell.h"
-#include "cellspan.h"
+#include <cell.h>
+#include <cellspan.h>
#include <goffice/goffice.h>
#include <string.h>
diff --git a/plugins/html/roff.h b/plugins/html/roff.h
index df22000..dc9ebfb 100644
--- a/plugins/html/roff.h
+++ b/plugins/html/roff.h
@@ -21,7 +21,7 @@
#ifndef GNUMERIC_PLUGIN_ROFF_H
#define GNUMERIC_PLUGIN_ROFF_H
-#include "gnumeric.h"
+#include <gnumeric.h>
void roff_file_save (GOFileSaver const *fs, GOIOContext *io_context,
WorkbookView const *wb_view, GsfOutput *output);
diff --git a/plugins/lotus-123/lotus-formula.h b/plugins/lotus-123/lotus-formula.h
index fc91457..a770270 100644
--- a/plugins/lotus-123/lotus-formula.h
+++ b/plugins/lotus-123/lotus-formula.h
@@ -1,7 +1,7 @@
#ifndef GNUMERIC_PLUGIN_LOTUS_123_LOTUS_FORMULA_H
#define GNUMERIC_PLUGIN_LOTUS_123_LOTUS_FORMULA_H
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <sheet.h>
#define LOTUS_FORMULA_CONSTANT 0x0
diff --git a/plugins/lpsolve/boot.h b/plugins/lpsolve/boot.h
index f8f3642..a2e8b6b 100644
--- a/plugins/lpsolve/boot.h
+++ b/plugins/lpsolve/boot.h
@@ -1,7 +1,7 @@
#ifndef GNUMERIC_LPSOLVE_BOOT_H
#define GNUMERIC_LPSOLVE_BOOT_H
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <goffice/goffice.h>
#include <gsf/gsf-output.h>
#include <tools/gnm-solver.h>
diff --git a/plugins/lpsolve/gnm-lpsolve.c b/plugins/lpsolve/gnm-lpsolve.c
index 6ebcfdc..7cc9e81 100644
--- a/plugins/lpsolve/gnm-lpsolve.c
+++ b/plugins/lpsolve/gnm-lpsolve.c
@@ -1,11 +1,11 @@
#include <gnumeric-config.h>
-#include "gnumeric.h"
+#include <gnumeric.h>
#include "boot.h"
-#include "cell.h"
-#include "sheet.h"
-#include "value.h"
-#include "ranges.h"
-#include "gnumeric-conf.h"
+#include <cell.h>
+#include <sheet.h>
+#include <value.h>
+#include <ranges.h>
+#include <gnumeric-conf.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
#include <string.h>
diff --git a/plugins/nlsolve/boot.h b/plugins/nlsolve/boot.h
index 392bb53..fb4cef8 100644
--- a/plugins/nlsolve/boot.h
+++ b/plugins/nlsolve/boot.h
@@ -1,7 +1,7 @@
#ifndef GNUMERIC_NLSOLVE_BOOT_H
#define GNUMERIC_NLSOLVE_BOOT_H
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <goffice/goffice.h>
#include <gsf/gsf-output.h>
diff --git a/plugins/nlsolve/gnm-nlsolve.c b/plugins/nlsolve/gnm-nlsolve.c
index 794b343..1eaf612 100644
--- a/plugins/nlsolve/gnm-nlsolve.c
+++ b/plugins/nlsolve/gnm-nlsolve.c
@@ -1,13 +1,13 @@
#include <gnumeric-config.h>
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <tools/gnm-solver.h>
-#include "cell.h"
-#include "sheet.h"
-#include "value.h"
-#include "regression.h"
-#include "rangefunc.h"
-#include "workbook.h"
-#include "mathfunc.h"
+#include <cell.h>
+#include <sheet.h>
+#include <value.h>
+#include <regression.h>
+#include <rangefunc.h>
+#include <workbook.h>
+#include <mathfunc.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
#include <string.h>
diff --git a/plugins/openoffice/openoffice-read.c b/plugins/openoffice/openoffice-read.c
index 63f741f..3faf90c 100644
--- a/plugins/openoffice/openoffice-read.c
+++ b/plugins/openoffice/openoffice-read.c
@@ -54,7 +54,7 @@
#include <gutils.h>
#include <xml-sax.h>
#include <sheet-object-cell-comment.h>
-#include "sheet-object-widget.h"
+#include <sheet-object-widget.h>
#include <style-conditions.h>
#include <gnumeric-conf.h>
#include <mathfunc.h>
diff --git a/plugins/plan-perfect/pln.h b/plugins/plan-perfect/pln.h
index 5fea418..3be785f 100644
--- a/plugins/plan-perfect/pln.h
+++ b/plugins/plan-perfect/pln.h
@@ -10,7 +10,7 @@
#ifndef GNUMERIC_PLN_H
#define GNUMERIC_PLN_H
-#include "sheet.h"
+#include <sheet.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 b72cb3c..b6264e6 100644
--- a/plugins/psiconv/boot.c
+++ b/plugins/psiconv/boot.c
@@ -28,8 +28,8 @@
#include <goffice/goffice.h>
#include <gnm-plugin.h>
#include "psiconv-plugin.h"
-#include "workbook-view.h"
-#include "workbook.h"
+#include <workbook-view.h>
+#include <workbook.h>
#include <string.h>
diff --git a/plugins/psiconv/psiconv-plugin.h b/plugins/psiconv/psiconv-plugin.h
index 59f3f2b..5e70176 100644
--- a/plugins/psiconv/psiconv-plugin.h
+++ b/plugins/psiconv/psiconv-plugin.h
@@ -1,7 +1,7 @@
#ifndef PLUGIN_PSICONV_PLUGIN_H
#define PLUGIN_PSICONV_PLUGIN_H
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <goffice/goffice.h>
#include <gsf/gsf-input.h>
diff --git a/plugins/psiconv/psiconv-read.c b/plugins/psiconv/psiconv-read.c
index 30cfae6..d3edaa4 100644
--- a/plugins/psiconv/psiconv-read.c
+++ b/plugins/psiconv/psiconv-read.c
@@ -28,23 +28,23 @@
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
#include "psiconv-plugin.h"
-#include "application.h"
-#include "expr.h"
-#include "value.h"
-#include "sheet.h"
-#include "number-match.h"
-#include "cell.h"
-#include "parse-util.h"
-#include "sheet-style.h"
-#include "style.h"
-#include "style-border.h"
-#include "style-color.h"
-#include "selection.h"
-#include "position.h"
-#include "ranges.h"
+#include <application.h>
+#include <expr.h>
+#include <value.h>
+#include <sheet.h>
+#include <number-match.h>
+#include <cell.h>
+#include <parse-util.h>
+#include <sheet-style.h>
+#include <style.h>
+#include <style-border.h>
+#include <style-color.h>
+#include <selection.h>
+#include <position.h>
+#include <ranges.h>
#include <goffice/goffice.h>
-#include "workbook-view.h"
-#include "workbook.h"
+#include <workbook-view.h>
+#include <workbook.h>
#include <string.h>
#include <stdlib.h>
diff --git a/plugins/python-loader/py-gnumeric.c b/plugins/python-loader/py-gnumeric.c
index d3ea799..d2e9779 100644
--- a/plugins/python-loader/py-gnumeric.c
+++ b/plugins/python-loader/py-gnumeric.c
@@ -7,18 +7,18 @@
#include <gnumeric-config.h>
#include <gnumeric.h>
-#include "application.h"
-#include "workbook.h"
-#include "cell.h"
-#include "mstyle.h"
-#include "sheet.h"
-#include "sheet-style.h"
-#include "position.h"
-#include "value.h"
-#include "expr.h"
-#include "func.h"
-#include "wbc-gtk.h"
-#include "parse-util.h"
+#include <application.h>
+#include <workbook.h>
+#include <cell.h>
+#include <mstyle.h>
+#include <sheet.h>
+#include <sheet-style.h>
+#include <position.h>
+#include <value.h>
+#include <expr.h>
+#include <func.h>
+#include <wbc-gtk.h>
+#include <parse-util.h>
#include "gnm-py-interpreter.h"
#include "py-gnumeric.h"
diff --git a/plugins/python-loader/python-loader.c b/plugins/python-loader/python-loader.c
index ae678be..dc9d9f3 100644
--- a/plugins/python-loader/python-loader.c
+++ b/plugins/python-loader/python-loader.c
@@ -12,17 +12,17 @@
#include "py-gnumeric.h"
#include "gnm-python.h"
-#include "gnm-plugin.h"
-#include "application.h"
-#include "workbook.h"
-#include "sheet.h"
-#include "workbook-view.h"
-#include "wbc-gtk.h"
-#include "gui-util.h"
-#include "value.h"
-#include "expr.h"
-#include "expr-impl.h"
-#include "func.h"
+#include <gnm-plugin.h>
+#include <application.h>
+#include <workbook.h>
+#include <sheet.h>
+#include <workbook-view.h>
+#include <wbc-gtk.h>
+#include <gui-util.h>
+#include <value.h>
+#include <expr.h>
+#include <expr-impl.h>
+#include <func.h>
#include <goffice/goffice.h>
#include <goffice/app/module-plugin-defs.h>
diff --git a/plugins/sample_datasource/sample_datasource.c b/plugins/sample_datasource/sample_datasource.c
index 847608b..8bb6586 100644
--- a/plugins/sample_datasource/sample_datasource.c
+++ b/plugins/sample_datasource/sample_datasource.c
@@ -22,13 +22,13 @@
#include <gnumeric-config.h>
#include <gnumeric.h>
-#include "func.h"
-#include "value.h"
-#include "workbook.h"
-#include "application.h"
-#include "sheet.h"
-#include "gutils.h"
-#include "gnm-i18n.h"
+#include <func.h>
+#include <value.h>
+#include <workbook.h>
+#include <application.h>
+#include <sheet.h>
+#include <gutils.h>
+#include <gnm-i18n.h>
#include <goffice/goffice.h>
#include <gnm-plugin.h>
diff --git a/plugins/sc/sc.c b/plugins/sc/sc.c
index edfa874..ac7824c 100644
--- a/plugins/sc/sc.c
+++ b/plugins/sc/sc.c
@@ -27,22 +27,22 @@
#include <string.h>
#include <goffice/goffice.h>
#include <gnm-plugin.h>
-#include "sheet-style.h"
-#include "workbook-view.h"
-#include "workbook.h"
-#include "parse-util.h"
-#include "value.h"
-#include "cell.h"
-#include "ranges.h"
-#include "style.h"
-#include "sheet.h"
-#include "expr.h"
-#include "expr-name.h"
-#include "func.h"
-#include "sheet-view.h"
-#include "selection.h"
-#include "rendered-value.h"
-#include "style-font.h"
+#include <sheet-style.h>
+#include <workbook-view.h>
+#include <workbook.h>
+#include <parse-util.h>
+#include <value.h>
+#include <cell.h>
+#include <ranges.h>
+#include <style.h>
+#include <sheet.h>
+#include <expr.h>
+#include <expr-name.h>
+#include <func.h>
+#include <sheet-view.h>
+#include <selection.h>
+#include <rendered-value.h>
+#include <style-font.h>
#include <gsf/gsf-input.h>
#include <gsf/gsf-input-textline.h>
diff --git a/plugins/sylk/sylk-write.c b/plugins/sylk/sylk-write.c
index 5448ea9..78a57f0 100644
--- a/plugins/sylk/sylk-write.c
+++ b/plugins/sylk/sylk-write.c
@@ -22,18 +22,18 @@
#include <gnumeric-config.h>
-#include "workbook-priv.h"
-#include "workbook-view.h"
-#include "sheet.h"
-#include "sheet-style.h"
-#include "expr.h"
-#include "value.h"
-#include "cell.h"
-#include "mstyle.h"
-#include "gutils.h"
-#include "parse-util.h"
-#include "style-border.h"
-#include "ranges.h"
+#include <workbook-priv.h>
+#include <workbook-view.h>
+#include <sheet.h>
+#include <sheet-style.h>
+#include <expr.h>
+#include <value.h>
+#include <cell.h>
+#include <mstyle.h>
+#include <gutils.h>
+#include <parse-util.h>
+#include <style-border.h>
+#include <ranges.h>
#include <goffice/goffice.h>
diff --git a/plugins/sylk/sylk.c b/plugins/sylk/sylk.c
index 8d78280..803fa0b 100644
--- a/plugins/sylk/sylk.c
+++ b/plugins/sylk/sylk.c
@@ -16,21 +16,21 @@
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
#include <goffice/goffice.h>
-#include "workbook-view.h"
-#include "workbook.h"
-#include "cell.h"
-#include "sheet.h"
-#include "value.h"
-#include "ranges.h"
-#include "expr.h"
-#include "gnm-format.h"
-#include "mstyle.h"
-#include "style-border.h"
-#include "style-color.h"
-#include "sheet-style.h"
-#include "number-match.h"
-#include "parse-util.h"
-#include "gutils.h"
+#include <workbook-view.h>
+#include <workbook.h>
+#include <cell.h>
+#include <sheet.h>
+#include <value.h>
+#include <ranges.h>
+#include <expr.h>
+#include <gnm-format.h>
+#include <mstyle.h>
+#include <style-border.h>
+#include <style-color.h>
+#include <sheet-style.h>
+#include <number-match.h>
+#include <parse-util.h>
+#include <gutils.h>
#include <gnm-plugin.h>
#include <string.h>
diff --git a/src/Makefile.am b/src/Makefile.am
index b5a77e6..0ceb0b7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -713,7 +713,7 @@ GENMARSHAL_COMMAND = $(GLIB_GENMARSHAL) --prefix=gnm_
.list.c:
(echo '/* This file has been automatically generated. Do not edit. */' && \
- echo '#include "$*.h"' && \
+ echo '#include <$*.h>' && \
$(GENMARSHAL_COMMAND) --body $< ) >$@
# Depends on this Makefile, because it uses make variables.
diff --git a/src/application.c b/src/application.c
index 8835059..f2fb9b5 100644
--- a/src/application.c
+++ b/src/application.c
@@ -7,30 +7,30 @@
*/
#include <gnumeric-config.h>
#include <string.h>
-#include "gnumeric.h"
-#include "application.h"
-
-#include "clipboard.h"
-#include "selection.h"
-#include "workbook-control.h"
-#include "workbook-view.h"
-#include "workbook.h"
-#include "sheet.h"
-#include "sheet-view.h"
-#include "sheet-private.h"
-#include "sheet-object.h"
-#include "gutils.h"
-#include "ranges.h"
-#include "sheet-object.h"
-#include "commands.h"
-#include "gui-clipboard.h"
-#include "expr-name.h"
-#include "workbook-priv.h"
+#include <gnumeric.h>
+#include <application.h>
+
+#include <clipboard.h>
+#include <selection.h>
+#include <workbook-control.h>
+#include <workbook-view.h>
+#include <workbook.h>
+#include <sheet.h>
+#include <sheet-view.h>
+#include <sheet-private.h>
+#include <sheet-object.h>
+#include <gutils.h>
+#include <ranges.h>
+#include <sheet-object.h>
+#include <commands.h>
+#include <gui-clipboard.h>
+#include <expr-name.h>
+#include <workbook-priv.h>
#include <gnumeric-conf.h>
#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
-#include "gnm-i18n.h"
+#include <gnm-i18n.h>
#define GNM_APP(o) (G_TYPE_CHECK_INSTANCE_CAST((o), GNM_APP_TYPE, GnmApp))
#define GNM_IS_APP(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), GNM_APP_TYPE))
diff --git a/src/application.h b/src/application.h
index 368f7a1..b4166b5 100644
--- a/src/application.h
+++ b/src/application.h
@@ -2,7 +2,7 @@
#ifndef _GNM_APPLICATION_H_
# define _GNM_APPLICATION_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/src/auto-format.c b/src/auto-format.c
index 096e2b8..e1fd01b 100644
--- a/src/auto-format.c
+++ b/src/auto-format.c
@@ -11,17 +11,17 @@
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "auto-format.h"
-
-#include "compilation.h"
-#include "func.h"
-#include "cell.h"
-#include "value.h"
-#include "expr.h"
-#include "expr-impl.h"
-#include "sheet.h"
-#include "workbook.h"
+#include <gnumeric.h>
+#include <auto-format.h>
+
+#include <compilation.h>
+#include <func.h>
+#include <cell.h>
+#include <value.h>
+#include <expr.h>
+#include <expr-impl.h>
+#include <sheet.h>
+#include <workbook.h>
#include <goffice/goffice.h>
/* ------------------------------------------------------------------------- */
diff --git a/src/auto-format.h b/src/auto-format.h
index ca51d15..dd62b42 100644
--- a/src/auto-format.h
+++ b/src/auto-format.h
@@ -2,7 +2,7 @@
#ifndef _GNM_AUTO_FORMAT_H_
# define _GNM_AUTO_FORMAT_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
G_BEGIN_DECLS
diff --git a/src/cell-draw.c b/src/cell-draw.c
index 5b27719..f592b16 100644
--- a/src/cell-draw.c
+++ b/src/cell-draw.c
@@ -8,16 +8,16 @@
* Morten Welinder 2003 (terra gnome org)
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "cell-draw.h"
-
-#include "style.h"
-#include "cell.h"
-#include "sheet.h"
-#include "gnm-format.h"
-#include "rendered-value.h"
-#include "parse-util.h"
-#include "sheet-merge.h"
+#include <gnumeric.h>
+#include <cell-draw.h>
+
+#include <style.h>
+#include <cell.h>
+#include <sheet.h>
+#include <gnm-format.h>
+#include <rendered-value.h>
+#include <parse-util.h>
+#include <sheet-merge.h>
#include <goffice/goffice.h>
#include <gdk/gdk.h>
diff --git a/src/cell-draw.h b/src/cell-draw.h
index b0043a5..00c6307 100644
--- a/src/cell-draw.h
+++ b/src/cell-draw.h
@@ -2,7 +2,7 @@
#ifndef _GNM_CELL_DRAW_H_
# define _GNM_CELL_DRAW_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
G_BEGIN_DECLS
diff --git a/src/cell.c b/src/cell.c
index a82a9de..22afaca 100644
--- a/src/cell.c
+++ b/src/cell.c
@@ -8,21 +8,21 @@
* Copyright (C) 2000-2009 Morten Welinder (terra gnome org)
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "cell.h"
-
-#include "gutils.h"
-#include "workbook.h"
-#include "sheet.h"
-#include "expr.h"
-#include "rendered-value.h"
-#include "value.h"
-#include "style.h"
-#include "ranges.h"
-#include "gnm-format.h"
-#include "number-match.h"
-#include "sheet-style.h"
-#include "parse-util.h"
+#include <gnumeric.h>
+#include <cell.h>
+
+#include <gutils.h>
+#include <workbook.h>
+#include <sheet.h>
+#include <expr.h>
+#include <rendered-value.h>
+#include <value.h>
+#include <style.h>
+#include <ranges.h>
+#include <gnm-format.h>
+#include <number-match.h>
+#include <sheet-style.h>
+#include <parse-util.h>
#include <goffice/goffice.h>
diff --git a/src/cell.h b/src/cell.h
index 0afe302..1a1efa6 100644
--- a/src/cell.h
+++ b/src/cell.h
@@ -2,8 +2,8 @@
#ifndef _GNM_CELL_H_
# define _GNM_CELL_H_
-#include "gnumeric.h"
-#include "dependent.h"
+#include <gnumeric.h>
+#include <dependent.h>
G_BEGIN_DECLS
diff --git a/src/cellspan.c b/src/cellspan.c
index a5166dc..f85ea78 100644
--- a/src/cellspan.c
+++ b/src/cellspan.c
@@ -17,17 +17,17 @@
* the "owner" of the cell to be able to repaint its contents.
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "cellspan.h"
-
-#include "cell.h"
-#include "sheet.h"
-#include "sheet-merge.h"
-#include "sheet-style.h"
-#include "style.h"
-#include "colrow.h"
-#include "value.h"
-#include "rendered-value.h"
+#include <gnumeric.h>
+#include <cellspan.h>
+
+#include <cell.h>
+#include <sheet.h>
+#include <sheet-merge.h>
+#include <sheet-style.h>
+#include <style.h>
+#include <colrow.h>
+#include <value.h>
+#include <rendered-value.h>
static guint
col_hash (gconstpointer key)
diff --git a/src/cellspan.h b/src/cellspan.h
index 980bd66..8246b57 100644
--- a/src/cellspan.h
+++ b/src/cellspan.h
@@ -2,7 +2,7 @@
#ifndef _GNM_CELLSPAN_H_
# define _GNM_CELLSPAN_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
G_BEGIN_DECLS
diff --git a/src/clipboard.c b/src/clipboard.c
index cc597a0..22b098e 100644
--- a/src/clipboard.c
+++ b/src/clipboard.c
@@ -21,26 +21,26 @@
* USA
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "clipboard.h"
-
-#include "sheet.h"
-#include "cell.h"
-#include "sheet-style.h"
-#include "sheet-merge.h"
-#include "dependent.h"
-#include "selection.h"
-#include "command-context.h"
-#include "workbook-control.h"
-#include "workbook.h"
-#include "ranges.h"
-#include "colrow.h"
-#include "expr.h"
-#include "value.h"
-#include "mstyle.h"
-#include "stf-parse.h"
-#include "gnm-format.h"
-#include "sheet-object-cell-comment.h"
+#include <gnumeric.h>
+#include <clipboard.h>
+
+#include <sheet.h>
+#include <cell.h>
+#include <sheet-style.h>
+#include <sheet-merge.h>
+#include <dependent.h>
+#include <selection.h>
+#include <command-context.h>
+#include <workbook-control.h>
+#include <workbook.h>
+#include <ranges.h>
+#include <colrow.h>
+#include <expr.h>
+#include <value.h>
+#include <mstyle.h>
+#include <stf-parse.h>
+#include <gnm-format.h>
+#include <sheet-object-cell-comment.h>
#include <glib/gi18n-lib.h>
#include <locale.h>
diff --git a/src/clipboard.h b/src/clipboard.h
index 89fc8ca..8dc79b8 100644
--- a/src/clipboard.h
+++ b/src/clipboard.h
@@ -2,7 +2,7 @@
#ifndef _GNM_CLIPBOARD_H_
# define _GNM_CLIPBOARD_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/cmd-edit.c b/src/cmd-edit.c
index 692454b..ecafe12 100644
--- a/src/cmd-edit.c
+++ b/src/cmd-edit.c
@@ -21,25 +21,25 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "cmd-edit.h"
-
-#include "application.h"
-#include "command-context.h"
-#include "workbook-control.h"
-#include "workbook.h"
-#include "sheet.h"
-#include "sheet-view.h"
-#include "cell.h"
-#include "expr.h"
-#include "dependent.h"
-#include "selection.h"
-#include "parse-util.h"
-#include "ranges.h"
-#include "commands.h"
-#include "clipboard.h"
-#include "value.h"
-#include "wbc-gtk.h"
+#include <gnumeric.h>
+#include <cmd-edit.h>
+
+#include <application.h>
+#include <command-context.h>
+#include <workbook-control.h>
+#include <workbook.h>
+#include <sheet.h>
+#include <sheet-view.h>
+#include <cell.h>
+#include <expr.h>
+#include <dependent.h>
+#include <selection.h>
+#include <parse-util.h>
+#include <ranges.h>
+#include <commands.h>
+#include <clipboard.h>
+#include <value.h>
+#include <wbc-gtk.h>
/**
* sv_select_cur_row:
diff --git a/src/cmd-edit.h b/src/cmd-edit.h
index 91fd8dd..260da51 100644
--- a/src/cmd-edit.h
+++ b/src/cmd-edit.h
@@ -2,7 +2,7 @@
#ifndef _GNM_CMD_EDIT_H_
# define _GNM_CMD_EDIT_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
G_BEGIN_DECLS
diff --git a/src/collect.c b/src/collect.c
index c630b31..ad28e63 100644
--- a/src/collect.c
+++ b/src/collect.c
@@ -8,19 +8,19 @@
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "collect.h"
-
-#include "func.h"
-#include "application.h"
-#include "value.h"
-#include "expr.h"
-#include "expr-impl.h"
-#include "gnm-datetime.h"
-#include "workbook.h"
-#include "sheet.h"
-#include "ranges.h"
-#include "number-match.h"
+#include <gnumeric.h>
+#include <collect.h>
+
+#include <func.h>
+#include <application.h>
+#include <value.h>
+#include <expr.h>
+#include <expr-impl.h>
+#include <gnm-datetime.h>
+#include <workbook.h>
+#include <sheet.h>
+#include <ranges.h>
+#include <number-match.h>
#include <goffice/goffice.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/collect.h b/src/collect.h
index 8c276e2..466f21c 100644
--- a/src/collect.h
+++ b/src/collect.h
@@ -2,8 +2,8 @@
#ifndef _GNM_COLLECT_H_
# define _GNM_COLLECT_H_
-#include "numbers.h"
-#include "gnumeric.h"
+#include <numbers.h>
+#include <gnumeric.h>
G_BEGIN_DECLS
diff --git a/src/colrow.c b/src/colrow.c
index 080ec37..85e6377 100644
--- a/src/colrow.c
+++ b/src/colrow.c
@@ -20,20 +20,20 @@
* USA
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "colrow.h"
-
-#include "sheet.h"
-#include "sheet-view.h"
-#include "sheet-private.h"
-#include "application.h"
-#include "parse-util.h"
-#include "selection.h"
-#include "ranges.h"
-#include "sheet-merge.h"
-#include "cell.h"
-#include "cellspan.h"
-#include "rendered-value.h"
+#include <gnumeric.h>
+#include <colrow.h>
+
+#include <sheet.h>
+#include <sheet-view.h>
+#include <sheet-private.h>
+#include <application.h>
+#include <parse-util.h>
+#include <selection.h>
+#include <ranges.h>
+#include <sheet-merge.h>
+#include <cell.h>
+#include <cellspan.h>
+#include <rendered-value.h>
#include <goffice/goffice.h>
#include <string.h>
diff --git a/src/colrow.h b/src/colrow.h
index 78f55e8..d0b0871 100644
--- a/src/colrow.h
+++ b/src/colrow.h
@@ -2,7 +2,7 @@
#ifndef _GNM_COLROW_H_
# define _GNM_COLROW_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
G_BEGIN_DECLS
diff --git a/src/command-context-stderr.c b/src/command-context-stderr.c
index 0d4af65..2104bc3 100644
--- a/src/command-context-stderr.c
+++ b/src/command-context-stderr.c
@@ -9,11 +9,11 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "command-context-stderr.h"
+#include <gnumeric.h>
+#include <command-context-stderr.h>
#include <gsf/gsf-impl-utils.h>
#include <goffice/goffice.h>
-#include "ranges.h"
+#include <ranges.h>
struct GnmCmdContextStderr_ {
GObject base;
diff --git a/src/command-context-stderr.h b/src/command-context-stderr.h
index 5486cf6..8746af4 100644
--- a/src/command-context-stderr.h
+++ b/src/command-context-stderr.h
@@ -2,7 +2,7 @@
#ifndef _GNM_COMMAND_CONTEXT_STDERR_H_
# define _GNM_COMMAND_CONTEXT_STDERR_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/src/command-context.c b/src/command-context.c
index f4d8522..af5bdbe 100644
--- a/src/command-context.c
+++ b/src/command-context.c
@@ -21,9 +21,9 @@
* USA
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "command-context.h"
-#include "ranges.h"
+#include <gnumeric.h>
+#include <command-context.h>
+#include <ranges.h>
#include <glib/gi18n-lib.h>
diff --git a/src/command-context.h b/src/command-context.h
index ef1c437..304a1b1 100644
--- a/src/command-context.h
+++ b/src/command-context.h
@@ -2,7 +2,7 @@
#ifndef _GNM_COMMAND_CONTEXT_H_
# define _GNM_COMMAND_CONTEXT_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/commands.c b/src/commands.c
index 8db0be4..c6c6c4d 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -26,59 +26,59 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "commands.h"
-#include "gnm-command-impl.h"
-
-#include "application.h"
-#include "sheet.h"
-#include "sheet-view.h"
-#include "sheet-style.h"
-#include "gnm-format.h"
-#include "format-template.h"
-#include "command-context.h"
-#include "workbook-control.h"
-#include "workbook-view.h"
-#include "workbook-priv.h" /* For the undo/redo queues and the FOREACH */
-#include "ranges.h"
-#include "sort.h"
-#include "dependent.h"
-#include "value.h"
-#include "expr.h"
-#include "func.h"
-#include "expr-name.h"
-#include "cell.h"
-#include "sheet-merge.h"
-#include "parse-util.h"
-#include "print-info.h"
-#include "clipboard.h"
-#include "selection.h"
-#include "colrow.h"
-#include "style-border.h"
-#include "tools/auto-correct.h"
-#include "sheet-autofill.h"
-#include "mstyle.h"
-#include "search.h"
-#include "gutils.h"
-#include "gui-util.h"
-#include "sheet-object-cell-comment.h"
-#include "sheet-object-widget.h"
-#include "sheet-object.h"
-#include "sheet-object-component.h"
-#include "sheet-object-graph.h"
-#include "sheet-control.h"
-#include "sheet-control-gui.h"
-#include "sheet-utils.h"
-#include "style-color.h"
-#include "sheet-filter.h"
-#include "auto-format.h"
-#include "tools/dao.h"
-#include "gnumeric-conf.h"
-#include "tools/scenarios.h"
-#include "tools/data-shuffling.h"
-#include "tools/tabulate.h"
-#include "wbc-gtk.h"
-#include "undo.h"
+#include <gnumeric.h>
+#include <commands.h>
+#include <gnm-command-impl.h>
+
+#include <application.h>
+#include <sheet.h>
+#include <sheet-view.h>
+#include <sheet-style.h>
+#include <gnm-format.h>
+#include <format-template.h>
+#include <command-context.h>
+#include <workbook-control.h>
+#include <workbook-view.h>
+#include <workbook-priv.h> /* For the undo/redo queues and the FOREACH */
+#include <ranges.h>
+#include <sort.h>
+#include <dependent.h>
+#include <value.h>
+#include <expr.h>
+#include <func.h>
+#include <expr-name.h>
+#include <cell.h>
+#include <sheet-merge.h>
+#include <parse-util.h>
+#include <print-info.h>
+#include <clipboard.h>
+#include <selection.h>
+#include <colrow.h>
+#include <style-border.h>
+#include <tools/auto-correct.h>
+#include <sheet-autofill.h>
+#include <mstyle.h>
+#include <search.h>
+#include <gutils.h>
+#include <gui-util.h>
+#include <sheet-object-cell-comment.h>
+#include <sheet-object-widget.h>
+#include <sheet-object.h>
+#include <sheet-object-component.h>
+#include <sheet-object-graph.h>
+#include <sheet-control.h>
+#include <sheet-control-gui.h>
+#include <sheet-utils.h>
+#include <style-color.h>
+#include <sheet-filter.h>
+#include <auto-format.h>
+#include <tools/dao.h>
+#include <gnumeric-conf.h>
+#include <tools/scenarios.h>
+#include <tools/data-shuffling.h>
+#include <tools/tabulate.h>
+#include <wbc-gtk.h>
+#include <undo.h>
#include <goffice/goffice.h>
#include <gsf/gsf-doc-meta-data.h>
diff --git a/src/commands.h b/src/commands.h
index 1786cf4..a7a9449 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -2,8 +2,8 @@
#ifndef _GNM_COMMANDS_H_
#define _GNM_COMMANDS_H_
-#include "gnumeric.h"
-#include "tools/tools.h"
+#include <gnumeric.h>
+#include <tools/tools.h>
G_BEGIN_DECLS
diff --git a/src/complete-sheet.c b/src/complete-sheet.c
index 9ac19e7..5a09611 100644
--- a/src/complete-sheet.c
+++ b/src/complete-sheet.c
@@ -11,14 +11,14 @@
* (C) 2000-2001 Ximian, Inc.
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "complete-sheet.h"
-#include "gnumeric-conf.h"
-
-#include "sheet.h"
-#include "cell.h"
-#include "value.h"
-#include "parse-util.h"
+#include <gnumeric.h>
+#include <complete-sheet.h>
+#include <gnumeric-conf.h>
+
+#include <sheet.h>
+#include <cell.h>
+#include <value.h>
+#include <parse-util.h>
#include <gsf/gsf-impl-utils.h>
#include <string.h>
diff --git a/src/complete-sheet.h b/src/complete-sheet.h
index f017271..b5cb23f 100644
--- a/src/complete-sheet.h
+++ b/src/complete-sheet.h
@@ -2,8 +2,8 @@
#ifndef _GNM_COMPLETE_SHEET_H_
# define _GNM_COMPLETE_SHEET_H_
-#include "gnumeric.h"
-#include "complete.h"
+#include <gnumeric.h>
+#include <complete.h>
G_BEGIN_DECLS
diff --git a/src/complete.c b/src/complete.c
index 7e0cad7..de152b8 100644
--- a/src/complete.c
+++ b/src/complete.c
@@ -20,8 +20,8 @@
* (C) 2000-2001 Ximain Inc.
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "complete.h"
+#include <gnumeric.h>
+#include <complete.h>
#include <gsf/gsf-impl-utils.h>
#include <stdlib.h>
diff --git a/src/complex.c b/src/complex.c
index b14ec1c..a80643a 100644
--- a/src/complex.c
+++ b/src/complex.c
@@ -7,9 +7,9 @@
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "complex.h"
-#include "gutils.h"
+#include <gnumeric.h>
+#include <complex.h>
+#include <gutils.h>
#include <stdlib.h>
#include <errno.h>
diff --git a/src/complex.h b/src/complex.h
index f509ad4..8151f75 100644
--- a/src/complex.h
+++ b/src/complex.h
@@ -2,7 +2,7 @@
#ifndef _GNM_COMPLEX_H_
# define _GNM_COMPLEX_H_
-#include "numbers.h"
+#include <numbers.h>
#include <goffice/goffice.h>
#include <math.h>
diff --git a/src/consolidate.c b/src/consolidate.c
index 50a8b60..3be761a 100644
--- a/src/consolidate.c
+++ b/src/consolidate.c
@@ -19,21 +19,21 @@
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <glib/gi18n-lib.h>
-#include "consolidate.h"
-
-#include "cell.h"
-#include "dependent.h"
-#include "expr.h"
-#include "func.h"
-#include "position.h"
-#include "ranges.h"
-#include "selection.h"
-#include "sheet.h"
-#include "value.h"
-#include "workbook.h"
-#include "workbook-control.h"
+#include <consolidate.h>
+
+#include <cell.h>
+#include <dependent.h>
+#include <expr.h>
+#include <func.h>
+#include <position.h>
+#include <ranges.h>
+#include <selection.h>
+#include <sheet.h>
+#include <value.h>
+#include <workbook.h>
+#include <workbook-control.h>
/**********************************************************************************
diff --git a/src/consolidate.h b/src/consolidate.h
index b8469dd..20d9d90 100644
--- a/src/consolidate.h
+++ b/src/consolidate.h
@@ -2,7 +2,7 @@
#ifndef _GNM_CONSOLIDATE_H_
# define _GNM_CONSOLIDATE_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <tools/dao.h>
#include <tools/tools.h>
diff --git a/src/criteria.c b/src/criteria.c
index 7c8683b..1e297b9 100644
--- a/src/criteria.c
+++ b/src/criteria.c
@@ -1,4 +1,4 @@
-#include "criteria.h"
+#include <criteria.h>
typedef enum { CRIT_NULL, CRIT_FLOAT, CRIT_WRONGTYPE, CRIT_STRING } CritType;
diff --git a/src/dependent.c b/src/dependent.c
index 757ff60..71e4d05 100644
--- a/src/dependent.c
+++ b/src/dependent.c
@@ -21,22 +21,22 @@
* USA
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "dependent.h"
-
-#include "workbook-priv.h"
-#include "value.h"
-#include "cell.h"
-#include "sheet.h"
-#include "expr.h"
-#include "expr-impl.h"
-#include "expr-name.h"
-#include "application.h"
-#include "workbook-view.h"
-#include "ranges.h"
-#include "gutils.h"
-#include "sheet-view.h"
-#include "func.h"
+#include <gnumeric.h>
+#include <dependent.h>
+
+#include <workbook-priv.h>
+#include <value.h>
+#include <cell.h>
+#include <sheet.h>
+#include <expr.h>
+#include <expr-impl.h>
+#include <expr-name.h>
+#include <application.h>
+#include <workbook-view.h>
+#include <ranges.h>
+#include <gutils.h>
+#include <sheet-view.h>
+#include <func.h>
#include <goffice/goffice.h>
#include <string.h>
diff --git a/src/dependent.h b/src/dependent.h
index f0eabb2..98891eb 100644
--- a/src/dependent.h
+++ b/src/dependent.h
@@ -2,7 +2,7 @@
#ifndef _GNM_DEPENDENT_H_
# define _GNM_DEPENDENT_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/dialogs/dao-gui-utils.c b/src/dialogs/dao-gui-utils.c
index 1ff0ff8..62c2205 100644
--- a/src/dialogs/dao-gui-utils.c
+++ b/src/dialogs/dao-gui-utils.c
@@ -26,13 +26,13 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "dao-gui-utils.h"
+#include <dialogs/dao-gui-utils.h>
-#include "value.h"
-#include "gui-util.h"
-#include "selection.h"
+#include <value.h>
+#include <gui-util.h>
+#include <selection.h>
#include <widgets/gnm-dao.h>
-#include "dialogs/tool-dialogs.h"
+#include <dialogs/tool-dialogs.h>
/**
diff --git a/src/dialogs/dao-gui-utils.h b/src/dialogs/dao-gui-utils.h
index 422da73..72b50e2 100644
--- a/src/dialogs/dao-gui-utils.h
+++ b/src/dialogs/dao-gui-utils.h
@@ -25,8 +25,8 @@
#ifndef GNUMERIC_DAO_GUI_UTILS_H
#define GNUMERIC_DAO_GUI_UTILS_H
-#include "gnumeric.h"
-#include "tools/dao.h"
+#include <gnumeric.h>
+#include <tools/dao.h>
void dialog_tool_init_outputs (GnmGenericToolState *state, GCallback sensitivity_cb);
diff --git a/src/dialogs/dialog-about.c b/src/dialogs/dialog-about.c
index 1407acf..4e06a14 100644
--- a/src/dialogs/dialog-about.c
+++ b/src/dialogs/dialog-about.c
@@ -22,7 +22,7 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
+#include <dialogs/dialogs.h>
#include <string.h>
#include <gui-util.h>
diff --git a/src/dialogs/dialog-advanced-filter.c b/src/dialogs/dialog-advanced-filter.c
index 8586d02..1c6c164 100644
--- a/src/dialogs/dialog-advanced-filter.c
+++ b/src/dialogs/dialog-advanced-filter.c
@@ -25,8 +25,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <sheet.h>
#include <cell.h>
@@ -39,9 +39,9 @@
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-dao.h>
-#include "tools/filter.h"
-#include "tools/analysis-tools.h"
-#include "commands.h"
+#include <tools/filter.h>
+#include <tools/analysis-tools.h>
+#include <commands.h>
#define ADVANCED_FILTER_KEY "advanced-filter-dialog"
diff --git a/src/dialogs/dialog-analysis-tool-chi-squared.c b/src/dialogs/dialog-analysis-tool-chi-squared.c
index 7f22e82..ef0e94d 100644
--- a/src/dialogs/dialog-analysis-tool-chi-squared.c
+++ b/src/dialogs/dialog-analysis-tool-chi-squared.c
@@ -24,9 +24,9 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "tools/analysis-chi-squared.h"
-#include "tools/analysis-tools.h"
+#include <dialogs/dialogs.h>
+#include <tools/analysis-chi-squared.h>
+#include <tools/analysis-tools.h>
#include <workbook.h>
#include <workbook-control.h>
@@ -44,7 +44,7 @@
#include <selection.h>
#include <value.h>
#include <commands.h>
-#include "help.h"
+#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h>
diff --git a/src/dialogs/dialog-analysis-tool-frequency.c b/src/dialogs/dialog-analysis-tool-frequency.c
index 9412879..a0159be 100644
--- a/src/dialogs/dialog-analysis-tool-frequency.c
+++ b/src/dialogs/dialog-analysis-tool-frequency.c
@@ -24,9 +24,9 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "tools/analysis-frequency.h"
-#include "tools/analysis-tools.h"
+#include <dialogs/dialogs.h>
+#include <tools/analysis-frequency.h>
+#include <tools/analysis-tools.h>
#include <workbook.h>
#include <workbook-control.h>
@@ -44,7 +44,7 @@
#include <selection.h>
#include <value.h>
#include <commands.h>
-#include "help.h"
+#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h>
diff --git a/src/dialogs/dialog-analysis-tool-kaplan-meier.c b/src/dialogs/dialog-analysis-tool-kaplan-meier.c
index 56d86dc..6ab488a 100644
--- a/src/dialogs/dialog-analysis-tool-kaplan-meier.c
+++ b/src/dialogs/dialog-analysis-tool-kaplan-meier.c
@@ -24,9 +24,9 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "tools/analysis-kaplan-meier.h"
-#include "tools/analysis-tools.h"
+#include <dialogs/dialogs.h>
+#include <tools/analysis-kaplan-meier.h>
+#include <tools/analysis-tools.h>
#include <workbook.h>
#include <workbook-control.h>
@@ -44,7 +44,7 @@
#include <selection.h>
#include <value.h>
#include <commands.h>
-#include "help.h"
+#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h>
diff --git a/src/dialogs/dialog-analysis-tool-normality.c b/src/dialogs/dialog-analysis-tool-normality.c
index 7254eb7..a3895b1 100644
--- a/src/dialogs/dialog-analysis-tool-normality.c
+++ b/src/dialogs/dialog-analysis-tool-normality.c
@@ -24,9 +24,9 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "tools/analysis-normality.h"
-#include "tools/analysis-tools.h"
+#include <dialogs/dialogs.h>
+#include <tools/analysis-normality.h>
+#include <tools/analysis-tools.h>
#include <workbook.h>
#include <workbook-control.h>
@@ -44,7 +44,7 @@
#include <selection.h>
#include <value.h>
#include <commands.h>
-#include "help.h"
+#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h>
diff --git a/src/dialogs/dialog-analysis-tool-one-mean.c b/src/dialogs/dialog-analysis-tool-one-mean.c
index 8033375..39db909 100644
--- a/src/dialogs/dialog-analysis-tool-one-mean.c
+++ b/src/dialogs/dialog-analysis-tool-one-mean.c
@@ -24,9 +24,9 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "tools/analysis-one-mean-test.h"
-#include "tools/analysis-tools.h"
+#include <dialogs/dialogs.h>
+#include <tools/analysis-one-mean-test.h>
+#include <tools/analysis-tools.h>
#include <workbook.h>
#include <workbook-control.h>
@@ -44,7 +44,7 @@
#include <selection.h>
#include <value.h>
#include <commands.h>
-#include "help.h"
+#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h>
diff --git a/src/dialogs/dialog-analysis-tool-principal-components.c
b/src/dialogs/dialog-analysis-tool-principal-components.c
index 476f5a9..baa1bab 100644
--- a/src/dialogs/dialog-analysis-tool-principal-components.c
+++ b/src/dialogs/dialog-analysis-tool-principal-components.c
@@ -24,9 +24,9 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "tools/analysis-principal-components.h"
-#include "tools/analysis-tools.h"
+#include <dialogs/dialogs.h>
+#include <tools/analysis-principal-components.h>
+#include <tools/analysis-tools.h>
#include <workbook.h>
#include <workbook-control.h>
@@ -44,7 +44,7 @@
#include <selection.h>
#include <value.h>
#include <commands.h>
-#include "help.h"
+#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h>
diff --git a/src/dialogs/dialog-analysis-tool-sign-test.c b/src/dialogs/dialog-analysis-tool-sign-test.c
index 94cd1c3..30ee6db 100644
--- a/src/dialogs/dialog-analysis-tool-sign-test.c
+++ b/src/dialogs/dialog-analysis-tool-sign-test.c
@@ -24,10 +24,10 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "tools/analysis-sign-test.h"
-#include "tools/analysis-signed-rank-test.h"
-#include "tools/analysis-tools.h"
+#include <dialogs/dialogs.h>
+#include <tools/analysis-sign-test.h>
+#include <tools/analysis-signed-rank-test.h>
+#include <tools/analysis-tools.h>
#include <workbook.h>
#include <workbook-control.h>
@@ -45,7 +45,7 @@
#include <selection.h>
#include <value.h>
#include <commands.h>
-#include "help.h"
+#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h>
diff --git a/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
b/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
index 45eb5e6..7bc7e6c 100644
--- a/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
+++ b/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
@@ -24,9 +24,9 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "tools/analysis-wilcoxon-mann-whitney.h"
-#include "tools/analysis-tools.h"
+#include <dialogs/dialogs.h>
+#include <tools/analysis-wilcoxon-mann-whitney.h>
+#include <tools/analysis-tools.h>
#include <workbook.h>
#include <workbook-control.h>
@@ -44,7 +44,7 @@
#include <selection.h>
#include <value.h>
#include <commands.h>
-#include "help.h"
+#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h>
diff --git a/src/dialogs/dialog-analysis-tools.c b/src/dialogs/dialog-analysis-tools.c
index 501f499..0876abc 100644
--- a/src/dialogs/dialog-analysis-tools.c
+++ b/src/dialogs/dialog-analysis-tools.c
@@ -24,11 +24,11 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "tools/analysis-tools.h"
-#include "tools/analysis-anova.h"
-#include "tools/analysis-histogram.h"
-#include "tools/analysis-exp-smoothing.h"
+#include <dialogs/dialogs.h>
+#include <tools/analysis-tools.h>
+#include <tools/analysis-anova.h>
+#include <tools/analysis-histogram.h>
+#include <tools/analysis-exp-smoothing.h>
#include <workbook.h>
#include <workbook-control.h>
@@ -46,7 +46,7 @@
#include <selection.h>
#include <value.h>
#include <commands.h>
-#include "help.h"
+#include <dialogs/help.h>
#include <widgets/gnm-dao.h>
#include <widgets/gnumeric-expr-entry.h>
diff --git a/src/dialogs/dialog-autofilter.c b/src/dialogs/dialog-autofilter.c
index 6490580..d2f5f7b 100644
--- a/src/dialogs/dialog-autofilter.c
+++ b/src/dialogs/dialog-autofilter.c
@@ -22,8 +22,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <gui-util.h>
#include <commands.h>
diff --git a/src/dialogs/dialog-autoformat.c b/src/dialogs/dialog-autoformat.c
index 2f3a70c..364eb1b 100644
--- a/src/dialogs/dialog-autoformat.c
+++ b/src/dialogs/dialog-autoformat.c
@@ -26,8 +26,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <gui-util.h>
#include <mstyle.h>
diff --git a/src/dialogs/dialog-autosave.c b/src/dialogs/dialog-autosave.c
index 293e495..29996e7 100644
--- a/src/dialogs/dialog-autosave.c
+++ b/src/dialogs/dialog-autosave.c
@@ -23,8 +23,8 @@
**/
#include <gnumeric-config.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <workbook.h>
#include <workbook-control.h>
#include <wbc-gtk.h>
diff --git a/src/dialogs/dialog-cell-comment.c b/src/dialogs/dialog-cell-comment.c
index 4478c7c..1aa9bd5 100644
--- a/src/dialogs/dialog-cell-comment.c
+++ b/src/dialogs/dialog-cell-comment.c
@@ -20,8 +20,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <gui-util.h>
#include <sheet.h>
diff --git a/src/dialogs/dialog-cell-format-cond.c b/src/dialogs/dialog-cell-format-cond.c
index 713ba9f..86931e4 100644
--- a/src/dialogs/dialog-cell-format-cond.c
+++ b/src/dialogs/dialog-cell-format-cond.c
@@ -20,8 +20,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <sheet.h>
#include <sheet-view.h>
diff --git a/src/dialogs/dialog-cell-format.c b/src/dialogs/dialog-cell-format.c
index 027b60c..c02b336 100644
--- a/src/dialogs/dialog-cell-format.c
+++ b/src/dialogs/dialog-cell-format.c
@@ -23,8 +23,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <sheet.h>
#include <sheet-view.h>
diff --git a/src/dialogs/dialog-cell-sort.c b/src/dialogs/dialog-cell-sort.c
index 60e9a31..5922bb4 100644
--- a/src/dialogs/dialog-cell-sort.c
+++ b/src/dialogs/dialog-cell-sort.c
@@ -24,8 +24,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <workbook-view.h>
#include <gui-util.h>
diff --git a/src/dialogs/dialog-col-row.c b/src/dialogs/dialog-col-row.c
index ce65f5d..f0e90f5 100644
--- a/src/dialogs/dialog-col-row.c
+++ b/src/dialogs/dialog-col-row.c
@@ -21,8 +21,8 @@
*/
#include <gnumeric-config.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <gui-util.h>
#include <commands.h>
diff --git a/src/dialogs/dialog-col-width.c b/src/dialogs/dialog-col-width.c
index 061bf49..8e26838 100644
--- a/src/dialogs/dialog-col-width.c
+++ b/src/dialogs/dialog-col-width.c
@@ -22,8 +22,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <gui-util.h>
#include <commands.h>
diff --git a/src/dialogs/dialog-consolidate.c b/src/dialogs/dialog-consolidate.c
index 809db60..8313650 100644
--- a/src/dialogs/dialog-consolidate.c
+++ b/src/dialogs/dialog-consolidate.c
@@ -22,9 +22,9 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
-#include "dialogs/tool-dialogs.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
+#include <dialogs/tool-dialogs.h>
#include <commands.h>
#include <consolidate.h>
diff --git a/src/dialogs/dialog-data-slicer.c b/src/dialogs/dialog-data-slicer.c
index 2a28f8d..e20ae0c 100644
--- a/src/dialogs/dialog-data-slicer.c
+++ b/src/dialogs/dialog-data-slicer.c
@@ -22,8 +22,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <gui-util.h>
#include <commands.h>
diff --git a/src/dialogs/dialog-data-table.c b/src/dialogs/dialog-data-table.c
index 5738d8d..de5b423 100644
--- a/src/dialogs/dialog-data-table.c
+++ b/src/dialogs/dialog-data-table.c
@@ -22,8 +22,8 @@
*/
#include <gnumeric-config.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <expr.h>
#include <selection.h>
diff --git a/src/dialogs/dialog-define-names.c b/src/dialogs/dialog-define-names.c
index fc52acd..3b86ef2 100644
--- a/src/dialogs/dialog-define-names.c
+++ b/src/dialogs/dialog-define-names.c
@@ -25,8 +25,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <expr.h>
#include <expr-name.h>
diff --git a/src/dialogs/dialog-delete-cells.c b/src/dialogs/dialog-delete-cells.c
index 744c86d..0aa4f7d 100644
--- a/src/dialogs/dialog-delete-cells.c
+++ b/src/dialogs/dialog-delete-cells.c
@@ -21,8 +21,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <gui-util.h>
#include <selection.h>
diff --git a/src/dialogs/dialog-doc-metadata.c b/src/dialogs/dialog-doc-metadata.c
index bf55208..06817fc 100644
--- a/src/dialogs/dialog-doc-metadata.c
+++ b/src/dialogs/dialog-doc-metadata.c
@@ -21,8 +21,8 @@
*/
#include <gnumeric-config.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <workbook.h>
#include <workbook-control.h>
diff --git a/src/dialogs/dialog-fill-series.c b/src/dialogs/dialog-fill-series.c
index 95e27a2..7cf40a9 100644
--- a/src/dialogs/dialog-fill-series.c
+++ b/src/dialogs/dialog-fill-series.c
@@ -24,9 +24,9 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
-#include "dialogs/tool-dialogs.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
+#include <dialogs/tool-dialogs.h>
#include <gui-util.h>
#include <selection.h>
@@ -46,7 +46,7 @@
#include <dialogs/dao-gui-utils.h>
-#include "tools/fill-series.h"
+#include <tools/fill-series.h>
#define FILL_SERIES_KEY "fill-series-dialog"
diff --git a/src/dialogs/dialog-formula-guru.c b/src/dialogs/dialog-formula-guru.c
index 998def4..d8a126f 100644
--- a/src/dialogs/dialog-formula-guru.c
+++ b/src/dialogs/dialog-formula-guru.c
@@ -26,8 +26,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <parse-util.h>
#include <gui-util.h>
diff --git a/src/dialogs/dialog-function-select.c b/src/dialogs/dialog-function-select.c
index 8590e12..ac55926 100644
--- a/src/dialogs/dialog-function-select.c
+++ b/src/dialogs/dialog-function-select.c
@@ -25,8 +25,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <gui-util.h>
#include <gutils.h>
diff --git a/src/dialogs/dialog-goal-seek.c b/src/dialogs/dialog-goal-seek.c
index 5ef4fea..68ff8bc 100644
--- a/src/dialogs/dialog-goal-seek.c
+++ b/src/dialogs/dialog-goal-seek.c
@@ -23,8 +23,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <gui-util.h>
#include <cell.h>
diff --git a/src/dialogs/dialog-goto-cell.c b/src/dialogs/dialog-goto-cell.c
index a8c56ba..ff56793 100644
--- a/src/dialogs/dialog-goto-cell.c
+++ b/src/dialogs/dialog-goto-cell.c
@@ -24,8 +24,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <gui-util.h>
#include <workbook-control.h>
diff --git a/src/dialogs/dialog-hyperlink.c b/src/dialogs/dialog-hyperlink.c
index 4f299ed..94101ff 100644
--- a/src/dialogs/dialog-hyperlink.c
+++ b/src/dialogs/dialog-hyperlink.c
@@ -23,13 +23,13 @@
#include <gnumeric-config.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <commands.h>
#include <widgets/gnumeric-expr-entry.h>
-#include "expr-name.h"
-#include "expr.h"
+#include <expr-name.h>
+#include <expr.h>
#include <gui-util.h>
#include <hlink.h>
#include <mstyle.h>
diff --git a/src/dialogs/dialog-insert-cells.c b/src/dialogs/dialog-insert-cells.c
index dfa946d..7f65eec 100644
--- a/src/dialogs/dialog-insert-cells.c
+++ b/src/dialogs/dialog-insert-cells.c
@@ -21,8 +21,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <gui-util.h>
#include <selection.h>
diff --git a/src/dialogs/dialog-merge.c b/src/dialogs/dialog-merge.c
index 5148cd9..10d609c 100644
--- a/src/dialogs/dialog-merge.c
+++ b/src/dialogs/dialog-merge.c
@@ -25,8 +25,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <gui-util.h>
#include <wbc-gtk.h>
diff --git a/src/dialogs/dialog-password.c b/src/dialogs/dialog-password.c
index 08cc080..4fe76ed 100644
--- a/src/dialogs/dialog-password.c
+++ b/src/dialogs/dialog-password.c
@@ -1,7 +1,7 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "dialogs.h"
-#include "gui-util.h"
+#include <dialogs/dialogs.h>
+#include <gui-util.h>
static void
cb_accept_password (G_GNUC_UNUSED GtkWidget *IGNORED, GtkDialog *d)
diff --git a/src/dialogs/dialog-paste-special.c b/src/dialogs/dialog-paste-special.c
index e4ba06b..09294d6 100644
--- a/src/dialogs/dialog-paste-special.c
+++ b/src/dialogs/dialog-paste-special.c
@@ -22,8 +22,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <wbc-gtk.h>
#include <gui-util.h>
diff --git a/src/dialogs/dialog-plugin-manager.c b/src/dialogs/dialog-plugin-manager.c
index a147363..b017216 100644
--- a/src/dialogs/dialog-plugin-manager.c
+++ b/src/dialogs/dialog-plugin-manager.c
@@ -27,8 +27,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <application.h>
#include <wbc-gtk.h>
#include <gnumeric-conf.h>
diff --git a/src/dialogs/dialog-preferences.c b/src/dialogs/dialog-preferences.c
index 9c6b811..c921b32 100644
--- a/src/dialogs/dialog-preferences.c
+++ b/src/dialogs/dialog-preferences.c
@@ -24,20 +24,20 @@
#include <gnumeric-config.h>
#include <gnumeric.h>
-#include "application.h"
-#include "dialogs.h"
-#include "help.h"
+#include <application.h>
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
-#include "mstyle.h"
-#include "value.h"
+#include <mstyle.h>
+#include <value.h>
#include <gnm-format.h>
-#include "workbook.h"
-#include "workbook-control.h"
-#include "wbc-gtk.h"
-#include "number-match.h"
-#include "widgets/gnumeric-cell-renderer-text.h"
+#include <workbook.h>
+#include <workbook-control.h>
+#include <wbc-gtk.h>
+#include <number-match.h>
+#include <widgets/gnumeric-cell-renderer-text.h>
-#include "gnumeric-conf.h"
+#include <gnumeric-conf.h>
#include <gui-util.h>
#include <glib/gi18n-lib.h>
diff --git a/src/dialogs/dialog-printer-setup.c b/src/dialogs/dialog-printer-setup.c
index 3ba02aa..a2a9490 100644
--- a/src/dialogs/dialog-printer-setup.c
+++ b/src/dialogs/dialog-printer-setup.c
@@ -22,8 +22,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <gui-util.h>
#include <commands.h>
diff --git a/src/dialogs/dialog-quit.c b/src/dialogs/dialog-quit.c
index 5f9d6cc..0332d30 100644
--- a/src/dialogs/dialog-quit.c
+++ b/src/dialogs/dialog-quit.c
@@ -23,7 +23,7 @@
#include <gnumeric-config.h>
#include <gnumeric.h>
-#include "dialogs.h"
+#include <dialogs/dialogs.h>
#include <gui-file.h>
#include <gui-util.h>
#include <workbook.h>
diff --git a/src/dialogs/dialog-random-generator-cor.c b/src/dialogs/dialog-random-generator-cor.c
index cbfe1c6..831c920 100644
--- a/src/dialogs/dialog-random-generator-cor.c
+++ b/src/dialogs/dialog-random-generator-cor.c
@@ -23,10 +23,10 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
-#include "dialogs/tool-dialogs.h"
-#include "tools/random-generator-cor.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
+#include <dialogs/tool-dialogs.h>
+#include <tools/random-generator-cor.h>
#include <workbook.h>
#include <workbook-control.h>
diff --git a/src/dialogs/dialog-random-generator.c b/src/dialogs/dialog-random-generator.c
index 9b7377c..82145ce 100644
--- a/src/dialogs/dialog-random-generator.c
+++ b/src/dialogs/dialog-random-generator.c
@@ -24,10 +24,10 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
-#include "dialogs/tool-dialogs.h"
-#include "tools/random-generator.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
+#include <dialogs/tool-dialogs.h>
+#include <tools/random-generator.h>
#include <workbook.h>
#include <workbook-control.h>
diff --git a/src/dialogs/dialog-recent.c b/src/dialogs/dialog-recent.c
index 05e24fd..47ba8ca 100644
--- a/src/dialogs/dialog-recent.c
+++ b/src/dialogs/dialog-recent.c
@@ -22,7 +22,7 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
+#include <dialogs/dialogs.h>
#include <wbc-gtk.h>
#include <gui-file.h>
#include <gui-util.h>
diff --git a/src/dialogs/dialog-row-height.c b/src/dialogs/dialog-row-height.c
index 50f2234..4007d3a 100644
--- a/src/dialogs/dialog-row-height.c
+++ b/src/dialogs/dialog-row-height.c
@@ -22,8 +22,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <gui-util.h>
#include <commands.h>
diff --git a/src/dialogs/dialog-scenarios.c b/src/dialogs/dialog-scenarios.c
index 9872be0..b8309da 100644
--- a/src/dialogs/dialog-scenarios.c
+++ b/src/dialogs/dialog-scenarios.c
@@ -22,8 +22,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <gui-util.h>
#include <commands.h>
@@ -37,8 +37,8 @@
#include <value.h>
#include <cell.h>
#include <tools/dao.h>
-#include "tools/scenarios.h"
-#include "dialogs/tool-dialogs.h"
+#include <tools/scenarios.h>
+#include <dialogs/tool-dialogs.h>
#include <goffice/goffice.h>
#include <string.h>
diff --git a/src/dialogs/dialog-search-replace.c b/src/dialogs/dialog-search-replace.c
index f1664d9..e009194 100644
--- a/src/dialogs/dialog-search-replace.c
+++ b/src/dialogs/dialog-search-replace.c
@@ -24,8 +24,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <gnumeric-conf.h>
#include <gui-util.h>
diff --git a/src/dialogs/dialog-search.c b/src/dialogs/dialog-search.c
index 5085c44..24915e3 100644
--- a/src/dialogs/dialog-search.c
+++ b/src/dialogs/dialog-search.c
@@ -23,8 +23,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <gui-util.h>
#include <gnumeric-conf.h>
diff --git a/src/dialogs/dialog-sheet-compare.c b/src/dialogs/dialog-sheet-compare.c
index 0253c0b..992fb2d 100644
--- a/src/dialogs/dialog-sheet-compare.c
+++ b/src/dialogs/dialog-sheet-compare.c
@@ -20,9 +20,9 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "sheet-diff.h"
-#include "dialogs.h"
-#include "help.h"
+#include <sheet-diff.h>
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <gui-util.h>
#include <wbc-gtk.h>
diff --git a/src/dialogs/dialog-sheet-order.c b/src/dialogs/dialog-sheet-order.c
index 781c6b0..c8dbd02 100644
--- a/src/dialogs/dialog-sheet-order.c
+++ b/src/dialogs/dialog-sheet-order.c
@@ -25,8 +25,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <gui-util.h>
#include <wbc-gtk.h>
diff --git a/src/dialogs/dialog-sheet-rename.c b/src/dialogs/dialog-sheet-rename.c
index b02e16d..6f4ca3f 100644
--- a/src/dialogs/dialog-sheet-rename.c
+++ b/src/dialogs/dialog-sheet-rename.c
@@ -23,8 +23,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <gui-util.h>
#include <wbc-gtk.h>
diff --git a/src/dialogs/dialog-sheet-resize.c b/src/dialogs/dialog-sheet-resize.c
index 739c9b3..5ac51dd 100644
--- a/src/dialogs/dialog-sheet-resize.c
+++ b/src/dialogs/dialog-sheet-resize.c
@@ -24,8 +24,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <gui-util.h>
#include <wbc-gtk.h>
diff --git a/src/dialogs/dialog-sheetobject-size.c b/src/dialogs/dialog-sheetobject-size.c
index 224379f..7e36a65 100644
--- a/src/dialogs/dialog-sheetobject-size.c
+++ b/src/dialogs/dialog-sheetobject-size.c
@@ -23,8 +23,8 @@
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
#include <string.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <gui-util.h>
#include <commands.h>
diff --git a/src/dialogs/dialog-shuffle.c b/src/dialogs/dialog-shuffle.c
index c03f6de..0c3d8d3 100644
--- a/src/dialogs/dialog-shuffle.c
+++ b/src/dialogs/dialog-shuffle.c
@@ -25,8 +25,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <sheet.h>
#include <cell.h>
diff --git a/src/dialogs/dialog-simulation.c b/src/dialogs/dialog-simulation.c
index d12960a..ac73c39 100644
--- a/src/dialogs/dialog-simulation.c
+++ b/src/dialogs/dialog-simulation.c
@@ -21,8 +21,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <sheet.h>
#include <cell.h>
@@ -35,7 +35,7 @@
#include <widgets/gnumeric-expr-entry.h>
#include <widgets/gnm-dao.h>
-#include "tools/simulation.h"
+#include <tools/simulation.h>
#include <string.h>
diff --git a/src/dialogs/dialog-so-list.c b/src/dialogs/dialog-so-list.c
index b6167db..b62ba42 100644
--- a/src/dialogs/dialog-so-list.c
+++ b/src/dialogs/dialog-so-list.c
@@ -22,8 +22,8 @@
*/
#include <gnumeric-config.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <expr.h>
#include <selection.h>
diff --git a/src/dialogs/dialog-so-styled.c b/src/dialogs/dialog-so-styled.c
index 86b57d1..158f9d8 100644
--- a/src/dialogs/dialog-so-styled.c
+++ b/src/dialogs/dialog-so-styled.c
@@ -23,15 +23,15 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "dialogs.h"
-
-#include "gui-util.h"
-#include "dialogs/help.h"
-#include "wbc-gtk.h"
-#include "commands.h"
-#include "sheet-object.h"
-#include "gnm-so-line.h"
+#include <gnumeric.h>
+#include <dialogs/dialogs.h>
+
+#include <gui-util.h>
+#include <dialogs/help.h>
+#include <wbc-gtk.h>
+#include <commands.h>
+#include <sheet-object.h>
+#include <gnm-so-line.h>
#include <goffice/goffice.h>
#include <widgets/gnumeric-text-view.h>
diff --git a/src/dialogs/dialog-solver.c b/src/dialogs/dialog-solver.c
index 6c0bbbc..f906410 100644
--- a/src/dialogs/dialog-solver.c
+++ b/src/dialogs/dialog-solver.c
@@ -25,8 +25,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <gui-util.h>
#include <func.h>
diff --git a/src/dialogs/dialog-stf-csv-page.c b/src/dialogs/dialog-stf-csv-page.c
index 165287a..78d59e6 100644
--- a/src/dialogs/dialog-stf-csv-page.c
+++ b/src/dialogs/dialog-stf-csv-page.c
@@ -20,8 +20,8 @@
*/
#include <gnumeric-config.h>
-#include "dialog-stf.h"
-#include "gnm-format.h"
+#include <dialogs/dialog-stf.h>
+#include <gnm-format.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 4a3b581..d0053ce 100644
--- a/src/dialogs/dialog-stf-export.c
+++ b/src/dialogs/dialog-stf-export.c
@@ -20,7 +20,7 @@
#include <gnumeric-config.h>
#include <gnumeric.h>
-#include "dialog-stf-export.h"
+#include <dialogs/dialog-stf-export.h>
#include <command-context.h>
#include <workbook.h>
diff --git a/src/dialogs/dialog-stf-export.h b/src/dialogs/dialog-stf-export.h
index 7d68138..939810b 100644
--- a/src/dialogs/dialog-stf-export.h
+++ b/src/dialogs/dialog-stf-export.h
@@ -15,7 +15,7 @@
#ifndef GNUMERIC_DIALOG_STF_EXPORT_H
#define GNUMERIC_DIALOG_STF_EXPORT_H
-#include "gnumeric-fwd.h"
+#include <gnumeric-fwd.h>
gboolean stf_export_dialog (WBCGtk *wbcg, GnmStfExport *stfe, Workbook *wb);
diff --git a/src/dialogs/dialog-stf-fixed-page.c b/src/dialogs/dialog-stf-fixed-page.c
index a914859..bb783ad 100644
--- a/src/dialogs/dialog-stf-fixed-page.c
+++ b/src/dialogs/dialog-stf-fixed-page.c
@@ -21,7 +21,7 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialog-stf.h"
+#include <dialogs/dialog-stf.h>
#include <gui-util.h>
#include <gdk/gdkkeysyms.h>
diff --git a/src/dialogs/dialog-stf-format-page.c b/src/dialogs/dialog-stf-format-page.c
index 3ce57f0..ed72bc6 100644
--- a/src/dialogs/dialog-stf-format-page.c
+++ b/src/dialogs/dialog-stf-format-page.c
@@ -23,7 +23,7 @@
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
#include <libgnumeric.h>
-#include "dialog-stf.h"
+#include <dialogs/dialog-stf.h>
#include <gnm-format.h>
#include <sheet.h>
#include <workbook.h>
diff --git a/src/dialogs/dialog-stf-main-page.c b/src/dialogs/dialog-stf-main-page.c
index 4ed0d4a..6997b8f 100644
--- a/src/dialogs/dialog-stf-main-page.c
+++ b/src/dialogs/dialog-stf-main-page.c
@@ -22,7 +22,7 @@
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
#include <libgnumeric.h>
-#include "dialog-stf.h"
+#include <dialogs/dialog-stf.h>
#include <gui-util.h>
#include <sheet.h>
#include <workbook.h>
diff --git a/src/dialogs/dialog-stf-preview.c b/src/dialogs/dialog-stf-preview.c
index 9ac39ac..0a85e4d 100644
--- a/src/dialogs/dialog-stf-preview.c
+++ b/src/dialogs/dialog-stf-preview.c
@@ -22,8 +22,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialog-stf-preview.h"
-#include "dialog-stf.h"
+#include <dialogs/dialog-stf-preview.h>
+#include <dialogs/dialog-stf.h>
#include <gnm-format.h>
#include <number-match.h>
diff --git a/src/dialogs/dialog-stf.c b/src/dialogs/dialog-stf.c
index 7c16c85..9d379e4 100644
--- a/src/dialogs/dialog-stf.c
+++ b/src/dialogs/dialog-stf.c
@@ -21,7 +21,7 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialog-stf.h"
+#include <dialogs/dialog-stf.h>
#include <gnm-format.h>
#include <wbc-gtk.h>
diff --git a/src/dialogs/dialog-stf.h b/src/dialogs/dialog-stf.h
index 2effb8b..c912301 100644
--- a/src/dialogs/dialog-stf.h
+++ b/src/dialogs/dialog-stf.h
@@ -1,8 +1,8 @@
#ifndef GNUMERIC_DIALOG_STF_H
#define GNUMERIC_DIALOG_STF_H
-#include "dialog-stf-preview.h"
-#include "gui-util.h"
+#include <dialogs/dialog-stf-preview.h>
+#include <gui-util.h>
#include <stf-parse.h>
#include <goffice/goffice.h>
diff --git a/src/dialogs/dialog-tabulate.c b/src/dialogs/dialog-tabulate.c
index b2ad3fc..a7dc4ac 100644
--- a/src/dialogs/dialog-tabulate.c
+++ b/src/dialogs/dialog-tabulate.c
@@ -24,27 +24,27 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <gui-util.h>
#include <widgets/gnumeric-expr-entry.h>
#include <tools/tabulate.h>
#include <wbc-gtk.h>
-#include "ranges.h"
-#include "value.h"
-#include "sheet.h"
-#include "mstyle.h"
-#include "workbook.h"
-#include "mathfunc.h"
-#include "cell.h"
-#include "commands.h"
-#include "gnm-format.h"
-#include "number-match.h"
-#include "mstyle.h"
-#include "style-border.h"
-#include "sheet-style.h"
-#include "style-color.h"
+#include <ranges.h>
+#include <value.h>
+#include <sheet.h>
+#include <mstyle.h>
+#include <workbook.h>
+#include <mathfunc.h>
+#include <cell.h>
+#include <commands.h>
+#include <gnm-format.h>
+#include <number-match.h>
+#include <mstyle.h>
+#include <style-border.h>
+#include <sheet-style.h>
+#include <style-color.h>
#include <string.h>
diff --git a/src/dialogs/dialog-view.c b/src/dialogs/dialog-view.c
index f665cfa..2bae293 100644
--- a/src/dialogs/dialog-view.c
+++ b/src/dialogs/dialog-view.c
@@ -22,9 +22,9 @@
#include <gnumeric-config.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
-#include "application.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
+#include <application.h>
#include <gui-util.h>
#include <wbc-gtk.h>
diff --git a/src/dialogs/dialog-workbook-attr.c b/src/dialogs/dialog-workbook-attr.c
index 6b9b044..4fc7149 100644
--- a/src/dialogs/dialog-workbook-attr.c
+++ b/src/dialogs/dialog-workbook-attr.c
@@ -21,8 +21,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <gui-util.h>
#include <workbook-view.h>
diff --git a/src/dialogs/dialog-zoom.c b/src/dialogs/dialog-zoom.c
index 22f0545..649c794 100644
--- a/src/dialogs/dialog-zoom.c
+++ b/src/dialogs/dialog-zoom.c
@@ -23,8 +23,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <gnumeric.h>
-#include "dialogs.h"
-#include "help.h"
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
#include <gui-util.h>
#include <commands.h>
diff --git a/src/dialogs/dialogs.h b/src/dialogs/dialogs.h
index b7c478c..5adcf09 100644
--- a/src/dialogs/dialogs.h
+++ b/src/dialogs/dialogs.h
@@ -1,8 +1,8 @@
#ifndef GNUMERIC_DIALOGS_H
#define GNUMERIC_DIALOGS_H
-#include "gnumeric.h"
-#include "consolidate.h"
+#include <gnumeric.h>
+#include <consolidate.h>
#include <goffice/goffice.h>
typedef enum {
diff --git a/src/dialogs/tool-dialogs.h b/src/dialogs/tool-dialogs.h
index f925238..bc32add 100644
--- a/src/dialogs/tool-dialogs.h
+++ b/src/dialogs/tool-dialogs.h
@@ -16,9 +16,9 @@
#ifndef GNUMERIC_TOOL_DIALOGS_H
#define GNUMERIC_TOOL_DIALOGS_H
-#include "gnumeric.h"
-#include "numbers.h"
-#include "widgets/gnumeric-expr-entry.h"
+#include <gnumeric.h>
+#include <numbers.h>
+#include <widgets/gnumeric-expr-entry.h>
typedef struct _scenario_state scenario_state_t;
diff --git a/src/expr-deriv.c b/src/expr-deriv.c
index ac7bbf5..6569774 100644
--- a/src/expr-deriv.c
+++ b/src/expr-deriv.c
@@ -20,15 +20,15 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "expr-deriv.h"
-#include "expr-impl.h"
-#include "func.h"
-#include "value.h"
-#include "sheet.h"
-#include "workbook.h"
-#include "cell.h"
-#include "gutils.h"
+#include <gnumeric.h>
+#include <expr-deriv.h>
+#include <expr-impl.h>
+#include <func.h>
+#include <value.h>
+#include <sheet.h>
+#include <workbook.h>
+#include <cell.h>
+#include <gutils.h>
/* ------------------------------------------------------------------------- */
diff --git a/src/expr-deriv.h b/src/expr-deriv.h
index 415f608..be2e3ab 100644
--- a/src/expr-deriv.h
+++ b/src/expr-deriv.h
@@ -3,8 +3,8 @@
G_BEGIN_DECLS
-#include "expr.h"
-#include "numbers.h"
+#include <expr.h>
+#include <numbers.h>
/* ------------------------------------------------------------------------- */
diff --git a/src/expr-impl.h b/src/expr-impl.h
index e155f13..a073d10 100644
--- a/src/expr-impl.h
+++ b/src/expr-impl.h
@@ -2,9 +2,9 @@
#ifndef _GNM_EXPR_IMPL_H_
# define _GNM_EXPR_IMPL_H_
-#include "gnumeric.h"
-#include "numbers.h"
-#include "parse-util.h"
+#include <gnumeric.h>
+#include <numbers.h>
+#include <parse-util.h>
G_BEGIN_DECLS
diff --git a/src/expr-name.c b/src/expr-name.c
index bec07af..e7236eb 100644
--- a/src/expr-name.c
+++ b/src/expr-name.c
@@ -12,17 +12,17 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <string.h>
-#include "gnumeric.h"
-#include "expr-name.h"
-
-#include "dependent.h"
-#include "value.h"
-#include "workbook-priv.h"
-#include "expr.h"
-#include "sheet.h"
-#include "ranges.h"
-#include "gutils.h"
-#include "sheet-style.h"
+#include <gnumeric.h>
+#include <expr-name.h>
+
+#include <dependent.h>
+#include <value.h>
+#include <workbook-priv.h>
+#include <expr.h>
+#include <sheet.h>
+#include <ranges.h>
+#include <gutils.h>
+#include <sheet-style.h>
#include <goffice/goffice.h>
diff --git a/src/expr-name.h b/src/expr-name.h
index d7e2ef0..b48ee3b 100644
--- a/src/expr-name.h
+++ b/src/expr-name.h
@@ -2,8 +2,8 @@
#ifndef _GNM_EXPR_NAME_H_
# define _GNM_EXPR_NAME_H_
-#include "gnumeric.h"
-#include "position.h"
+#include <gnumeric.h>
+#include <position.h>
#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/expr.c b/src/expr.c
index 5febc26..d895523 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -23,24 +23,24 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "expr.h"
-
-#include "expr-impl.h"
-#include "expr-name.h"
-#include "dependent.h"
-#include "application.h"
-#include "func.h"
-#include "cell.h"
-#include "sheet.h"
-#include "value.h"
-#include "parse-util.h"
-#include "ranges.h"
-#include "number-match.h"
-#include "workbook.h"
-#include "gutils.h"
-#include "parse-util.h"
-#include "mathfunc.h"
+#include <gnumeric.h>
+#include <expr.h>
+
+#include <expr-impl.h>
+#include <expr-name.h>
+#include <dependent.h>
+#include <application.h>
+#include <func.h>
+#include <cell.h>
+#include <sheet.h>
+#include <value.h>
+#include <parse-util.h>
+#include <ranges.h>
+#include <number-match.h>
+#include <workbook.h>
+#include <gutils.h>
+#include <parse-util.h>
+#include <mathfunc.h>
#include <goffice/goffice.h>
#include <math.h>
diff --git a/src/expr.h b/src/expr.h
index aa90c75..7d2a3f7 100644
--- a/src/expr.h
+++ b/src/expr.h
@@ -4,8 +4,8 @@
G_BEGIN_DECLS
-#include "gnumeric.h"
-#include "position.h"
+#include <gnumeric.h>
+#include <position.h>
/* Warning: if you add something here, see do_expr_as_string ! */
/* Warning: if you add something here, see ms-formula-write.c ! */
diff --git a/src/file-autoft.c b/src/file-autoft.c
index f565b4d..82cd783 100644
--- a/src/file-autoft.c
+++ b/src/file-autoft.c
@@ -21,13 +21,13 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "file-autoft.h"
+#include <gnumeric.h>
+#include <file-autoft.h>
-#include "gutils.h"
-#include "workbook-control.h"
-#include "format-template.h"
-#include "gnumeric-conf.h"
+#include <gutils.h>
+#include <workbook-control.h>
+#include <format-template.h>
+#include <gnumeric-conf.h>
#include <gsf/gsf-impl-utils.h>
#include <goffice/goffice.h>
diff --git a/src/file-autoft.h b/src/file-autoft.h
index f3f757f..37be80b 100644
--- a/src/file-autoft.h
+++ b/src/file-autoft.h
@@ -2,8 +2,8 @@
#ifndef _GNM_FILE_AUTOFT_H_
# define _GNM_FILE_AUTOFT_H_
-#include "gnumeric.h"
-#include "format-template.h"
+#include <gnumeric.h>
+#include <format-template.h>
G_BEGIN_DECLS
diff --git a/src/format-template.c b/src/format-template.c
index a74e6d5..b27ac8a 100644
--- a/src/format-template.c
+++ b/src/format-template.c
@@ -20,15 +20,15 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "format-template.h"
-
-#include "mstyle.h"
-#include "gutils.h"
-#include "sheet.h"
-#include "command-context.h"
-#include "ranges.h"
-#include "xml-sax.h"
+#include <gnumeric.h>
+#include <format-template.h>
+
+#include <mstyle.h>
+#include <gutils.h>
+#include <sheet.h>
+#include <command-context.h>
+#include <ranges.h>
+#include <xml-sax.h>
#include <goffice/goffice.h>
#include <string.h>
#include <gsf/gsf-input-stdio.h>
diff --git a/src/format-template.h b/src/format-template.h
index 18c2fa8..0ae45dd 100644
--- a/src/format-template.h
+++ b/src/format-template.h
@@ -2,7 +2,7 @@
#ifndef _GNM_FORMAT_TEMPLATE_H_
# define _GNM_FORMAT_TEMPLATE_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
G_BEGIN_DECLS
diff --git a/src/func.c b/src/func.c
index 06b86a0..f6ccd47 100644
--- a/src/func.c
+++ b/src/func.c
@@ -12,24 +12,24 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <glib/gstdio.h>
-#include "gnumeric.h"
-#include "func.h"
-
-#include "parse-util.h"
-#include "dependent.h"
-#include "expr.h"
-#include "expr-impl.h"
-#include "expr-name.h"
-#include "cell.h"
-#include "workbook-priv.h"
-#include "sheet.h"
-#include "value.h"
-#include "number-match.h"
-#include "func-builtin.h"
-#include "command-context-stderr.h"
-#include "gnm-plugin.h"
-#include "gutils.h"
-#include "gui-util.h"
+#include <gnumeric.h>
+#include <func.h>
+
+#include <parse-util.h>
+#include <dependent.h>
+#include <expr.h>
+#include <expr-impl.h>
+#include <expr-name.h>
+#include <cell.h>
+#include <workbook-priv.h>
+#include <sheet.h>
+#include <value.h>
+#include <number-match.h>
+#include <func-builtin.h>
+#include <command-context-stderr.h>
+#include <gnm-plugin.h>
+#include <gutils.h>
+#include <gui-util.h>
#include <goffice/goffice.h>
#include <glib.h>
diff --git a/src/func.h b/src/func.h
index 31b938c..ad7aeef 100644
--- a/src/func.h
+++ b/src/func.h
@@ -2,8 +2,8 @@
#ifndef _GNM_FUNC_H_
# define _GNM_FUNC_H_
-#include "gnumeric.h"
-#include "dependent.h"
+#include <gnumeric.h>
+#include <dependent.h>
G_BEGIN_DECLS
diff --git a/src/gnm-cell-combo.c b/src/gnm-cell-combo.c
index 07621fb..b0c0a34 100644
--- a/src/gnm-cell-combo.c
+++ b/src/gnm-cell-combo.c
@@ -19,9 +19,9 @@
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "gnm-cell-combo.h"
-#include "sheet-view.h"
+#include <gnumeric.h>
+#include <gnm-cell-combo.h>
+#include <sheet-view.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/src/gnm-cell-combo.h b/src/gnm-cell-combo.h
index 3eceee9..9dcf5cb 100644
--- a/src/gnm-cell-combo.h
+++ b/src/gnm-cell-combo.h
@@ -2,7 +2,7 @@
#ifndef _GNM_CELL_COMBO_H_
# define _GNM_CELL_COMBO_H_
-#include "sheet-object-impl.h"
+#include <sheet-object-impl.h>
G_BEGIN_DECLS
diff --git a/src/gnm-command-impl.h b/src/gnm-command-impl.h
index 5edf542..c04a6b6 100644
--- a/src/gnm-command-impl.h
+++ b/src/gnm-command-impl.h
@@ -23,7 +23,7 @@
#ifndef GNM_COMMAND_IMPL_H
#define GNM_COMMAND_IMPL_H
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <gsf/gsf-impl-utils.h>
#include <glib-object.h>
diff --git a/src/gnm-commands-slicer.c b/src/gnm-commands-slicer.c
index 6b9fa40..569d5f9 100644
--- a/src/gnm-commands-slicer.c
+++ b/src/gnm-commands-slicer.c
@@ -21,15 +21,15 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnm-commands-slicer.h"
-#include "gnm-sheet-slicer.h"
-#include "gnm-command-impl.h"
-#include "command-context.h"
-#include "workbook-control.h"
-#include "sheet-view.h"
-#include "sheet.h"
-#include "ranges.h"
-#include "clipboard.h"
+#include <gnm-commands-slicer.h>
+#include <gnm-sheet-slicer.h>
+#include <gnm-command-impl.h>
+#include <command-context.h>
+#include <workbook-control.h>
+#include <sheet-view.h>
+#include <sheet.h>
+#include <ranges.h>
+#include <clipboard.h>
#define CMD_SLICER_REFRESH_TYPE (cmd_slicer_refresh_get_type ())
#define CMD_SLICER_REFRESH(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), CMD_SLICER_REFRESH_TYPE,
CmdSlicerRefresh))
diff --git a/src/gnm-commands-slicer.h b/src/gnm-commands-slicer.h
index df83cf9..d3eb5ad 100644
--- a/src/gnm-commands-slicer.h
+++ b/src/gnm-commands-slicer.h
@@ -2,7 +2,7 @@
#ifndef _GNM_COMMANDS_SLICER_H
# define _GNM_COMMANDS_SLICER_H
-#include "gnumeric.h"
+#include <gnumeric.h>
gboolean cmd_slicer_refresh (WorkbookControl *wbc);
diff --git a/src/gnm-data-cache-source.c b/src/gnm-data-cache-source.c
index 6c46dfd..121e900 100644
--- a/src/gnm-data-cache-source.c
+++ b/src/gnm-data-cache-source.c
@@ -21,9 +21,9 @@
*/
#include <gnumeric-config.h>
-#include "gnm-data-cache-source.h"
-#include "go-data-cache-source.h"
-#include "go-data-cache.h"
+#include <gnm-data-cache-source.h>
+#include <go-data-cache-source.h>
+#include <go-data-cache.h>
#include <gnumeric.h>
@@ -32,7 +32,7 @@
#include <expr-name.h>
#include <gsf/gsf-impl-utils.h>
-#include "gnm-i18n.h"
+#include <gnm-i18n.h>
#include <string.h>
struct _GnmDataCacheSource {
diff --git a/src/gnm-data-cache-source.h b/src/gnm-data-cache-source.h
index 9bf0e20..0be0da2 100644
--- a/src/gnm-data-cache-source.h
+++ b/src/gnm-data-cache-source.h
@@ -26,7 +26,7 @@
#include <glib-object.h>
#include <gnumeric.h>
-#include "goffice-data.h"
+#include <goffice-data.h>
G_BEGIN_DECLS
diff --git a/src/gnm-datetime.c b/src/gnm-datetime.c
index aab13df..f0a1cc3 100644
--- a/src/gnm-datetime.c
+++ b/src/gnm-datetime.c
@@ -26,11 +26,11 @@
*/
#include <gnumeric-config.h>
#include <goffice/goffice.h>
-#include "value.h"
+#include <value.h>
#include <string.h>
-#include "gnm-datetime.h"
-#include "gnm-format.h"
-#include "number-match.h"
+#include <gnm-datetime.h>
+#include <gnm-format.h>
+#include <number-match.h>
/*
* Figure out whether the format engine in goffice allows negative values
diff --git a/src/gnm-datetime.h b/src/gnm-datetime.h
index c504fb3..29f4abe 100644
--- a/src/gnm-datetime.h
+++ b/src/gnm-datetime.h
@@ -2,8 +2,8 @@
#ifndef _GNM_DATETIME_H_
# define _GNM_DATETIME_H_
-#include "gnumeric.h"
-#include "numbers.h"
+#include <gnumeric.h>
+#include <numbers.h>
#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/gnm-format.c b/src/gnm-format.c
index 21f68cf..7a769ce 100644
--- a/src/gnm-format.c
+++ b/src/gnm-format.c
@@ -23,9 +23,9 @@
*/
#include <gnumeric-config.h>
-#include "gnm-format.h"
-#include "value.h"
-#include "cell.h"
+#include <gnm-format.h>
+#include <value.h>
+#include <cell.h>
#include <goffice/goffice.h>
#include <glib/gi18n-lib.h>
diff --git a/src/gnm-format.h b/src/gnm-format.h
index 12d09a8..b4d5586 100644
--- a/src/gnm-format.h
+++ b/src/gnm-format.h
@@ -2,7 +2,7 @@
#ifndef _GNM_FORMAT_H_
# define _GNM_FORMAT_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <goffice/goffice.h>
#include <pango/pango.h>
diff --git a/src/gnm-graph-window.c b/src/gnm-graph-window.c
index c90f49e..59536d5 100644
--- a/src/gnm-graph-window.c
+++ b/src/gnm-graph-window.c
@@ -1,7 +1,7 @@
#include <gnumeric-config.h>
-#include "gnm-graph-window.h"
-#include "application.h"
+#include <gnm-graph-window.h>
+#include <application.h>
#include <string.h>
diff --git a/src/gnm-pane.c b/src/gnm-pane.c
index bb05fbb..38ad3a9 100644
--- a/src/gnm-pane.c
+++ b/src/gnm-pane.c
@@ -8,34 +8,34 @@
*/
#include <gnumeric-config.h>
#include <gnm-i18n.h>
-#include "gnumeric.h"
-#include "gnm-pane-impl.h"
-#include "gnm-pane.h"
-
-#include "sheet-control-gui-priv.h"
-#include "gui-util.h"
-#include "gutils.h"
-#include "mstyle.h"
-#include "selection.h"
-#include "parse-util.h"
-#include "ranges.h"
-#include "sheet.h"
-#include "sheet-view.h"
-#include "application.h"
-#include "workbook-view.h"
-#include "wbc-gtk-impl.h"
-#include "workbook.h"
-#include "workbook-cmd-format.h"
-#include "commands.h"
-#include "cmd-edit.h"
-#include "clipboard.h"
-#include "sheet-filter-combo.h"
-#include "widgets/gnm-cell-combo-view.h"
-#include "item-bar.h"
-#include "item-cursor.h"
-#include "item-edit.h"
-#include "item-grid.h"
-#include "gnumeric-conf.h"
+#include <gnumeric.h>
+#include <gnm-pane-impl.h>
+#include <gnm-pane.h>
+
+#include <sheet-control-gui-priv.h>
+#include <gui-util.h>
+#include <gutils.h>
+#include <mstyle.h>
+#include <selection.h>
+#include <parse-util.h>
+#include <ranges.h>
+#include <sheet.h>
+#include <sheet-view.h>
+#include <application.h>
+#include <workbook-view.h>
+#include <wbc-gtk-impl.h>
+#include <workbook.h>
+#include <workbook-cmd-format.h>
+#include <commands.h>
+#include <cmd-edit.h>
+#include <clipboard.h>
+#include <sheet-filter-combo.h>
+#include <widgets/gnm-cell-combo-view.h>
+#include <item-bar.h>
+#include <item-cursor.h>
+#include <item-edit.h>
+#include <item-grid.h>
+#include <gnumeric-conf.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/src/gnm-pane.h b/src/gnm-pane.h
index 42e3ab2..70a8067 100644
--- a/src/gnm-pane.h
+++ b/src/gnm-pane.h
@@ -2,7 +2,7 @@
#ifndef _GNM_PANE_H_
# define _GNM_PANE_H_
-#include "gnumeric-fwd.h"
+#include <gnumeric-fwd.h>
#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/gnm-plugin.c b/src/gnm-plugin.c
index d178191..bf5bc5a 100644
--- a/src/gnm-plugin.c
+++ b/src/gnm-plugin.c
@@ -7,12 +7,12 @@
*/
#include <gnumeric-config.h>
-#include "gutils.h"
+#include <gutils.h>
#include <tools/gnm-solver.h>
-#include "func.h"
-#include "gnm-plugin.h"
-#include "gnumeric-conf.h"
-#include "application.h"
+#include <func.h>
+#include <gnm-plugin.h>
+#include <gnumeric-conf.h>
+#include <application.h>
#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/src/gnm-random.c b/src/gnm-random.c
index d56e329..3de55f0 100644
--- a/src/gnm-random.c
+++ b/src/gnm-random.c
@@ -3,11 +3,11 @@
#define _BSD_SOURCE 1
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "gnm-random.h"
-#include "mathfunc.h"
-#include "sf-dpq.h"
-#include "sf-gamma.h"
+#include <gnumeric.h>
+#include <gnm-random.h>
+#include <mathfunc.h>
+#include <sf-dpq.h>
+#include <sf-gamma.h>
#include <glib/gstdio.h>
#ifdef G_OS_WIN32
#include <windows.h>
diff --git a/src/gnm-random.h b/src/gnm-random.h
index 547fa05..cfb4bc4 100644
--- a/src/gnm-random.h
+++ b/src/gnm-random.h
@@ -1,7 +1,7 @@
#ifndef _GNM_RANDOM_H_
#define _GNM_RANDOM_H_
-#include "numbers.h"
+#include <numbers.h>
G_BEGIN_DECLS
diff --git a/src/gnm-sheet-slicer-combo.c b/src/gnm-sheet-slicer-combo.c
index 36f78f7..542ca53 100644
--- a/src/gnm-sheet-slicer-combo.c
+++ b/src/gnm-sheet-slicer-combo.c
@@ -19,11 +19,11 @@
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "gnm-sheet-slicer-combo.h"
-#include "go-data-slicer-field.h"
-#include "widgets/gnm-cell-combo-view.h"
-#include "widgets/gnm-sheet-slicer-combo-view.h"
+#include <gnumeric.h>
+#include <gnm-sheet-slicer-combo.h>
+#include <go-data-slicer-field.h>
+#include <widgets/gnm-cell-combo-view.h>
+#include <widgets/gnm-sheet-slicer-combo-view.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/src/gnm-sheet-slicer-combo.h b/src/gnm-sheet-slicer-combo.h
index 932c150..021faa8 100644
--- a/src/gnm-sheet-slicer-combo.h
+++ b/src/gnm-sheet-slicer-combo.h
@@ -2,8 +2,8 @@
#ifndef _GNM_SHEET_SLICER_COMBO_H_
# define _GNM_SHEET_SLICER_COMBO_H_
-#include "gnm-cell-combo.h"
-#include "goffice-data.h"
+#include <gnm-cell-combo.h>
+#include <goffice-data.h>
G_BEGIN_DECLS
diff --git a/src/gnm-sheet-slicer.c b/src/gnm-sheet-slicer.c
index 56fb467..aeea570 100644
--- a/src/gnm-sheet-slicer.c
+++ b/src/gnm-sheet-slicer.c
@@ -21,12 +21,12 @@
*/
#include <gnumeric-config.h>
-#include "gnm-sheet-slicer.h"
-#include "go-data-slicer-impl.h"
-#include "go-data-slicer-field-impl.h"
-#include "go-data-cache.h"
-#include "sheet.h"
-#include "ranges.h"
+#include <gnm-sheet-slicer.h>
+#include <go-data-slicer-impl.h>
+#include <go-data-slicer-field-impl.h>
+#include <go-data-cache.h>
+#include <sheet.h>
+#include <ranges.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
diff --git a/src/gnm-sheet-slicer.h b/src/gnm-sheet-slicer.h
index e73ab78..612c21b 100644
--- a/src/gnm-sheet-slicer.h
+++ b/src/gnm-sheet-slicer.h
@@ -23,7 +23,7 @@
#define GNM_SHEET_SLICER_H
#include <gnumeric.h>
-#include "goffice-data.h"
+#include <goffice-data.h>
#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/src/gnm-so-filled.c b/src/gnm-so-filled.c
index 3e46d9f..c814c1b 100644
--- a/src/gnm-so-filled.c
+++ b/src/gnm-so-filled.c
@@ -22,13 +22,13 @@
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "application.h"
-#include "gnm-so-filled.h"
-#include "sheet-object-impl.h"
-#include "sheet.h"
-#include "gutils.h"
-#include "xml-sax.h"
+#include <gnumeric.h>
+#include <application.h>
+#include <gnm-so-filled.h>
+#include <sheet-object-impl.h>
+#include <sheet.h>
+#include <gutils.h>
+#include <xml-sax.h>
#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/src/gnm-so-line.c b/src/gnm-so-line.c
index 5e3b4b0..c6dcca8 100644
--- a/src/gnm-so-line.c
+++ b/src/gnm-so-line.c
@@ -22,11 +22,11 @@
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "gnm-so-line.h"
-#include "sheet-object-impl.h"
-#include "gutils.h"
-#include "xml-sax.h"
+#include <gnumeric.h>
+#include <gnm-so-line.h>
+#include <sheet-object-impl.h>
+#include <gutils.h>
+#include <xml-sax.h>
#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/src/gnm-so-path.c b/src/gnm-so-path.c
index 602ca28..0eb8a04 100644
--- a/src/gnm-so-path.c
+++ b/src/gnm-so-path.c
@@ -21,13 +21,13 @@
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "application.h"
-#include "gnm-so-path.h"
-#include "sheet-object-impl.h"
-#include "sheet.h"
-#include "gutils.h"
-#include "xml-sax.h"
+#include <gnumeric.h>
+#include <application.h>
+#include <gnm-so-path.h>
+#include <sheet-object-impl.h>
+#include <sheet.h>
+#include <gutils.h>
+#include <xml-sax.h>
#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
@@ -59,7 +59,7 @@ typedef struct {
typedef SheetObjectClass GnmSOPathClass;
#ifdef GNM_WITH_GTK
-#include "gnm-pane.h"
+#include <gnm-pane.h>
typedef struct {
SheetObjectView base;
diff --git a/src/gnm-so-polygon.c b/src/gnm-so-polygon.c
index 365819e..9f03e3e 100644
--- a/src/gnm-so-polygon.c
+++ b/src/gnm-so-polygon.c
@@ -22,11 +22,11 @@
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "gnm-so-polygon.h"
-#include "sheet-object-impl.h"
-#include "sheet.h"
-#include "parse-util.h"
+#include <gnumeric.h>
+#include <gnm-so-polygon.h>
+#include <sheet-object-impl.h>
+#include <sheet.h>
+#include <parse-util.h>
#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
@@ -45,7 +45,7 @@ typedef struct {
typedef SheetObjectClass GnmSOPolygonClass;
#ifdef GNM_WITH_GTK
-#include "gnm-pane.h"
+#include <gnm-pane.h>
static void
so_polygon_view_set_bounds (SheetObjectView *sov, double const *coords, gboolean visible)
{
diff --git a/src/gnumeric-conf.c b/src/gnumeric-conf.c
index e39c053..fa2d1b3 100644
--- a/src/gnumeric-conf.c
+++ b/src/gnumeric-conf.c
@@ -27,10 +27,10 @@
#include <gnumeric-config.h>
#include <gnumeric.h>
-#include "application.h"
-#include "gnumeric-conf.h"
-#include "gutils.h"
-#include "mstyle.h"
+#include <application.h>
+#include <gnumeric-conf.h>
+#include <gutils.h>
+#include <mstyle.h>
#include <goffice/goffice.h>
#include <value.h>
#include <number-match.h>
diff --git a/src/gnumeric-conf.h b/src/gnumeric-conf.h
index c3b072c..02014a3 100644
--- a/src/gnumeric-conf.h
+++ b/src/gnumeric-conf.h
@@ -2,9 +2,9 @@
#ifndef _GNM_GCONF_H_
# define _GNM_GCONF_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <gsf/gsf-output-csv.h>
-#include "stf-export.h"
+#include <stf-export.h>
G_BEGIN_DECLS
diff --git a/src/gnumeric-simple-canvas.c b/src/gnumeric-simple-canvas.c
index 97429d4..2c0c401 100644
--- a/src/gnumeric-simple-canvas.c
+++ b/src/gnumeric-simple-canvas.c
@@ -1,10 +1,10 @@
/* vim: set sw=8: */
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "gnumeric-simple-canvas.h"
+#include <gnumeric.h>
+#include <gnumeric-simple-canvas.h>
-#include "sheet-control-gui-priv.h"
-#include "gutils.h"
+#include <sheet-control-gui-priv.h>
+#include <gutils.h>
#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/src/gnumeric-simple-canvas.h b/src/gnumeric-simple-canvas.h
index 25f0cdc..39bd7b0 100644
--- a/src/gnumeric-simple-canvas.h
+++ b/src/gnumeric-simple-canvas.h
@@ -2,7 +2,7 @@
#ifndef _GNM_SIMPLE_CANVAS_H_
# define _GNM_SIMPLE_CANVAS_H_
-#include "gnumeric-fwd.h"
+#include <gnumeric-fwd.h>
#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/go-data-cache-field.c b/src/go-data-cache-field.c
index d5d1fa0..e6c7d99 100644
--- a/src/go-data-cache-field.c
+++ b/src/go-data-cache-field.c
@@ -23,9 +23,9 @@
*/
#include <gnumeric-config.h>
-#include "go-data-cache-field-impl.h"
-#include "go-data-cache-impl.h"
-#include "go-data-cache.h"
+#include <go-data-cache-field-impl.h>
+#include <go-data-cache-impl.h>
+#include <go-data-cache.h>
#include <go-val.h>
diff --git a/src/go-data-cache-field.h b/src/go-data-cache-field.h
index 9b94b99..d97c324 100644
--- a/src/go-data-cache-field.h
+++ b/src/go-data-cache-field.h
@@ -22,7 +22,7 @@
#ifndef GO_DATA_CACHE_FIELD_H
#define GO_DATA_CACHE_FIELD_H
-#include "goffice-data.h" /* remove after move to goffice */
+#include <goffice-data.h> /* remove after move to goffice */
#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 6b44acb..3ab4277 100644
--- a/src/go-data-cache-source.c
+++ b/src/go-data-cache-source.c
@@ -22,7 +22,7 @@
#include <goffice/goffice.h>
#include <gnumeric-config.h>
-#include "go-data-cache-source.h"
+#include <go-data-cache-source.h>
GType
go_data_cache_source_get_type (void)
diff --git a/src/go-data-cache-source.h b/src/go-data-cache-source.h
index 231d644..5f4d482 100644
--- a/src/go-data-cache-source.h
+++ b/src/go-data-cache-source.h
@@ -22,7 +22,7 @@
#ifndef GO_DATA_CACHE_SOURCE_H
#define GO_DATA_CACHE_SOURCE_H
-#include "goffice-data.h" /* remove after move to goffice */
+#include <goffice-data.h> /* remove after move to goffice */
#include <goffice/goffice.h>
#include <glib-object.h>
diff --git a/src/go-data-cache.c b/src/go-data-cache.c
index 6425103..316e347 100644
--- a/src/go-data-cache.c
+++ b/src/go-data-cache.c
@@ -21,9 +21,9 @@
*/
#include <gnumeric-config.h>
-#include "go-data-cache-impl.h"
-#include "go-data-cache-source.h"
-#include "go-data-cache-field-impl.h"
+#include <go-data-cache-impl.h>
+#include <go-data-cache-source.h>
+#include <go-data-cache-field-impl.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
diff --git a/src/go-data-cache.h b/src/go-data-cache.h
index be0a852..2a0122f 100644
--- a/src/go-data-cache.h
+++ b/src/go-data-cache.h
@@ -22,7 +22,7 @@
#ifndef GO_DATA_CACHE_H
#define GO_DATA_CACHE_H
-#include "goffice-data.h" /* remove after move to goffice */
+#include <goffice-data.h> /* remove after move to goffice */
#include <goffice/goffice.h>
#include <go-val.h>
#include <glib-object.h>
diff --git a/src/go-data-slicer-field.c b/src/go-data-slicer-field.c
index 7aaf6f0..3b64bd6 100644
--- a/src/go-data-slicer-field.c
+++ b/src/go-data-slicer-field.c
@@ -21,10 +21,10 @@
*/
#include <gnumeric-config.h>
-#include "go-data-slicer-field-impl.h"
-#include "go-data-slicer-impl.h"
-#include "go-data-cache-field.h"
-#include "go-data-cache.h"
+#include <go-data-slicer-field-impl.h>
+#include <go-data-slicer-impl.h>
+#include <go-data-cache-field.h>
+#include <go-data-cache.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
diff --git a/src/go-data-slicer-field.h b/src/go-data-slicer-field.h
index bbfb648..2bbaf7a 100644
--- a/src/go-data-slicer-field.h
+++ b/src/go-data-slicer-field.h
@@ -22,7 +22,7 @@
#ifndef GO_DATA_SLICER_FIELD_H
#define GO_DATA_SLICER_FIELD_H
-#include "goffice-data.h" /* remove after move to goffice */
+#include <goffice-data.h> /* remove after move to goffice */
#include <goffice/goffice.h>
#include <glib-object.h>
diff --git a/src/go-data-slicer.c b/src/go-data-slicer.c
index b13d199..9fd3033 100644
--- a/src/go-data-slicer.c
+++ b/src/go-data-slicer.c
@@ -21,9 +21,9 @@
*/
#include <gnumeric-config.h>
-#include "go-data-slicer-impl.h"
-#include "go-data-slicer-field-impl.h"
-#include "go-data-cache.h"
+#include <go-data-slicer-impl.h>
+#include <go-data-slicer-field-impl.h>
+#include <go-data-cache.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
diff --git a/src/go-data-slicer.h b/src/go-data-slicer.h
index 28e8d4f..5838811 100644
--- a/src/go-data-slicer.h
+++ b/src/go-data-slicer.h
@@ -22,7 +22,7 @@
#ifndef GO_DATA_SLICER_H
#define GO_DATA_SLICER_H
-#include "goffice-data.h" /* remove after move to goffice */
+#include <goffice-data.h> /* remove after move to goffice */
#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/src/go-val.c b/src/go-val.c
index 10a7490..e00ab68 100644
--- a/src/go-val.c
+++ b/src/go-val.c
@@ -21,8 +21,8 @@
*/
#include <gnumeric-config.h>
-#include "go-val.h"
-#include "gnm-datetime.h"
+#include <go-val.h>
+#include <gnm-datetime.h>
#include <goffice/goffice.h>
#include <glib/gi18n-lib.h>
diff --git a/src/go-val.h b/src/go-val.h
index 5d9779c..48c2f0f 100644
--- a/src/go-val.h
+++ b/src/go-val.h
@@ -23,8 +23,8 @@
#ifndef GO_VAL_H
#define GO_VAL_H
-#include "value.h" /* remove after move to goffice */
-#include "gnm-format.h" /* remove after move to goffice */
+#include <value.h> /* remove after move to goffice */
+#include <gnm-format.h> /* remove after move to goffice */
G_BEGIN_DECLS
#ifndef GOFFICE_NAMESPACE_DISABLE
diff --git a/src/graph.c b/src/graph.c
index 5896b95..7247909 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -20,21 +20,21 @@
* USA
*/
#include <gnumeric-config.h>
-#include "graph.h"
-#include "dependent.h"
-#include "expr.h"
-#include "cell.h"
-#include "value.h"
-#include "number-match.h"
-#include "mathfunc.h"
-#include "sheet.h"
-#include "workbook.h"
-#include "position.h"
-#include "gnm-format.h"
-#include "auto-format.h"
-#include "ranges.h"
-#include "parse-util.h"
-#include "expr-impl.h"
+#include <graph.h>
+#include <dependent.h>
+#include <expr.h>
+#include <cell.h>
+#include <value.h>
+#include <number-match.h>
+#include <mathfunc.h>
+#include <sheet.h>
+#include <workbook.h>
+#include <position.h>
+#include <gnm-format.h>
+#include <auto-format.h>
+#include <ranges.h>
+#include <parse-util.h>
+#include <expr-impl.h>
#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/src/graph.h b/src/graph.h
index 0fa2c86..d725403 100644
--- a/src/graph.h
+++ b/src/graph.h
@@ -2,8 +2,8 @@
#ifndef _GNM_GRAPH_H_
# define _GNM_GRAPH_H_
-#include "gnumeric.h"
-#include "sheet-object.h"
+#include <gnumeric.h>
+#include <sheet-object.h>
#include <goffice/goffice.h>
#include <glib-object.h>
diff --git a/src/gui-clipboard.c b/src/gui-clipboard.c
index 871996b..26aadbc 100644
--- a/src/gui-clipboard.c
+++ b/src/gui-clipboard.c
@@ -7,35 +7,35 @@
* Jody Goldberg (jody gnome org)
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "gui-clipboard.h"
-
-#include "gui-util.h"
-#include "clipboard.h"
-#include "command-context-stderr.h"
-#include "selection.h"
-#include "application.h"
-#include "workbook-control.h"
-#include "wbc-gtk.h"
-#include "workbook-priv.h"
-#include "workbook.h"
-#include "workbook-view.h"
-#include "ranges.h"
-#include "sheet.h"
-#include "sheet-style.h"
-#include "sheet-object.h"
-#include "sheet-control-gui.h"
-#include "sheet-view.h"
-#include "commands.h"
-#include "value.h"
-#include "number-match.h"
-#include "dialogs/dialog-stf.h"
-#include "stf-parse.h"
-#include "mstyle.h"
-#include "gnm-format.h"
-#include "gnumeric-conf.h"
-#include "xml-sax.h"
-#include "gutils.h"
+#include <gnumeric.h>
+#include <gui-clipboard.h>
+
+#include <gui-util.h>
+#include <clipboard.h>
+#include <command-context-stderr.h>
+#include <selection.h>
+#include <application.h>
+#include <workbook-control.h>
+#include <wbc-gtk.h>
+#include <workbook-priv.h>
+#include <workbook.h>
+#include <workbook-view.h>
+#include <ranges.h>
+#include <sheet.h>
+#include <sheet-style.h>
+#include <sheet-object.h>
+#include <sheet-control-gui.h>
+#include <sheet-view.h>
+#include <commands.h>
+#include <value.h>
+#include <number-match.h>
+#include <dialogs/dialog-stf.h>
+#include <stf-parse.h>
+#include <mstyle.h>
+#include <gnm-format.h>
+#include <gnumeric-conf.h>
+#include <xml-sax.h>
+#include <gutils.h>
#include <goffice/goffice.h>
#include <gsf/gsf-input-memory.h>
diff --git a/src/gui-clipboard.h b/src/gui-clipboard.h
index 307d769..600a369 100644
--- a/src/gui-clipboard.h
+++ b/src/gui-clipboard.h
@@ -2,7 +2,7 @@
#ifndef _GNM_GUI_CLIPBOARD_H_
# define _GNM_GUI_CLIPBOARD_H_
-#include "gnumeric-fwd.h"
+#include <gnumeric-fwd.h>
G_BEGIN_DECLS
diff --git a/src/gui-file.c b/src/gui-file.c
index a961b96..66d84d3 100644
--- a/src/gui-file.c
+++ b/src/gui-file.c
@@ -9,20 +9,20 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "gui-file.h"
-
-#include "gui-util.h"
-#include "gutils.h"
-#include "dialogs/dialogs.h"
-#include "sheet.h"
-#include "application.h"
-#include "command-context.h"
-#include "wbc-gtk-impl.h"
-#include "workbook-view.h"
-#include "workbook-priv.h"
-#include "gnumeric-conf.h"
-#include "application.h"
+#include <gnumeric.h>
+#include <gui-file.h>
+
+#include <gui-util.h>
+#include <gutils.h>
+#include <dialogs/dialogs.h>
+#include <sheet.h>
+#include <application.h>
+#include <command-context.h>
+#include <wbc-gtk-impl.h>
+#include <workbook-view.h>
+#include <workbook-priv.h>
+#include <gnumeric-conf.h>
+#include <application.h>
#include <goffice/goffice.h>
diff --git a/src/gui-file.h b/src/gui-file.h
index 79c5424..f58e3da 100644
--- a/src/gui-file.h
+++ b/src/gui-file.h
@@ -2,7 +2,7 @@
#ifndef _GNM_GUI_FILE_H_
# define _GNM_GUI_FILE_H_
-#include "gnumeric-fwd.h"
+#include <gnumeric-fwd.h>
G_BEGIN_DECLS
diff --git a/src/gui-util.c b/src/gui-util.c
index 7866497..2f17b21 100644
--- a/src/gui-util.c
+++ b/src/gui-util.c
@@ -8,22 +8,22 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "libgnumeric.h"
-#include "gui-util.h"
-
-#include "gutils.h"
-#include "parse-util.h"
-#include "style.h"
-#include "style-color.h"
-#include "value.h"
-#include "number-match.h"
-#include "gnm-format.h"
-#include "application.h"
-#include "workbook.h"
-#include "libgnumeric.h"
-#include "wbc-gtk.h"
-#include "widgets/gnumeric-expr-entry.h"
+#include <gnumeric.h>
+#include <libgnumeric.h>
+#include <gui-util.h>
+
+#include <gutils.h>
+#include <parse-util.h>
+#include <style.h>
+#include <style-color.h>
+#include <value.h>
+#include <number-match.h>
+#include <gnm-format.h>
+#include <application.h>
+#include <workbook.h>
+#include <libgnumeric.h>
+#include <wbc-gtk.h>
+#include <widgets/gnumeric-expr-entry.h>
#include <goffice/goffice.h>
#include <atk/atkrelation.h>
diff --git a/src/gui-util.h b/src/gui-util.h
index 410be9f..37045f2 100644
--- a/src/gui-util.h
+++ b/src/gui-util.h
@@ -2,9 +2,9 @@
#ifndef _GNM_GUI_UTIL_H_
# define _GNM_GUI_UTIL_H_
-#include "gnumeric-fwd.h"
+#include <gnumeric-fwd.h>
#include <goffice/goffice.h>
-#include "numbers.h"
+#include <numbers.h>
G_BEGIN_DECLS
diff --git a/src/gutils.c b/src/gutils.c
index 2657a3e..c9a44a7 100644
--- a/src/gutils.c
+++ b/src/gutils.c
@@ -9,15 +9,15 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "gutils.h"
-#include "gnumeric-paths.h"
-
-#include "sheet.h"
-#include "ranges.h"
-#include "mathfunc.h"
-#include "workbook-view.h"
-#include "workbook.h"
+#include <gnumeric.h>
+#include <gutils.h>
+#include <gnumeric-paths.h>
+
+#include <sheet.h>
+#include <ranges.h>
+#include <mathfunc.h>
+#include <workbook-view.h>
+#include <workbook.h>
#include <goffice/goffice.h>
diff --git a/src/gutils.h b/src/gutils.h
index 904911f..2a6ffb1 100644
--- a/src/gutils.h
+++ b/src/gutils.h
@@ -2,7 +2,7 @@
#ifndef _GNM_GUTILS_H_
# define _GNM_GUTILS_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <goffice/goffice.h>
#include <numbers.h>
diff --git a/src/history.c b/src/history.c
index 93aaad6..556af21 100644
--- a/src/history.c
+++ b/src/history.c
@@ -8,8 +8,8 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <goffice/goffice.h>
-#include "gnumeric.h"
-#include "history.h"
+#include <gnumeric.h>
+#include <history.h>
#include <string.h>
/*
diff --git a/src/history.h b/src/history.h
index 8b584e6..70e263a 100644
--- a/src/history.h
+++ b/src/history.h
@@ -2,7 +2,7 @@
#ifndef _GNM_HISTORY_H_
# define _GNM_HISTORY_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
G_BEGIN_DECLS
diff --git a/src/hlink-impl.h b/src/hlink-impl.h
index da895c5..49d96f0 100644
--- a/src/hlink-impl.h
+++ b/src/hlink-impl.h
@@ -1,7 +1,7 @@
#ifndef _GNM_HLINK_IMPL_H_
# define _GNM_HLINK_IMPL_H_
-#include "hlink.h"
+#include <hlink.h>
G_BEGIN_DECLS
diff --git a/src/hlink.c b/src/hlink.c
index ed7b3c9..937a8b8 100644
--- a/src/hlink.c
+++ b/src/hlink.c
@@ -22,22 +22,22 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "hlink.h"
-#include "hlink-impl.h"
-#include "command-context.h"
-#include "workbook-control.h"
-#include "workbook-view.h"
-#include "selection.h"
-#include "sheet.h"
-#include "sheet-view.h"
-#include "sheet-style.h"
-#include "ranges.h"
-#include "position.h"
-#include "expr-name.h"
-#include "expr.h"
-#include "value.h"
-#include "mstyle.h"
+#include <gnumeric.h>
+#include <hlink.h>
+#include <hlink-impl.h>
+#include <command-context.h>
+#include <workbook-control.h>
+#include <workbook-view.h>
+#include <selection.h>
+#include <sheet.h>
+#include <sheet-view.h>
+#include <sheet-style.h>
+#include <ranges.h>
+#include <position.h>
+#include <expr-name.h>
+#include <expr.h>
+#include <value.h>
+#include <mstyle.h>
#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/src/hlink.h b/src/hlink.h
index 85cea42..8d0ea07 100644
--- a/src/hlink.h
+++ b/src/hlink.h
@@ -2,8 +2,8 @@
#ifndef _GNM_HLINK_H_
# define _GNM_HLINK_H_
-#include "gnumeric.h"
-#include "wbc-gtk.h"
+#include <gnumeric.h>
+#include <wbc-gtk.h>
#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/src/input-msg.c b/src/input-msg.c
index 5fd70f9..59fe374 100644
--- a/src/input-msg.c
+++ b/src/input-msg.c
@@ -22,8 +22,8 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "input-msg.h"
+#include <gnumeric.h>
+#include <input-msg.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/src/input-msg.h b/src/input-msg.h
index 4bbba44..a2dc67a 100644
--- a/src/input-msg.h
+++ b/src/input-msg.h
@@ -2,7 +2,7 @@
#ifndef _GNM_INPUT_MSG_H_
# define _GNM_INPUT_MSG_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/src/io-context-gtk.c b/src/io-context-gtk.c
index 4ecef29..b0662f2 100644
--- a/src/io-context-gtk.c
+++ b/src/io-context-gtk.c
@@ -11,14 +11,14 @@
* (C) 2002 Jon K Hellan
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "gui-util.h"
-#include "io-context-gtk.h"
+#include <gnumeric.h>
+#include <gui-util.h>
+#include <io-context-gtk.h>
#include <goffice/goffice.h>
-#include "application.h"
-#include "libgnumeric.h"
-#include "dialogs/dialogs.h"
-#include "gnm-i18n.h"
+#include <application.h>
+#include <libgnumeric.h>
+#include <dialogs/dialogs.h>
+#include <gnm-i18n.h>
#include <gsf/gsf-impl-utils.h>
#include <stdlib.h>
diff --git a/src/io-context-gtk.h b/src/io-context-gtk.h
index 4170204..a77ce3c 100644
--- a/src/io-context-gtk.h
+++ b/src/io-context-gtk.h
@@ -2,7 +2,7 @@
# define _GNM_IO_CONTEXT_GTK_H_
#include <stdarg.h>
-#include "gnumeric-fwd.h"
+#include <gnumeric-fwd.h>
#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/item-bar.c b/src/item-bar.c
index ed7f92a..d5249e1 100644
--- a/src/item-bar.c
+++ b/src/item-bar.c
@@ -8,22 +8,22 @@
*/
#include <gnumeric-config.h>
-#include "gnm-i18n.h"
-#include "gnumeric.h"
-#include "item-bar.h"
-#include "gnm-pane-impl.h"
-
-#include "style-color.h"
-#include "sheet.h"
-#include "sheet-control-gui.h"
-#include "sheet-control-gui-priv.h"
-#include "application.h"
-#include "selection.h"
-#include "wbc-gtk-impl.h"
-#include "gui-util.h"
-#include "parse-util.h"
-#include "commands.h"
-#include "gutils.h"
+#include <gnm-i18n.h>
+#include <gnumeric.h>
+#include <item-bar.h>
+#include <gnm-pane-impl.h>
+
+#include <style-color.h>
+#include <sheet.h>
+#include <sheet-control-gui.h>
+#include <sheet-control-gui-priv.h>
+#include <application.h>
+#include <selection.h>
+#include <wbc-gtk-impl.h>
+#include <gui-util.h>
+#include <parse-util.h>
+#include <commands.h>
+#include <gutils.h>
#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/src/item-bar.h b/src/item-bar.h
index 31b9227..11f65d5 100644
--- a/src/item-bar.h
+++ b/src/item-bar.h
@@ -1,7 +1,7 @@
#ifndef _GNM_ITEM_BAR_H_
#define _GNM_ITEM_BAR_H_
-#include "gnumeric-fwd.h"
+#include <gnumeric-fwd.h>
#include <glib-object.h>
#include <pango/pango-font.h>
diff --git a/src/item-cursor.c b/src/item-cursor.c
index a622216..4970872 100644
--- a/src/item-cursor.c
+++ b/src/item-cursor.c
@@ -9,31 +9,31 @@
*/
#include <gnumeric-config.h>
-#include "gnm-i18n.h"
-#include "gnumeric.h"
-#include "item-cursor.h"
-#include "gnm-pane-impl.h"
-
-#include "sheet-control-gui.h"
-#include "sheet-control-priv.h"
-#include "style-color.h"
-#include "cell.h"
-#include "clipboard.h"
-#include "selection.h"
-#include "sheet.h"
-#include "sheet-view.h"
-#include "sheet-merge.h"
-#include "value.h"
-#include "workbook.h"
-#include "wbc-gtk.h"
-#include "gui-util.h"
-#include "cmd-edit.h"
-#include "commands.h"
-#include "ranges.h"
-#include "parse-util.h"
-#include "gutils.h"
-#include "gui-util.h"
-#include "sheet-autofill.h"
+#include <gnm-i18n.h>
+#include <gnumeric.h>
+#include <item-cursor.h>
+#include <gnm-pane-impl.h>
+
+#include <sheet-control-gui.h>
+#include <sheet-control-priv.h>
+#include <style-color.h>
+#include <cell.h>
+#include <clipboard.h>
+#include <selection.h>
+#include <sheet.h>
+#include <sheet-view.h>
+#include <sheet-merge.h>
+#include <value.h>
+#include <workbook.h>
+#include <wbc-gtk.h>
+#include <gui-util.h>
+#include <cmd-edit.h>
+#include <commands.h>
+#include <ranges.h>
+#include <parse-util.h>
+#include <gutils.h>
+#include <gui-util.h>
+#include <sheet-autofill.h>
#include <gsf/gsf-impl-utils.h>
#include <goffice/goffice.h>
#define GNUMERIC_ITEM "CURSOR"
diff --git a/src/item-cursor.h b/src/item-cursor.h
index 8af3c17..cd7c28e 100644
--- a/src/item-cursor.h
+++ b/src/item-cursor.h
@@ -1,7 +1,7 @@
#ifndef _GNM_ITEM_CURSOR_H_
#define _GNM_ITEM_CURSOR_H_
-#include "gnumeric-fwd.h"
+#include <gnumeric-fwd.h>
#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/src/item-edit.c b/src/item-edit.c
index 5723c7e..7cc3776 100644
--- a/src/item-edit.c
+++ b/src/item-edit.c
@@ -12,28 +12,28 @@
* ranges are highlighted on the spreadsheet).
*/
#include <gnumeric-config.h>
-#include "gnm-i18n.h"
-#include "gnumeric.h"
-#include "item-edit.h"
-#include "gnm-pane-impl.h"
-
-#include "item-cursor.h"
-#include "sheet-control-gui-priv.h"
-#include "sheet.h"
-#include "sheet-view.h"
-#include "sheet-style.h"
-#include "sheet-merge.h"
-#include "value.h"
-#include "ranges.h"
-#include "style.h"
-#include "style-font.h"
-#include "style-color.h"
-#include "pattern.h"
-#include "parse-util.h"
-#include "workbook.h"
-#include "wbc-gtk.h"
-#include "gui-util.h"
-#include "widgets/gnumeric-expr-entry.h"
+#include <gnm-i18n.h>
+#include <gnumeric.h>
+#include <item-edit.h>
+#include <gnm-pane-impl.h>
+
+#include <item-cursor.h>
+#include <sheet-control-gui-priv.h>
+#include <sheet.h>
+#include <sheet-view.h>
+#include <sheet-style.h>
+#include <sheet-merge.h>
+#include <value.h>
+#include <ranges.h>
+#include <style.h>
+#include <style-font.h>
+#include <style-color.h>
+#include <pattern.h>
+#include <parse-util.h>
+#include <workbook.h>
+#include <wbc-gtk.h>
+#include <gui-util.h>
+#include <widgets/gnumeric-expr-entry.h>
#define GNUMERIC_ITEM "EDIT"
#include <gsf/gsf-impl-utils.h>
diff --git a/src/item-edit.h b/src/item-edit.h
index c80d772..ecf4600 100644
--- a/src/item-edit.h
+++ b/src/item-edit.h
@@ -1,7 +1,7 @@
#ifndef _GNM_ITEM_EDIT_H_
#define _GNM_ITEM_EDIT_H_
-#include "gnumeric-fwd.h"
+#include <gnumeric-fwd.h>
#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/src/item-grid.c b/src/item-grid.c
index d800e2a..c64f73f 100644
--- a/src/item-grid.c
+++ b/src/item-grid.c
@@ -11,34 +11,34 @@
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "item-grid.h"
-
-#include "gnm-pane-impl.h"
-#include "wbc-gtk-impl.h"
-#include "workbook-view.h"
-#include "sheet-control-gui-priv.h"
-#include "sheet.h"
-#include "sheet-view.h"
-#include "sheet-style.h"
-#include "sheet-merge.h"
-#include "sheet-object-impl.h"
-#include "cell.h"
-#include "cell-draw.h"
-#include "cellspan.h"
-#include "ranges.h"
-#include "selection.h"
-#include "parse-util.h"
-#include "mstyle.h"
-#include "style-conditions.h"
-#include "position.h" /* to eval conditions */
-#include "style-border.h"
-#include "style-color.h"
-#include "pattern.h"
-#include "commands.h"
-#include "hlink.h"
-#include "gui-util.h"
-#include "gnm-i18n.h"
+#include <gnumeric.h>
+#include <item-grid.h>
+
+#include <gnm-pane-impl.h>
+#include <wbc-gtk-impl.h>
+#include <workbook-view.h>
+#include <sheet-control-gui-priv.h>
+#include <sheet.h>
+#include <sheet-view.h>
+#include <sheet-style.h>
+#include <sheet-merge.h>
+#include <sheet-object-impl.h>
+#include <cell.h>
+#include <cell-draw.h>
+#include <cellspan.h>
+#include <ranges.h>
+#include <selection.h>
+#include <parse-util.h>
+#include <mstyle.h>
+#include <style-conditions.h>
+#include <position.h> /* to eval conditions */
+#include <style-border.h>
+#include <style-color.h>
+#include <pattern.h>
+#include <commands.h>
+#include <hlink.h>
+#include <gui-util.h>
+#include <gnm-i18n.h>
#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/src/item-grid.h b/src/item-grid.h
index 1a07f7b..0ec0fe3 100644
--- a/src/item-grid.h
+++ b/src/item-grid.h
@@ -2,7 +2,7 @@
#ifndef _GNM_ITEM_GRID_H_
#define _GNM_ITEM_GRID_H_
-#include "gnumeric-fwd.h"
+#include <gnumeric-fwd.h>
#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/src/libgnumeric.c b/src/libgnumeric.c
index ac16320..121b9cf 100644
--- a/src/libgnumeric.c
+++ b/src/libgnumeric.c
@@ -23,43 +23,43 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "libgnumeric.h"
-#include "gutils.h"
-
-#include "application.h"
-#include "stf.h"
-#include "gnm-format.h"
-#include "command-context.h"
-#include "command-context-stderr.h"
-#include "workbook.h"
-#include "sheet-object.h"
-#include "number-match.h"
-#include "expr-name.h"
-#include "func.h"
-#include "print-info.h"
-#include "style-font.h"
-#include "mstyle.h"
-#include "style-border.h"
-#include "style-color.h"
-#include "print.h"
-#include "dependent.h"
-#include "sheet-autofill.h"
-#include "sheet-private.h"
-#include "xml-sax.h"
-#include "clipboard.h"
-#include "gui-clipboard.h"
-#include "value.h"
-#include "expr.h"
-#include "expr-deriv.h"
-#include "parse-util.h"
-#include "rendered-value.h"
-#include "gnumeric-conf.h"
-#include "gnm-plugin.h"
-#include "mathfunc.h"
-#include "hlink.h"
-#include "wbc-gtk-impl.h"
-#include "gnmresources.h"
+#include <gnumeric.h>
+#include <libgnumeric.h>
+#include <gutils.h>
+
+#include <application.h>
+#include <stf.h>
+#include <gnm-format.h>
+#include <command-context.h>
+#include <command-context-stderr.h>
+#include <workbook.h>
+#include <sheet-object.h>
+#include <number-match.h>
+#include <expr-name.h>
+#include <func.h>
+#include <print-info.h>
+#include <style-font.h>
+#include <mstyle.h>
+#include <style-border.h>
+#include <style-color.h>
+#include <print.h>
+#include <dependent.h>
+#include <sheet-autofill.h>
+#include <sheet-private.h>
+#include <xml-sax.h>
+#include <clipboard.h>
+#include <gui-clipboard.h>
+#include <value.h>
+#include <expr.h>
+#include <expr-deriv.h>
+#include <parse-util.h>
+#include <rendered-value.h>
+#include <gnumeric-conf.h>
+#include <gnm-plugin.h>
+#include <mathfunc.h>
+#include <hlink.h>
+#include <wbc-gtk-impl.h>
+#include <gnmresources.h>
#include <goffice/goffice.h>
#ifdef HAVE_SYS_RESOURCE_H
diff --git a/src/libgnumeric.h b/src/libgnumeric.h
index 42cd7d4..4882749 100644
--- a/src/libgnumeric.h
+++ b/src/libgnumeric.h
@@ -2,7 +2,7 @@
#ifndef _GNM_LIBGNUMERIC_H_
# define _GNM_LIBGNUMERIC_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
G_BEGIN_DECLS
diff --git a/src/main-application.c b/src/main-application.c
index bdbbec8..077d899 100644
--- a/src/main-application.c
+++ b/src/main-application.c
@@ -12,31 +12,31 @@
#include <gnumeric-config.h>
#include <glib/gi18n.h>
-#include "gnumeric.h"
-#include "libgnumeric.h"
+#include <gnumeric.h>
+#include <libgnumeric.h>
#ifdef G_OS_WIN32
#define _WIN32_WINNT 0x0501
#include <windows.h>
#include <io.h>
#endif
-#include "command-context.h"
+#include <command-context.h>
#include <goffice/goffice.h>
-#include "io-context-gtk.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 "workbook.h"
-#include "gui-file.h"
-#include "gnumeric-conf.h"
-#include "gnumeric-paths.h"
-#include "session.h"
-#include "sheet.h"
-#include "gutils.h"
-#include "gnm-plugin.h"
-#include "application.h"
-#include "func.h"
+#include <command-context-stderr.h>
+#include <wbc-gtk-impl.h>
+#include <workbook-view.h>
+#include <workbook.h>
+#include <gui-file.h>
+#include <gnumeric-conf.h>
+#include <gnumeric-paths.h>
+#include <session.h>
+#include <sheet.h>
+#include <gutils.h>
+#include <gnm-plugin.h>
+#include <application.h>
+#include <func.h>
#include <glib/gstdio.h>
diff --git a/src/mathfunc.c b/src/mathfunc.c
index 54014b0..76a915e 100644
--- a/src/mathfunc.c
+++ b/src/mathfunc.c
@@ -34,10 +34,10 @@
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "mathfunc.h"
-#include "sf-dpq.h"
-#include "sf-gamma.h"
+#include <gnumeric.h>
+#include <mathfunc.h>
+#include <sf-dpq.h>
+#include <sf-gamma.h>
#include <glib/gi18n-lib.h>
#include <math.h>
diff --git a/src/mathfunc.h b/src/mathfunc.h
index 401b080..21a8c89 100644
--- a/src/mathfunc.h
+++ b/src/mathfunc.h
@@ -2,10 +2,10 @@
#ifndef _GNM_MATHFUNC_H_
# define _GNM_MATHFUNC_H_
-#include "numbers.h"
+#include <numbers.h>
#include <math.h>
#include <glib.h>
-#include "gnumeric.h"
+#include <gnumeric.h>
G_BEGIN_DECLS
diff --git a/src/mstyle.c b/src/mstyle.c
index 3112cff..d100e16 100644
--- a/src/mstyle.c
+++ b/src/mstyle.c
@@ -8,25 +8,25 @@
* Morten Welinder <terra gnome org>
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "style.h"
-
-#include "sheet-style.h"
-#include "style-border.h"
-#include "style-font.h"
-#include "style-color.h"
-#include "style-conditions.h"
-#include "validation.h"
-#include "pattern.h"
-#include "hlink.h"
-#include "input-msg.h"
-#include "application.h"
-#include "parse-util.h"
-#include "expr.h"
-#include "value.h"
-#include "gutils.h"
-#include "ranges.h"
-#include "gnumeric-conf.h"
+#include <gnumeric.h>
+#include <style.h>
+
+#include <sheet-style.h>
+#include <style-border.h>
+#include <style-font.h>
+#include <style-color.h>
+#include <style-conditions.h>
+#include <validation.h>
+#include <pattern.h>
+#include <hlink.h>
+#include <input-msg.h>
+#include <application.h>
+#include <parse-util.h>
+#include <expr.h>
+#include <value.h>
+#include <gutils.h>
+#include <ranges.h>
+#include <gnumeric-conf.h>
#include <goffice/goffice.h>
#include <string.h>
diff --git a/src/mstyle.h b/src/mstyle.h
index 9001c3a..173fc07 100644
--- a/src/mstyle.h
+++ b/src/mstyle.h
@@ -2,8 +2,8 @@
#ifndef _GNM_MSTYLE_H_
# define _GNM_MSTYLE_H_
-#include "gnumeric.h"
-#include "style.h"
+#include <gnumeric.h>
+#include <style.h>
G_BEGIN_DECLS
diff --git a/src/number-match.c b/src/number-match.c
index cfa9d8b..731e38d 100644
--- a/src/number-match.c
+++ b/src/number-match.c
@@ -16,16 +16,16 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "number-match.h"
-
-#include "gutils.h"
-#include "style.h"
-#include "gnm-format.h"
-#include "value.h"
-#include "mathfunc.h"
-#include "numbers.h"
-#include "gnm-datetime.h"
+#include <gnumeric.h>
+#include <number-match.h>
+
+#include <gutils.h>
+#include <style.h>
+#include <gnm-format.h>
+#include <value.h>
+#include <mathfunc.h>
+#include <numbers.h>
+#include <gnm-datetime.h>
#include <goffice/goffice.h>
#include <string.h>
diff --git a/src/number-match.h b/src/number-match.h
index 9164ff8..3f901d7 100644
--- a/src/number-match.h
+++ b/src/number-match.h
@@ -2,7 +2,7 @@
#ifndef _GNM_NUMBER_MATCH_H_
# define _GNM_NUMBER_MATCH_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
G_BEGIN_DECLS
diff --git a/src/parse-util.c b/src/parse-util.c
index ab34856..38ae0e7 100644
--- a/src/parse-util.c
+++ b/src/parse-util.c
@@ -22,25 +22,25 @@
* USA
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "parse-util.h"
-
-#include "application.h"
-#include "workbook.h"
-#include "sheet.h"
-#include "value.h"
-#include "ranges.h"
-#include "cell.h"
-#include "expr.h"
-#include "number-match.h"
-#include "gnm-format.h"
-#include "expr-name.h"
-#include "func.h"
-#include "mstyle.h"
-#include "sheet-style.h"
+#include <gnumeric.h>
+#include <parse-util.h>
+
+#include <application.h>
+#include <workbook.h>
+#include <sheet.h>
+#include <value.h>
+#include <ranges.h>
+#include <cell.h>
+#include <expr.h>
+#include <number-match.h>
+#include <gnm-format.h>
+#include <expr-name.h>
+#include <func.h>
+#include <mstyle.h>
+#include <sheet-style.h>
/* For std_expr_name_handler: */
-#include "expr-impl.h"
-#include "gutils.h"
+#include <expr-impl.h>
+#include <gutils.h>
#include <goffice/goffice.h>
#include <errno.h>
diff --git a/src/parse-util.h b/src/parse-util.h
index 1dea9f4..593ce36 100644
--- a/src/parse-util.h
+++ b/src/parse-util.h
@@ -2,8 +2,8 @@
#ifndef _GNM_PARSE_UTIL_H_
# define _GNM_PARSE_UTIL_H_
-#include "gnumeric.h"
-#include "libgnumeric.h"
+#include <gnumeric.h>
+#include <libgnumeric.h>
G_BEGIN_DECLS
diff --git a/src/parser.y b/src/parser.y
index 9f08461..50c8382 100644
--- a/src/parser.y
+++ b/src/parser.y
@@ -14,20 +14,20 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "number-match.h"
-#include "expr.h"
-#include "expr-impl.h"
-#include "expr-name.h"
-#include "func.h"
-#include "workbook.h"
-#include "sheet.h"
-#include "gnm-format.h"
-#include "application.h"
-#include "parse-util.h"
-#include "gutils.h"
-#include "style.h"
-#include "value.h"
+#include <gnumeric.h>
+#include <number-match.h>
+#include <expr.h>
+#include <expr-impl.h>
+#include <expr-name.h>
+#include <func.h>
+#include <workbook.h>
+#include <sheet.h>
+#include <gnm-format.h>
+#include <application.h>
+#include <parse-util.h>
+#include <gutils.h>
+#include <style.h>
+#include <value.h>
#include <goffice/goffice.h>
#include <string.h>
diff --git a/src/pattern.c b/src/pattern.c
index d6cbe0f..c629865 100644
--- a/src/pattern.c
+++ b/src/pattern.c
@@ -8,10 +8,10 @@
* (C) 1999-2003 Jody Goldberg
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "pattern.h"
+#include <gnumeric.h>
+#include <pattern.h>
-#include "style-color.h"
+#include <style-color.h>
#include <goffice/utils/go-pattern.h>
diff --git a/src/pattern.h b/src/pattern.h
index e53d4c6..de0caf4 100644
--- a/src/pattern.h
+++ b/src/pattern.h
@@ -2,7 +2,7 @@
#ifndef _GNM_PATTERN_H_
# define _GNM_PATTERN_H_
-#include "style.h"
+#include <style.h>
G_BEGIN_DECLS
diff --git a/src/position.c b/src/position.c
index a56057f..2a819c5 100644
--- a/src/position.c
+++ b/src/position.c
@@ -22,17 +22,17 @@
* USA
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "libgnumeric.h"
-#include "position.h"
-
-#include "sheet.h"
-#include "sheet-view.h"
-#include "cell.h"
-#include "value.h"
-#include "ranges.h"
+#include <gnumeric.h>
+#include <libgnumeric.h>
+#include <position.h>
+
+#include <sheet.h>
+#include <sheet-view.h>
+#include <cell.h>
+#include <value.h>
+#include <ranges.h>
#include <string.h>
-#include "workbook.h"
+#include <workbook.h>
/* GnmCellPos made a boxed type */
static GnmCellPos *
diff --git a/src/position.h b/src/position.h
index 26e7c34..d49e62e 100644
--- a/src/position.h
+++ b/src/position.h
@@ -2,7 +2,7 @@
#ifndef _GNM_POSITION_H_
# define _GNM_POSITION_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
G_BEGIN_DECLS
diff --git a/src/preview-grid-impl.h b/src/preview-grid-impl.h
index 8c6548f..2a25f7a 100644
--- a/src/preview-grid-impl.h
+++ b/src/preview-grid-impl.h
@@ -2,7 +2,7 @@
#ifndef _GNM_PREVIEW_GRID_IMPL_H_
#define _GNM_PREVIEW_GRID_IMPL_H_
-#include "preview-grid.h"
+#include <preview-grid.h>
#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/preview-grid.c b/src/preview-grid.c
index e2d90ce..c2a95c5 100644
--- a/src/preview-grid.c
+++ b/src/preview-grid.c
@@ -22,21 +22,21 @@
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "preview-grid-impl.h"
-
-#include "cell.h"
-#include "sheet.h"
-#include "cell-draw.h"
-#include "colrow.h"
-#include "pattern.h"
-#include "mstyle.h"
-#include "rendered-value.h"
-#include "sheet-style.h"
-#include "style-border.h"
-#include "style-color.h"
-#include "value.h"
-#include "gnm-marshalers.h"
+#include <gnumeric.h>
+#include <preview-grid-impl.h>
+
+#include <cell.h>
+#include <sheet.h>
+#include <cell-draw.h>
+#include <colrow.h>
+#include <pattern.h>
+#include <mstyle.h>
+#include <rendered-value.h>
+#include <sheet-style.h>
+#include <style-border.h>
+#include <style-color.h>
+#include <value.h>
+#include <gnm-marshalers.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/src/preview-grid.h b/src/preview-grid.h
index d4d0acb..18d924b 100644
--- a/src/preview-grid.h
+++ b/src/preview-grid.h
@@ -1,7 +1,7 @@
#ifndef _GNM_PREVIEW_GRID_H_
#define _GNM_PREVIEW_GRID_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/src/print-cell.c b/src/print-cell.c
index 02775b4..79849d2 100644
--- a/src/print-cell.c
+++ b/src/print-cell.c
@@ -9,28 +9,28 @@
* Copyright (C) 2007-2009 Morten Welinder (terra gnome org)
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "print-cell.h"
-
-#include "application.h"
-#include "dependent.h"
-#include "gnm-format.h"
-#include "style-color.h"
-#include "style-font.h"
-#include "parse-util.h"
-#include "cell.h"
-#include "value.h"
-#include "style-border.h"
-#include "style-conditions.h"
-#include "pattern.h"
-#include "cellspan.h"
-#include "ranges.h"
-#include "sheet.h"
-#include "sheet-style.h"
-#include "sheet-merge.h"
-#include "rendered-value.h"
-#include "cell-draw.h"
-#include "print-info.h"
+#include <gnumeric.h>
+#include <print-cell.h>
+
+#include <application.h>
+#include <dependent.h>
+#include <gnm-format.h>
+#include <style-color.h>
+#include <style-font.h>
+#include <parse-util.h>
+#include <cell.h>
+#include <value.h>
+#include <style-border.h>
+#include <style-conditions.h>
+#include <pattern.h>
+#include <cellspan.h>
+#include <ranges.h>
+#include <sheet.h>
+#include <sheet-style.h>
+#include <sheet-merge.h>
+#include <rendered-value.h>
+#include <cell-draw.h>
+#include <print-info.h>
#include <string.h>
#include <locale.h>
diff --git a/src/print-cell.h b/src/print-cell.h
index 7dfea8b..7a881f0 100644
--- a/src/print-cell.h
+++ b/src/print-cell.h
@@ -2,8 +2,8 @@
#ifndef _GNM_PRINT_CELL_H_
# define _GNM_PRINT_CELL_H_
-#include "gnumeric.h"
-#include "print-info.h"
+#include <gnumeric.h>
+#include <print-info.h>
#include <cairo.h>
G_BEGIN_DECLS
diff --git a/src/print-info.c b/src/print-info.c
index 18dfa0b..68be60e 100644
--- a/src/print-info.c
+++ b/src/print-info.c
@@ -11,22 +11,22 @@
* Copyright (C) 2007-2009 Morten Welinder (terra gnome org)
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "print-info.h"
-
-#include "print.h"
-#include "gutils.h"
-#include "ranges.h"
-#include "gnm-format.h"
-#include "func.h"
-#include "sheet.h"
-#include "value.h"
-#include "workbook.h"
-#include "workbook-view.h"
-#include "gnumeric-conf.h"
-#include "parse-util.h"
-#include "sheet-object.h"
-#include "sheet-object-graph.h"
+#include <gnumeric.h>
+#include <print-info.h>
+
+#include <print.h>
+#include <gutils.h>
+#include <ranges.h>
+#include <gnm-format.h>
+#include <func.h>
+#include <sheet.h>
+#include <value.h>
+#include <workbook.h>
+#include <workbook-view.h>
+#include <gnumeric-conf.h>
+#include <parse-util.h>
+#include <sheet-object.h>
+#include <sheet-object-graph.h>
#include <goffice/goffice.h>
#include <gsf/gsf-doc-meta-data.h>
diff --git a/src/print-info.h b/src/print-info.h
index 404bc33..ca0af71 100644
--- a/src/print-info.h
+++ b/src/print-info.h
@@ -2,8 +2,8 @@
#ifndef _GNM_PRINT_INFO_H_
# define _GNM_PRINT_INFO_H_
-#include "gnumeric.h"
-#include "print.h"
+#include <gnumeric.h>
+#include <print.h>
G_BEGIN_DECLS
diff --git a/src/print.c b/src/print.c
index 3e5d0a6..a4314b4 100644
--- a/src/print.c
+++ b/src/print.c
@@ -14,33 +14,33 @@
* Handles printing of Sheets.
*/
#include <gnumeric-config.h>
-#include "print-cell.h"
-
-#include "gnumeric.h"
-#include "print.h"
-
-#include "gui-util.h"
-#include "gutils.h"
-#include "sheet-object.h"
-#include "sheet-object-impl.h"
-#include "selection.h"
-#include "workbook.h"
-#include "workbook-control.h"
-#include "wbc-gtk.h"
-#include "command-context.h"
-#include "dialogs/dialogs.h"
-#include "gnumeric-conf.h"
-#include "libgnumeric.h"
-#include "sheet.h"
-#include "value.h"
-#include "cellspan.h"
-#include "print-info.h"
-#include "application.h"
-#include "sheet-style.h"
-#include "ranges.h"
-#include "parse-util.h"
-#include "style-font.h"
-#include "gnumeric-conf.h"
+#include <print-cell.h>
+
+#include <gnumeric.h>
+#include <print.h>
+
+#include <gui-util.h>
+#include <gutils.h>
+#include <sheet-object.h>
+#include <sheet-object-impl.h>
+#include <selection.h>
+#include <workbook.h>
+#include <workbook-control.h>
+#include <wbc-gtk.h>
+#include <command-context.h>
+#include <dialogs/dialogs.h>
+#include <gnumeric-conf.h>
+#include <libgnumeric.h>
+#include <sheet.h>
+#include <value.h>
+#include <cellspan.h>
+#include <print-info.h>
+#include <application.h>
+#include <sheet-style.h>
+#include <ranges.h>
+#include <parse-util.h>
+#include <style-font.h>
+#include <gnumeric-conf.h>
#include <goffice/goffice.h>
#include <gsf/gsf-meta-names.h>
diff --git a/src/print.h b/src/print.h
index dbf820b..aeede9c 100644
--- a/src/print.h
+++ b/src/print.h
@@ -2,7 +2,7 @@
#ifndef _GNM_PRINT_H_
# define _GNM_PRINT_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <gsf/gsf-output.h>
#include <cairo.h>
diff --git a/src/rangefunc-strings.c b/src/rangefunc-strings.c
index 86fe7d1..e023cff 100644
--- a/src/rangefunc-strings.c
+++ b/src/rangefunc-strings.c
@@ -6,8 +6,8 @@
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "rangefunc-strings.h"
+#include <gnumeric.h>
+#include <rangefunc-strings.h>
#include <string.h>
diff --git a/src/rangefunc-strings.h b/src/rangefunc-strings.h
index 7f6f47d..44927c3 100644
--- a/src/rangefunc-strings.h
+++ b/src/rangefunc-strings.h
@@ -2,7 +2,7 @@
#ifndef _GNM_RANGEFUNC_STRINGS_H_
# define _GNM_RANGEFUNC_STRINGS_H_
-#include "numbers.h"
+#include <numbers.h>
G_BEGIN_DECLS
diff --git a/src/rangefunc.c b/src/rangefunc.c
index 28a2e04..f873059 100644
--- a/src/rangefunc.c
+++ b/src/rangefunc.c
@@ -8,16 +8,16 @@
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "rangefunc.h"
+#include <gnumeric.h>
+#include <rangefunc.h>
-#include "mathfunc.h"
-#include "sf-gamma.h"
-#include "gutils.h"
+#include <mathfunc.h>
+#include <sf-gamma.h>
+#include <gutils.h>
#include <math.h>
#include <stdlib.h>
#include <string.h>
-#include "tools/analysis-tools.h"
+#include <tools/analysis-tools.h>
int
gnm_range_count (G_GNUC_UNUSED gnm_float const *xs, int n, gnm_float *res)
diff --git a/src/rangefunc.h b/src/rangefunc.h
index d2cc3db..596c13f 100644
--- a/src/rangefunc.h
+++ b/src/rangefunc.h
@@ -2,7 +2,7 @@
#ifndef _GNM_RANGEFUNC_H_
# define _GNM_RANGEFUNC_H_
-#include "numbers.h"
+#include <numbers.h>
#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/ranges.c b/src/ranges.c
index 42ac101..4992f33 100644
--- a/src/ranges.c
+++ b/src/ranges.c
@@ -9,22 +9,22 @@
* Copyright (C) 2007-2009 Morten Welinder (terra gnome org)
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "ranges.h"
-
-#include "commands.h"
-#include "numbers.h"
-#include "expr.h"
-#include "expr-impl.h"
-#include "expr-name.h"
-#include "sheet.h"
-#include "sheet-style.h"
-#include "parse-util.h"
-#include "value.h"
-#include "cell.h"
-#include "style.h"
-#include "workbook.h"
-#include "gnumeric-conf.h"
+#include <gnumeric.h>
+#include <ranges.h>
+
+#include <commands.h>
+#include <numbers.h>
+#include <expr.h>
+#include <expr-impl.h>
+#include <expr-name.h>
+#include <sheet.h>
+#include <sheet-style.h>
+#include <parse-util.h>
+#include <value.h>
+#include <cell.h>
+#include <style.h>
+#include <workbook.h>
+#include <gnumeric-conf.h>
#include <stdlib.h>
#include <glib.h>
diff --git a/src/ranges.h b/src/ranges.h
index 35bd5be..1192b01 100644
--- a/src/ranges.h
+++ b/src/ranges.h
@@ -2,7 +2,7 @@
#ifndef _GNM_RANGES_H_
# define _GNM_RANGES_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/src/regression.h b/src/regression.h
index 977a28e..6b1ba06 100644
--- a/src/regression.h
+++ b/src/regression.h
@@ -2,7 +2,7 @@
#ifndef _GNM_REGRESSION_H_
# define _GNM_REGRESSION_H_
-#include "numbers.h"
+#include <numbers.h>
#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/rendered-value.c b/src/rendered-value.c
index 9387a14..15b51b0 100644
--- a/src/rendered-value.c
+++ b/src/rendered-value.c
@@ -23,23 +23,23 @@
* USA
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "rendered-value.h"
-
-#include "expr.h"
-#include "cell.h"
-#include "style.h"
-#include "style-color.h"
-#include "style-font.h"
-#include "style-border.h"
-#include "style-conditions.h"
-#include "sheet.h"
-#include "sheet-merge.h"
-#include "gnm-format.h"
-#include "value.h"
-#include "parse-util.h"
-#include "workbook.h"
-#include "gutils.h"
+#include <gnumeric.h>
+#include <rendered-value.h>
+
+#include <expr.h>
+#include <cell.h>
+#include <style.h>
+#include <style-color.h>
+#include <style-font.h>
+#include <style-border.h>
+#include <style-conditions.h>
+#include <sheet.h>
+#include <sheet-merge.h>
+#include <gnm-format.h>
+#include <value.h>
+#include <parse-util.h>
+#include <workbook.h>
+#include <gutils.h>
#include <string.h>
#include <goffice/goffice.h>
diff --git a/src/rendered-value.h b/src/rendered-value.h
index 1b45b94..4ede34f 100644
--- a/src/rendered-value.h
+++ b/src/rendered-value.h
@@ -2,7 +2,7 @@
#ifndef _GNM_RENDERED_VALUE_H_
# define _GNM_RENDERED_VALUE_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <pango/pango.h>
G_BEGIN_DECLS
diff --git a/src/search.c b/src/search.c
index b40f59b..57b5575 100644
--- a/src/search.c
+++ b/src/search.c
@@ -5,19 +5,19 @@
*/
#include <gnumeric-config.h>
-#include "gnm-i18n.h"
-#include "gnumeric.h"
-#include "search.h"
-
-#include "gutils.h"
-#include "ranges.h"
-#include "sheet.h"
-#include "workbook.h"
-#include "position.h"
-#include "cell.h"
-#include "number-match.h"
-#include "value.h"
-#include "sheet-object-cell-comment.h"
+#include <gnm-i18n.h>
+#include <gnumeric.h>
+#include <search.h>
+
+#include <gutils.h>
+#include <ranges.h>
+#include <sheet.h>
+#include <workbook.h>
+#include <position.h>
+#include <cell.h>
+#include <number-match.h>
+#include <value.h>
+#include <sheet-object-cell-comment.h>
#include <gsf/gsf-impl-utils.h>
#include <string.h>
diff --git a/src/selection.c b/src/selection.c
index 378db8e..1390f82 100644
--- a/src/selection.c
+++ b/src/selection.c
@@ -10,26 +10,26 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "selection.h"
-
-#include "sheet.h"
-#include "sheet-view.h"
-#include "sheet-merge.h"
-#include "sheet-style.h"
-#include "sheet-private.h"
-#include "sheet-control.h"
-#include "parse-util.h"
-#include "clipboard.h"
-#include "ranges.h"
-#include "application.h"
-#include "command-context.h"
-#include "workbook-control.h"
-#include "workbook-view.h"
-#include "workbook-priv.h"
-#include "commands.h"
-#include "value.h"
-#include "cell.h"
+#include <gnumeric.h>
+#include <selection.h>
+
+#include <sheet.h>
+#include <sheet-view.h>
+#include <sheet-merge.h>
+#include <sheet-style.h>
+#include <sheet-private.h>
+#include <sheet-control.h>
+#include <parse-util.h>
+#include <clipboard.h>
+#include <ranges.h>
+#include <application.h>
+#include <command-context.h>
+#include <workbook-control.h>
+#include <workbook-view.h>
+#include <workbook-priv.h>
+#include <commands.h>
+#include <value.h>
+#include <cell.h>
#include <goffice/goffice.h>
#include <expr.h>
#include <graph.h>
diff --git a/src/selection.h b/src/selection.h
index 73de816..184ec41 100644
--- a/src/selection.h
+++ b/src/selection.h
@@ -2,7 +2,7 @@
#ifndef _GNM_SELECTION_H_
# define _GNM_SELECTION_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/session.c b/src/session.c
index 1d0cb27..3832841 100644
--- a/src/session.c
+++ b/src/session.c
@@ -19,7 +19,7 @@
#include <gnumeric-config.h>
-#include "session.h"
+#include <session.h>
/**
* gnm_session_init: (skip)
diff --git a/src/session.h b/src/session.h
index a69d61d..471dffc 100644
--- a/src/session.h
+++ b/src/session.h
@@ -2,7 +2,7 @@
#ifndef _GNM_SESSION_H_
# define _GNM_SESSION_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
G_BEGIN_DECLS
diff --git a/src/sheet-autofill.c b/src/sheet-autofill.c
index 494cd1a..36d0a05 100644
--- a/src/sheet-autofill.c
+++ b/src/sheet-autofill.c
@@ -9,20 +9,20 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "sheet-autofill.h"
-
-#include "sheet.h"
-#include "cell.h"
-#include "value.h"
-#include "workbook.h"
-#include "sheet-style.h"
-#include "expr.h"
-#include "gnm-datetime.h"
-#include "mstyle.h"
-#include "ranges.h"
-#include "sheet-merge.h"
-#include "gnm-format.h"
+#include <gnumeric.h>
+#include <sheet-autofill.h>
+
+#include <sheet.h>
+#include <cell.h>
+#include <value.h>
+#include <workbook.h>
+#include <sheet-style.h>
+#include <expr.h>
+#include <gnm-datetime.h>
+#include <mstyle.h>
+#include <ranges.h>
+#include <sheet-merge.h>
+#include <gnm-format.h>
#include <goffice/goffice.h>
#include <string.h>
diff --git a/src/sheet-autofill.h b/src/sheet-autofill.h
index 8ba2f91..2ec0ea0 100644
--- a/src/sheet-autofill.h
+++ b/src/sheet-autofill.h
@@ -2,7 +2,7 @@
#ifndef _GNM_SHEET_AUTOFILL_H_
# define _GNM_SHEET_AUTOFILL_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
G_BEGIN_DECLS
diff --git a/src/sheet-control-gui-priv.h b/src/sheet-control-gui-priv.h
index c203461..a8103d6 100644
--- a/src/sheet-control-gui-priv.h
+++ b/src/sheet-control-gui-priv.h
@@ -2,9 +2,9 @@
#ifndef _GNM_SHEET_CONTROL_GUI_PRIV_H_
# define _GNM_SHEET_CONTROL_GUI_PRIV_H_
-#include "sheet-control-gui.h"
-#include "sheet-control-priv.h"
-#include "sheet-object.h"
+#include <sheet-control-gui.h>
+#include <sheet-control-priv.h>
+#include <sheet-object.h>
G_BEGIN_DECLS
diff --git a/src/sheet-control-gui.c b/src/sheet-control-gui.c
index 1434410..4f41a5a 100644
--- a/src/sheet-control-gui.c
+++ b/src/sheet-control-gui.c
@@ -22,48 +22,48 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "sheet-control-gui-priv.h"
-
-#include "sheet.h"
-#include "sheet-private.h"
-#include "sheet-view.h"
-#include "sheet-merge.h"
-#include "workbook.h"
-#include "workbook-view.h"
-#include "workbook-cmd-format.h"
-#include "wbc-gtk-impl.h"
-#include "cell.h"
-#include "selection.h"
-#include "style.h"
-#include "sheet-style.h"
-#include "sheet-object-impl.h"
-#include "sheet-object-cell-comment.h"
-#include "sheet-object-image.h"
-#include "gui-util.h"
-#include "gutils.h"
-#include "parse-util.h"
-#include "selection.h"
-#include "application.h"
-#include "cellspan.h"
-#include "cmd-edit.h"
-#include "commands.h"
-#include "gnm-commands-slicer.h"
-#include "clipboard.h"
-#include "dialogs/dialogs.h"
-#include "gui-file.h"
-#include "sheet-merge.h"
-#include "ranges.h"
-#include "xml-sax.h"
-#include "style-color.h"
-#include "gnumeric-conf.h"
-
-#include "gnm-pane-impl.h"
-#include "item-bar.h"
-#include "item-cursor.h"
-#include "widgets/gnumeric-expr-entry.h"
-#include "gnm-sheet-slicer.h"
-#include "input-msg.h"
+#include <gnumeric.h>
+#include <sheet-control-gui-priv.h>
+
+#include <sheet.h>
+#include <sheet-private.h>
+#include <sheet-view.h>
+#include <sheet-merge.h>
+#include <workbook.h>
+#include <workbook-view.h>
+#include <workbook-cmd-format.h>
+#include <wbc-gtk-impl.h>
+#include <cell.h>
+#include <selection.h>
+#include <style.h>
+#include <sheet-style.h>
+#include <sheet-object-impl.h>
+#include <sheet-object-cell-comment.h>
+#include <sheet-object-image.h>
+#include <gui-util.h>
+#include <gutils.h>
+#include <parse-util.h>
+#include <selection.h>
+#include <application.h>
+#include <cellspan.h>
+#include <cmd-edit.h>
+#include <commands.h>
+#include <gnm-commands-slicer.h>
+#include <clipboard.h>
+#include <dialogs/dialogs.h>
+#include <gui-file.h>
+#include <sheet-merge.h>
+#include <ranges.h>
+#include <xml-sax.h>
+#include <style-color.h>
+#include <gnumeric-conf.h>
+
+#include <gnm-pane-impl.h>
+#include <item-bar.h>
+#include <item-cursor.h>
+#include <widgets/gnumeric-expr-entry.h>
+#include <gnm-sheet-slicer.h>
+#include <input-msg.h>
#include <go-data-slicer-field.h>
#include <goffice/goffice.h>
diff --git a/src/sheet-control-gui.h b/src/sheet-control-gui.h
index 8eb7e0b..15f6fa9 100644
--- a/src/sheet-control-gui.h
+++ b/src/sheet-control-gui.h
@@ -2,8 +2,8 @@
#ifndef _GNM_SHEET_CONTROL_GUI_H_
# define _GNM_SHEET_CONTROL_GUI_H_
-#include "gnumeric-fwd.h"
-#include "sheet-control.h"
+#include <gnumeric-fwd.h>
+#include <sheet-control.h>
G_BEGIN_DECLS
diff --git a/src/sheet-control-priv.h b/src/sheet-control-priv.h
index f476ef0..61a53fa 100644
--- a/src/sheet-control-priv.h
+++ b/src/sheet-control-priv.h
@@ -2,7 +2,7 @@
#ifndef _GNM_SHEET_CONTROL_PRIV_H_
# define _GNM_SHEET_CONTROL_PRIV_H_
-#include "sheet-control.h"
+#include <sheet-control.h>
G_BEGIN_DECLS
diff --git a/src/sheet-control.c b/src/sheet-control.c
index a8ec2e0..d8c01ce 100644
--- a/src/sheet-control.c
+++ b/src/sheet-control.c
@@ -19,9 +19,9 @@
* USA
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "sheet-control-priv.h"
-#include "sheet-view.h"
+#include <gnumeric.h>
+#include <sheet-control-priv.h>
+#include <sheet-view.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/src/sheet-control.h b/src/sheet-control.h
index ec7f779..0ce0918 100644
--- a/src/sheet-control.h
+++ b/src/sheet-control.h
@@ -2,7 +2,7 @@
#ifndef _GNM_SHEET_CONTROL_H_
# define _GNM_SHEET_CONTROL_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/src/sheet-diff.c b/src/sheet-diff.c
index 4703a4b..218f38b 100644
--- a/src/sheet-diff.c
+++ b/src/sheet-diff.c
@@ -19,18 +19,18 @@
* USA
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "sheet-diff.h"
-#include "sheet.h"
-#include "cell.h"
-#include "expr.h"
-#include "value.h"
-#include "sheet-style.h"
-#include "mstyle.h"
-#include "ranges.h"
-#include "expr-name.h"
-#include "workbook.h"
-#include "workbook-priv.h"
+#include <gnumeric.h>
+#include <sheet-diff.h>
+#include <sheet.h>
+#include <cell.h>
+#include <expr.h>
+#include <value.h>
+#include <sheet-style.h>
+#include <mstyle.h>
+#include <ranges.h>
+#include <expr-name.h>
+#include <workbook.h>
+#include <workbook-priv.h>
#include <string.h>
/* ------------------------------------------------------------------------- */
diff --git a/src/sheet-diff.h b/src/sheet-diff.h
index 82328fc..8765fd8 100644
--- a/src/sheet-diff.h
+++ b/src/sheet-diff.h
@@ -1,7 +1,7 @@
#ifndef GNM_SHEET_DIFF_H
#define GNM_SHEET_DIFF_H
-#include "gnumeric.h"
+#include <gnumeric.h>
G_BEGIN_DECLS
diff --git a/src/sheet-filter-combo.h b/src/sheet-filter-combo.h
index b578cf6..ea31abc 100644
--- a/src/sheet-filter-combo.h
+++ b/src/sheet-filter-combo.h
@@ -2,7 +2,7 @@
#ifndef _GNM_SHEET_FILTER_COMBO_H_
# define _GNM_SHEET_FILTER_COMBO_H_
-#include "sheet-object-impl.h"
+#include <sheet-object-impl.h>
G_BEGIN_DECLS
diff --git a/src/sheet-filter.c b/src/sheet-filter.c
index 0fc0775..13b7bb7 100644
--- a/src/sheet-filter.c
+++ b/src/sheet-filter.c
@@ -21,23 +21,23 @@
* USA
*/
#include <gnumeric-config.h>
-#include "libgnumeric.h"
-#include "sheet-filter.h"
-#include "sheet-filter-combo.h"
-
-#include "workbook.h"
-#include "sheet.h"
-#include "sheet-private.h"
-#include "cell.h"
-#include "expr.h"
-#include "value.h"
-#include "gnm-format.h"
-#include "ranges.h"
-#include "number-match.h"
-#include "gutils.h"
-#include "sheet-object.h"
-#include "widgets/gnm-filter-combo-view.h"
-#include "widgets/gnm-cell-combo-view.h"
+#include <libgnumeric.h>
+#include <sheet-filter.h>
+#include <sheet-filter-combo.h>
+
+#include <workbook.h>
+#include <sheet.h>
+#include <sheet-private.h>
+#include <cell.h>
+#include <expr.h>
+#include <value.h>
+#include <gnm-format.h>
+#include <ranges.h>
+#include <number-match.h>
+#include <gutils.h>
+#include <sheet-object.h>
+#include <widgets/gnm-filter-combo-view.h>
+#include <widgets/gnm-cell-combo-view.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
diff --git a/src/sheet-filter.h b/src/sheet-filter.h
index 2fe7af2..c9e7707 100644
--- a/src/sheet-filter.h
+++ b/src/sheet-filter.h
@@ -2,7 +2,7 @@
#ifndef _GNM_SHEET_FILTER_H_
# define _GNM_SHEET_FILTER_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/sheet-merge.c b/src/sheet-merge.c
index 73d7877..f94a9bf 100644
--- a/src/sheet-merge.c
+++ b/src/sheet-merge.c
@@ -22,20 +22,20 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "sheet-merge.h"
-
-#include "sheet-object.h"
-#include "sheet.h"
-#include "sheet-view.h"
-#include "sheet-private.h"
-#include "ranges.h"
-#include "cell.h"
-#include "cellspan.h"
-#include "sheet-style.h"
-#include "mstyle.h"
-#include "expr.h"
-#include "command-context.h"
+#include <gnumeric.h>
+#include <sheet-merge.h>
+
+#include <sheet-object.h>
+#include <sheet.h>
+#include <sheet-view.h>
+#include <sheet-private.h>
+#include <ranges.h>
+#include <cell.h>
+#include <cellspan.h>
+#include <sheet-style.h>
+#include <mstyle.h>
+#include <expr.h>
+#include <command-context.h>
static gint
range_row_cmp (GnmRange const *a, GnmRange const *b)
diff --git a/src/sheet-merge.h b/src/sheet-merge.h
index 84ac5b1..ba36462 100644
--- a/src/sheet-merge.h
+++ b/src/sheet-merge.h
@@ -2,7 +2,7 @@
#ifndef _GNM_SHEET_MERGE_H_
# define _GNM_SHEET_MERGE_H_
-#include "gnumeric.h"
+#include <gnumeric.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 b2d0fdc..e263f75 100644
--- a/src/sheet-object-cell-comment.c
+++ b/src/sheet-object-cell-comment.c
@@ -21,17 +21,17 @@
* USA
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "sheet-object-cell-comment.h"
-
-#include "gnm-pane-impl.h"
-#include "sheet-object-impl.h"
-#include "sheet.h"
-#include "sheet-view.h"
-#include "sheet-merge.h"
-#include "sheet-control-gui-priv.h"
-#include "dialogs/dialogs.h"
-#include "gui-util.h"
+#include <gnumeric.h>
+#include <sheet-object-cell-comment.h>
+
+#include <gnm-pane-impl.h>
+#include <sheet-object-impl.h>
+#include <sheet.h>
+#include <sheet-view.h>
+#include <sheet-merge.h>
+#include <sheet-control-gui-priv.h>
+#include <dialogs/dialogs.h>
+#include <gui-util.h>
#include <goffice/goffice.h>
#include <string.h>
diff --git a/src/sheet-object-cell-comment.h b/src/sheet-object-cell-comment.h
index 4bb410d..5fe2d62 100644
--- a/src/sheet-object-cell-comment.h
+++ b/src/sheet-object-cell-comment.h
@@ -2,7 +2,7 @@
#ifndef _GNM_SHEET_OBJECT_CELL_COMMENT_H_
# define _GNM_SHEET_OBJECT_CELL_COMMENT_H_
-#include "sheet-object.h"
+#include <sheet-object.h>
G_BEGIN_DECLS
diff --git a/src/sheet-object-component.c b/src/sheet-object-component.c
index db832fe..118756e 100644
--- a/src/sheet-object-component.c
+++ b/src/sheet-object-component.c
@@ -19,15 +19,15 @@
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "application.h"
-#include "commands.h"
-#include "gnm-pane-impl.h"
-#include "gui-util.h"
-#include "sheet-control-gui.h"
-#include "sheet-object-component.h"
-#include "sheet-object-impl.h"
-#include "wbc-gtk.h"
+#include <gnumeric.h>
+#include <application.h>
+#include <commands.h>
+#include <gnm-pane-impl.h>
+#include <gui-util.h>
+#include <sheet-control-gui.h>
+#include <sheet-object-component.h>
+#include <sheet-object-impl.h>
+#include <wbc-gtk.h>
#include <goffice/goffice.h>
#include <goffice/component/go-component.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/src/sheet-object-component.h b/src/sheet-object-component.h
index 8c9239a..bc5b848 100644
--- a/src/sheet-object-component.h
+++ b/src/sheet-object-component.h
@@ -21,8 +21,8 @@
#ifndef _GNM_SHEET_OBJECT_COMPONENT_H_
#define _GNM_SHEET_OBJECT_COMPONENT_H_
-#include "sheet-object.h"
-#include "gnumeric-fwd.h"
+#include <sheet-object.h>
+#include <gnumeric-fwd.h>
#include <goffice/component/go-component.h>
G_BEGIN_DECLS
diff --git a/src/sheet-object-graph.c b/src/sheet-object-graph.c
index 28bca53..153ff36 100644
--- a/src/sheet-object-graph.c
+++ b/src/sheet-object-graph.c
@@ -22,24 +22,24 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "sheet-object-graph.h"
-
-#include "gnm-pane-impl.h"
-#include "sheet-control-gui.h"
-#include "gui-util.h"
-#include "gui-file.h"
-#include "gnm-graph-window.h"
-#include "style-color.h"
-#include "sheet-object-impl.h"
-#include "wbc-gtk.h"
-#include "commands.h"
-#include "application.h"
-#include "sheet.h"
-#include "print-info.h"
-#include "workbook.h"
-#include "workbook-view.h"
-#include "gutils.h"
+#include <gnumeric.h>
+#include <sheet-object-graph.h>
+
+#include <gnm-pane-impl.h>
+#include <sheet-control-gui.h>
+#include <gui-util.h>
+#include <gui-file.h>
+#include <gnm-graph-window.h>
+#include <style-color.h>
+#include <sheet-object-impl.h>
+#include <wbc-gtk.h>
+#include <commands.h>
+#include <application.h>
+#include <sheet.h>
+#include <print-info.h>
+#include <workbook.h>
+#include <workbook-view.h>
+#include <gutils.h>
#include <graph.h>
#include <goffice/goffice.h>
diff --git a/src/sheet-object-graph.h b/src/sheet-object-graph.h
index 15de8b6..87a8c8b 100644
--- a/src/sheet-object-graph.h
+++ b/src/sheet-object-graph.h
@@ -2,8 +2,8 @@
#ifndef _GNM_SHEET_OBJECT_GRAPH_H_
# define _GNM_SHEET_OBJECT_GRAPH_H_
-#include "sheet-object.h"
-#include "gnumeric-fwd.h"
+#include <sheet-object.h>
+#include <gnumeric-fwd.h>
#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/sheet-object-image.c b/src/sheet-object-image.c
index f4ae7cc..77f743a 100644
--- a/src/sheet-object-image.c
+++ b/src/sheet-object-image.c
@@ -7,19 +7,19 @@
* Jody Goldberg (jody gnome org)
*/
#include <gnumeric-config.h>
-#include "gnm-i18n.h"
-#include "gnumeric.h"
-#include "sheet-object-image.h"
-#include "sheet.h"
-
-#include "gnm-pane.h"
-#include "wbc-gtk.h"
-#include "sheet-object-impl.h"
-#include "sheet-control-gui.h"
-#include "gui-file.h"
-#include "application.h"
-#include "gutils.h"
-#include "xml-sax.h"
+#include <gnm-i18n.h>
+#include <gnumeric.h>
+#include <sheet-object-image.h>
+#include <sheet.h>
+
+#include <gnm-pane.h>
+#include <wbc-gtk.h>
+#include <sheet-object-impl.h>
+#include <sheet-control-gui.h>
+#include <gui-file.h>
+#include <application.h>
+#include <gutils.h>
+#include <xml-sax.h>
#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/src/sheet-object-image.h b/src/sheet-object-image.h
index 8455945..8d8ff6a 100644
--- a/src/sheet-object-image.h
+++ b/src/sheet-object-image.h
@@ -2,7 +2,7 @@
#ifndef _GNM_SHEET_OBJECT_IMAGE_H_
# define _GNM_SHEET_OBJECT_IMAGE_H_
-#include "sheet-object.h"
+#include <sheet-object.h>
G_BEGIN_DECLS
diff --git a/src/sheet-object-impl.h b/src/sheet-object-impl.h
index 61171bb..1ae260c 100644
--- a/src/sheet-object-impl.h
+++ b/src/sheet-object-impl.h
@@ -4,7 +4,7 @@
G_BEGIN_DECLS
-#include "sheet-object.h"
+#include <sheet-object.h>
#include <goffice/goffice.h>
#include <gsf/gsf-libxml.h>
#include <libxml/tree.h>
diff --git a/src/sheet-object-widget-impl.h b/src/sheet-object-widget-impl.h
index 3efd1f9..5ebb82b 100644
--- a/src/sheet-object-widget-impl.h
+++ b/src/sheet-object-widget-impl.h
@@ -2,8 +2,8 @@
#ifndef _GNM_SHEET_OBJECT_WIDGET_IMPL_H_
# define _GNM_SHEET_OBJECT_WIDGET_IMPL_H_
-#include "sheet-object-widget.h"
-#include "sheet-object-impl.h"
+#include <sheet-object-widget.h>
+#include <sheet-object-impl.h>
G_BEGIN_DECLS
diff --git a/src/sheet-object-widget.c b/src/sheet-object-widget.c
index 0015373..475b2d5 100644
--- a/src/sheet-object-widget.c
+++ b/src/sheet-object-widget.c
@@ -22,34 +22,34 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "application.h"
-#include "sheet-object-widget-impl.h"
-#include "widgets/gnm-radiobutton.h"
-#include "gnm-pane.h"
-#include "gnumeric-simple-canvas.h"
-#include "gui-util.h"
-#include "gutils.h"
-#include "dependent.h"
-#include "sheet-control-gui.h"
-#include "sheet-object-impl.h"
-#include "expr.h"
-#include "parse-util.h"
-#include "value.h"
-#include "ranges.h"
-#include "selection.h"
-#include "wbc-gtk.h"
-#include "workbook.h"
-#include "sheet.h"
-#include "cell.h"
-#include "mathfunc.h"
-#include "widgets/gnumeric-expr-entry.h"
-#include "dialogs/dialogs.h"
-#include "dialogs/help.h"
-#include "xml-sax.h"
-#include "commands.h"
-#include "gnm-format.h"
-#include "number-match.h"
+#include <gnumeric.h>
+#include <application.h>
+#include <sheet-object-widget-impl.h>
+#include <widgets/gnm-radiobutton.h>
+#include <gnm-pane.h>
+#include <gnumeric-simple-canvas.h>
+#include <gui-util.h>
+#include <gutils.h>
+#include <dependent.h>
+#include <sheet-control-gui.h>
+#include <sheet-object-impl.h>
+#include <expr.h>
+#include <parse-util.h>
+#include <value.h>
+#include <ranges.h>
+#include <selection.h>
+#include <wbc-gtk.h>
+#include <workbook.h>
+#include <sheet.h>
+#include <cell.h>
+#include <mathfunc.h>
+#include <widgets/gnumeric-expr-entry.h>
+#include <dialogs/dialogs.h>
+#include <dialogs/help.h>
+#include <xml-sax.h>
+#include <commands.h>
+#include <gnm-format.h>
+#include <number-match.h>
#include <goffice/goffice.h>
diff --git a/src/sheet-object-widget.h b/src/sheet-object-widget.h
index cc49651..4419be7 100644
--- a/src/sheet-object-widget.h
+++ b/src/sheet-object-widget.h
@@ -2,7 +2,7 @@
#ifndef _GNM_SHEET_OBJECT_WIDGET_H_
# define _GNM_SHEET_OBJECT_WIDGET_H_
-#include "sheet-object.h"
+#include <sheet-object.h>
#include <pango/pango-attributes.h>
G_BEGIN_DECLS
diff --git a/src/sheet-object.c b/src/sheet-object.c
index 14de232..e28ba7c 100644
--- a/src/sheet-object.c
+++ b/src/sheet-object.c
@@ -8,37 +8,37 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "sheet-object.h"
-
-#include "sheet.h"
-#include "dependent.h"
-#include "sheet-view.h"
-#include "sheet-control.h"
-#include "sheet-control-gui.h"
-#include "sheet-private.h"
-#include "dialogs/dialogs.h"
-#include "sheet-object-impl.h"
-#include "expr.h"
-#include "ranges.h"
-#include "commands.h"
-#include "gui-util.h"
-
-#include "gnm-pane-impl.h"
-#include "gnm-so-line.h"
-#include "gnm-so-filled.h"
-#include "sheet-control-gui-priv.h"
-#include "sheet-object-cell-comment.h"
-#include "sheet-object-widget.h"
-#include "sheet-object-graph.h"
-#include "sheet-object-image.h"
-#include "sheet-filter-combo.h"
-#include "wbc-gtk-impl.h"
-#include "graph.h"
-#include "print.h"
+#include <gnumeric.h>
+#include <sheet-object.h>
+
+#include <sheet.h>
+#include <dependent.h>
+#include <sheet-view.h>
+#include <sheet-control.h>
+#include <sheet-control-gui.h>
+#include <sheet-private.h>
+#include <dialogs/dialogs.h>
+#include <sheet-object-impl.h>
+#include <expr.h>
+#include <ranges.h>
+#include <commands.h>
+#include <gui-util.h>
+
+#include <gnm-pane-impl.h>
+#include <gnm-so-line.h>
+#include <gnm-so-filled.h>
+#include <sheet-control-gui-priv.h>
+#include <sheet-object-cell-comment.h>
+#include <sheet-object-widget.h>
+#include <sheet-object-graph.h>
+#include <sheet-object-image.h>
+#include <sheet-filter-combo.h>
+#include <wbc-gtk-impl.h>
+#include <graph.h>
+#include <print.h>
#include <goffice/goffice.h>
-#include "application.h"
-#include "gutils.h"
+#include <application.h>
+#include <gutils.h>
#include <libxml/globals.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/src/sheet-object.h b/src/sheet-object.h
index 5c79a94..eadbfc7 100644
--- a/src/sheet-object.h
+++ b/src/sheet-object.h
@@ -2,7 +2,7 @@
#ifndef _GNM_SHEET_OBJECT_H_
# define _GNM_SHEET_OBJECT_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <gsf/gsf-output.h>
#include <goffice/goffice.h>
diff --git a/src/sheet-style.c b/src/sheet-style.c
index 3b7a955..cba11ec 100644
--- a/src/sheet-style.c
+++ b/src/sheet-style.c
@@ -22,17 +22,17 @@
*/
#include <gnumeric-config.h>
-#include "sheet-style.h"
-#include "ranges.h"
-#include "sheet.h"
-#include "expr.h"
-#include "style.h"
-#include "style-border.h"
-#include "style-color.h"
-#include "style-conditions.h"
-#include "parse-util.h"
-#include "cell.h"
-#include "gutils.h"
+#include <sheet-style.h>
+#include <ranges.h>
+#include <sheet.h>
+#include <expr.h>
+#include <style.h>
+#include <style-border.h>
+#include <style-color.h>
+#include <style-conditions.h>
+#include <parse-util.h>
+#include <cell.h>
+#include <gutils.h>
#include <goffice/goffice.h>
#include <glib/gi18n-lib.h>
#include <string.h>
diff --git a/src/sheet-style.h b/src/sheet-style.h
index ff1b7d0..f800f0b 100644
--- a/src/sheet-style.h
+++ b/src/sheet-style.h
@@ -2,8 +2,8 @@
#ifndef _GNM_SHEET_STYLE_H_
# define _GNM_SHEET_STYLE_H_
-#include "gnumeric.h"
-#include "style-border.h"
+#include <gnumeric.h>
+#include <style-border.h>
G_BEGIN_DECLS
diff --git a/src/sheet-utils.c b/src/sheet-utils.c
index bd75467..36dd5a1 100644
--- a/src/sheet-utils.c
+++ b/src/sheet-utils.c
@@ -21,9 +21,9 @@
* USA
*/
#include <gnumeric-config.h>
-#include "libgnumeric.h"
-#include "sheet-utils.h"
-#include "sheet.h"
+#include <libgnumeric.h>
+#include <sheet-utils.h>
+#include <sheet.h>
static gboolean
sheet_cell_or_one_below_is_not_empty (Sheet *sheet, int col, int row)
diff --git a/src/sheet-utils.h b/src/sheet-utils.h
index d90450a..eccac37 100644
--- a/src/sheet-utils.h
+++ b/src/sheet-utils.h
@@ -2,7 +2,7 @@
#ifndef _GNM_SHEET_UTILS_H
# define _GNM_SHEET_UTILS_H
-#include "gnumeric.h"
+#include <gnumeric.h>
G_BEGIN_DECLS
diff --git a/src/sheet-view.c b/src/sheet-view.c
index 0ebdbea..eedacc0 100644
--- a/src/sheet-view.c
+++ b/src/sheet-view.c
@@ -23,29 +23,29 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
#include <stdlib.h>
-#include "gnumeric.h"
-
-#include "sheet-view.h"
-#include "sheet.h"
-#include "sheet-merge.h"
-#include "sheet-filter.h"
-#include "gnm-sheet-slicer.h"
-#include "sheet-private.h"
-#include "sheet-control.h"
-#include "sheet-control-priv.h"
-#include "workbook-view.h"
-#include "workbook-control.h"
-#include "ranges.h"
-#include "selection.h"
-#include "application.h"
-#include "value.h"
-#include "parse-util.h"
-#include "expr-name.h"
-#include "command-context.h"
-#include "gnumeric-conf.h"
-#include "sheet-style.h"
-#include "mstyle.h"
-#include "gutils.h"
+#include <gnumeric.h>
+
+#include <sheet-view.h>
+#include <sheet.h>
+#include <sheet-merge.h>
+#include <sheet-filter.h>
+#include <gnm-sheet-slicer.h>
+#include <sheet-private.h>
+#include <sheet-control.h>
+#include <sheet-control-priv.h>
+#include <workbook-view.h>
+#include <workbook-control.h>
+#include <ranges.h>
+#include <selection.h>
+#include <application.h>
+#include <value.h>
+#include <parse-util.h>
+#include <expr-name.h>
+#include <command-context.h>
+#include <gnumeric-conf.h>
+#include <sheet-style.h>
+#include <mstyle.h>
+#include <gutils.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/src/sheet-view.h b/src/sheet-view.h
index a6a7bc4..dd71d43 100644
--- a/src/sheet-view.h
+++ b/src/sheet-view.h
@@ -2,7 +2,7 @@
#ifndef _GNM_SHEET_VIEW_H_
# define _GNM_SHEET_VIEW_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/src/sheet.c b/src/sheet.c
index a3bc821..4699164 100644
--- a/src/sheet.c
+++ b/src/sheet.c
@@ -23,51 +23,51 @@
* USA
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "sheet.h"
-
-#include "sheet-view.h"
-#include "command-context.h"
-#include "sheet-control.h"
-#include "sheet-style.h"
-#include "workbook-priv.h"
-#include "workbook-control.h"
-#include "workbook-view.h"
-#include "parse-util.h"
-#include "dependent.h"
-#include "value.h"
-#include "number-match.h"
-#include "clipboard.h"
-#include "selection.h"
-#include "ranges.h"
-#include "print-info.h"
-#include "mstyle.h"
-#include "style-color.h"
-#include "style-font.h"
-#include "application.h"
-#include "commands.h"
-#include "cellspan.h"
-#include "cell.h"
-#include "sheet-merge.h"
-#include "sheet-private.h"
-#include "expr-name.h"
-#include "expr.h"
-#include "rendered-value.h"
-#include "gnumeric-conf.h"
-#include "sheet-object-impl.h"
-#include "sheet-object-cell-comment.h"
+#include <gnumeric.h>
+#include <sheet.h>
+
+#include <sheet-view.h>
+#include <command-context.h>
+#include <sheet-control.h>
+#include <sheet-style.h>
+#include <workbook-priv.h>
+#include <workbook-control.h>
+#include <workbook-view.h>
+#include <parse-util.h>
+#include <dependent.h>
+#include <value.h>
+#include <number-match.h>
+#include <clipboard.h>
+#include <selection.h>
+#include <ranges.h>
+#include <print-info.h>
+#include <mstyle.h>
+#include <style-color.h>
+#include <style-font.h>
+#include <application.h>
+#include <commands.h>
+#include <cellspan.h>
+#include <cell.h>
+#include <sheet-merge.h>
+#include <sheet-private.h>
+#include <expr-name.h>
+#include <expr.h>
+#include <rendered-value.h>
+#include <gnumeric-conf.h>
+#include <sheet-object-impl.h>
+#include <sheet-object-cell-comment.h>
#include <tools/gnm-solver.h>
-#include "hlink.h"
-#include "sheet-filter.h"
-#include "sheet-filter-combo.h"
-#include "gnm-sheet-slicer.h"
-#include "tools/scenarios.h"
-#include "cell-draw.h"
-#include "sort.h"
-#include "gutils.h"
+#include <hlink.h>
+#include <sheet-filter.h>
+#include <sheet-filter-combo.h>
+#include <gnm-sheet-slicer.h>
+#include <tools/scenarios.h>
+#include <cell-draw.h>
+#include <sort.h>
+#include <gutils.h>
#include <goffice/goffice.h>
-#include "gnm-i18n.h"
+#include <gnm-i18n.h>
#include <gsf/gsf-impl-utils.h>
#include <stdlib.h>
#include <string.h>
diff --git a/src/sheet.h b/src/sheet.h
index 589f00c..8a667eb 100644
--- a/src/sheet.h
+++ b/src/sheet.h
@@ -2,12 +2,12 @@
#ifndef _GNM_SHEET_H_
# define _GNM_SHEET_H_
-#include "gnumeric.h"
-#include "colrow.h"
-#include "position.h"
+#include <gnumeric.h>
+#include <colrow.h>
+#include <position.h>
#include <pango/pango.h>
#include <goffice/goffice.h>
-#include "libgnumeric.h"
+#include <libgnumeric.h>
G_BEGIN_DECLS
diff --git a/src/sort.c b/src/sort.c
index d79c4ac..2c0f6be 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -10,15 +10,15 @@
* (C) 2000 Morten Welinder
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "sort.h"
-
-#include "commands.h"
-#include "clipboard.h"
-#include "cell.h"
-#include "value.h"
-#include "sheet.h"
-#include "ranges.h"
+#include <gnumeric.h>
+#include <sort.h>
+
+#include <commands.h>
+#include <clipboard.h>
+#include <cell.h>
+#include <value.h>
+#include <sheet.h>
+#include <ranges.h>
#include <goffice/goffice.h>
#include <stdlib.h>
diff --git a/src/sort.h b/src/sort.h
index efb38a3..1f90c13 100644
--- a/src/sort.h
+++ b/src/sort.h
@@ -2,7 +2,7 @@
#ifndef _GNM_SORT_H_
# define _GNM_SORT_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
G_BEGIN_DECLS
diff --git a/src/ssconvert.c b/src/ssconvert.c
index 57061ab..3a39b3c 100644
--- a/src/ssconvert.c
+++ b/src/ssconvert.c
@@ -11,26 +11,26 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
-#include "gnumeric.h"
-#include "position.h"
-#include "parse-util.h"
-#include "application.h"
-#include "workbook.h"
-#include "workbook-priv.h"
-#include "workbook-control.h"
-#include "sheet.h"
-#include "dependent.h"
-#include "expr-name.h"
-#include "libgnumeric.h"
-#include "gutils.h"
-#include "value.h"
-#include "commands.h"
-#include "gnumeric-paths.h"
-#include "gnm-plugin.h"
-#include "command-context.h"
-#include "command-context-stderr.h"
-#include "workbook-view.h"
-#include "tools/analysis-tools.h"
+#include <gnumeric.h>
+#include <position.h>
+#include <parse-util.h>
+#include <application.h>
+#include <workbook.h>
+#include <workbook-priv.h>
+#include <workbook-control.h>
+#include <sheet.h>
+#include <dependent.h>
+#include <expr-name.h>
+#include <libgnumeric.h>
+#include <gutils.h>
+#include <value.h>
+#include <commands.h>
+#include <gnumeric-paths.h>
+#include <gnm-plugin.h>
+#include <command-context.h>
+#include <command-context-stderr.h>
+#include <workbook-view.h>
+#include <tools/analysis-tools.h>
#include <dialogs/dialogs.h>
#include <goffice/goffice.h>
#include <gsf/gsf-utils.h>
diff --git a/src/ssdiff.c b/src/ssdiff.c
index 6ca59c2..b9aeeed 100644
--- a/src/ssdiff.c
+++ b/src/ssdiff.c
@@ -9,29 +9,29 @@
#include <gnumeric-config.h>
#include <glib/gi18n.h>
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <goffice/goffice.h>
-#include "libgnumeric.h"
-#include "gutils.h"
-#include "command-context.h"
-#include "command-context-stderr.h"
-#include "gnm-plugin.h"
-#include "workbook-view.h"
-#include "workbook.h"
-#include "sheet.h"
-#include "sheet-style.h"
-#include "style-border.h"
-#include "style-color.h"
-#include "cell.h"
-#include "value.h"
-#include "expr.h"
-#include "ranges.h"
-#include "mstyle.h"
-#include "xml-sax.h"
-#include "hlink.h"
-#include "input-msg.h"
-#include "expr-name.h"
-#include "sheet-diff.h"
+#include <libgnumeric.h>
+#include <gutils.h>
+#include <command-context.h>
+#include <command-context-stderr.h>
+#include <gnm-plugin.h>
+#include <workbook-view.h>
+#include <workbook.h>
+#include <sheet.h>
+#include <sheet-style.h>
+#include <style-border.h>
+#include <style-color.h>
+#include <cell.h>
+#include <value.h>
+#include <expr.h>
+#include <ranges.h>
+#include <mstyle.h>
+#include <xml-sax.h>
+#include <hlink.h>
+#include <input-msg.h>
+#include <expr-name.h>
+#include <sheet-diff.h>
#include <gsf/gsf-libxml.h>
#include <gsf/gsf-output-stdio.h>
#include <gsf/gsf-input.h>
diff --git a/src/ssgrep.c b/src/ssgrep.c
index 0ac34a4..ac4dff7 100644
--- a/src/ssgrep.c
+++ b/src/ssgrep.c
@@ -6,22 +6,22 @@
* Copyright (C) 2008-2009 Morten Welinder (terra gnome org)
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "libgnumeric.h"
+#include <gnumeric.h>
+#include <libgnumeric.h>
#include <goffice/goffice.h>
-#include "command-context-stderr.h"
-#include "workbook-view.h"
-#include "workbook.h"
-#include "application.h"
-#include "gutils.h"
-#include "gnm-plugin.h"
-#include "search.h"
-#include "sheet.h"
-#include "cell.h"
-#include "value.h"
-#include "func.h"
-#include "parse-util.h"
-#include "sheet-object-cell-comment.h"
+#include <command-context-stderr.h>
+#include <workbook-view.h>
+#include <workbook.h>
+#include <application.h>
+#include <gutils.h>
+#include <gnm-plugin.h>
+#include <search.h>
+#include <sheet.h>
+#include <cell.h>
+#include <value.h>
+#include <func.h>
+#include <parse-util.h>
+#include <sheet-object-cell-comment.h>
#include <gsf/gsf-input-stdio.h>
#include <gsf/gsf-input-textline.h>
diff --git a/src/ssindex.c b/src/ssindex.c
index e5f168c..a7a65f2 100644
--- a/src/ssindex.c
+++ b/src/ssindex.c
@@ -10,24 +10,24 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n.h>
-#include "gnumeric.h"
-#include "libgnumeric.h"
-#include "gutils.h"
-#include "gnumeric-paths.h"
+#include <gnumeric.h>
+#include <libgnumeric.h>
+#include <gutils.h>
+#include <gnumeric-paths.h>
#include <goffice/goffice.h>
-#include "command-context-stderr.h"
-#include "workbook-view.h"
-#include "workbook.h"
-#include "sheet.h"
-#include "cell.h"
-#include "expr-name.h"
-#include "value.h"
-#include "mstyle.h"
-#include "sheet-style.h"
-#include "hlink.h"
-#include "validation.h"
-#include "sheet-object-graph.h"
-#include "gnm-plugin.h"
+#include <command-context-stderr.h>
+#include <workbook-view.h>
+#include <workbook.h>
+#include <sheet.h>
+#include <cell.h>
+#include <expr-name.h>
+#include <value.h>
+#include <mstyle.h>
+#include <sheet-style.h>
+#include <hlink.h>
+#include <validation.h>
+#include <sheet-object-graph.h>
+#include <gnm-plugin.h>
#include <gsf/gsf-utils.h>
#include <gsf/gsf-libxml.h>
diff --git a/src/sstest.c b/src/sstest.c
index 666a2ec..ff3cfed 100644
--- a/src/sstest.c
+++ b/src/sstest.c
@@ -4,29 +4,29 @@
* Copyright (C) 2009,2017 Morten Welinder (terra gnome org)
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "libgnumeric.h"
+#include <gnumeric.h>
+#include <libgnumeric.h>
#include <goffice/goffice.h>
-#include "command-context-stderr.h"
-#include "workbook-view.h"
-#include "workbook.h"
-#include "gutils.h"
-#include "gnm-plugin.h"
-#include "parse-util.h"
-#include "expr-name.h"
-#include "expr.h"
-#include "search.h"
-#include "sheet.h"
-#include "cell.h"
-#include "value.h"
-#include "func.h"
-#include "parse-util.h"
-#include "sheet-object-cell-comment.h"
-#include "mathfunc.h"
-#include "gnm-random.h"
-#include "sf-dpq.h"
-#include "sf-gamma.h"
-#include "rangefunc.h"
+#include <command-context-stderr.h>
+#include <workbook-view.h>
+#include <workbook.h>
+#include <gutils.h>
+#include <gnm-plugin.h>
+#include <parse-util.h>
+#include <expr-name.h>
+#include <expr.h>
+#include <search.h>
+#include <sheet.h>
+#include <cell.h>
+#include <value.h>
+#include <func.h>
+#include <parse-util.h>
+#include <sheet-object-cell-comment.h>
+#include <mathfunc.h>
+#include <gnm-random.h>
+#include <sf-dpq.h>
+#include <sf-gamma.h>
+#include <rangefunc.h>
#include <gsf/gsf-input-stdio.h>
#include <gsf/gsf-input-textline.h>
diff --git a/src/stf-export.c b/src/stf-export.c
index 14ed15a..7d63018 100644
--- a/src/stf-export.c
+++ b/src/stf-export.c
@@ -25,18 +25,18 @@
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "gnm-i18n.h"
-#include "stf-export.h"
-
-#include "gnumeric-conf.h"
-#include "sheet.h"
-#include "workbook.h"
-#include "cell.h"
-#include "value.h"
-#include "gutils.h"
-#include "gnm-format.h"
-#include "gnm-datetime.h"
+#include <gnumeric.h>
+#include <gnm-i18n.h>
+#include <stf-export.h>
+
+#include <gnumeric-conf.h>
+#include <sheet.h>
+#include <workbook.h>
+#include <cell.h>
+#include <value.h>
+#include <gutils.h>
+#include <gnm-format.h>
+#include <gnm-datetime.h>
#include <gsf/gsf-output-iconv.h>
#include <gsf/gsf-output-memory.h>
#include <gsf/gsf-impl-utils.h>
@@ -596,9 +596,9 @@ GSF_CLASS (GnmStfExport, gnm_stf_export,
/* ------------------------------------------------------------------------- */
-#include "wbc-gtk.h"
-#include "dialogs/dialog-stf-export.h"
-#include "workbook-view.h"
+#include <wbc-gtk.h>
+#include <dialogs/dialog-stf-export.h>
+#include <workbook-view.h>
/**
* gnm_stf_get_stfe:
diff --git a/src/stf-export.h b/src/stf-export.h
index 92a3bcc..cad4a77 100644
--- a/src/stf-export.h
+++ b/src/stf-export.h
@@ -2,7 +2,7 @@
#ifndef _GNM_STF_EXPORT_H_
# define _GNM_STF_EXPORT_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <gsf/gsf-output-csv.h>
#include <goffice/goffice.h>
diff --git a/src/stf-parse.c b/src/stf-parse.c
index e658fde..957f8b0 100644
--- a/src/stf-parse.c
+++ b/src/stf-parse.c
@@ -27,24 +27,24 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "stf-parse.h"
-#include "stf-export.h"
-
-#include "workbook.h"
-#include "cell.h"
-#include "sheet.h"
-#include "expr.h"
-#include "clipboard.h"
-#include "sheet-style.h"
-#include "value.h"
-#include "mstyle.h"
-#include "number-match.h"
-#include "gutils.h"
-#include "parse-util.h"
-#include "number-match.h"
-#include "gnm-format.h"
-#include "ranges.h"
+#include <gnumeric.h>
+#include <stf-parse.h>
+#include <stf-export.h>
+
+#include <workbook.h>
+#include <cell.h>
+#include <sheet.h>
+#include <expr.h>
+#include <clipboard.h>
+#include <sheet-style.h>
+#include <value.h>
+#include <mstyle.h>
+#include <number-match.h>
+#include <gutils.h>
+#include <parse-util.h>
+#include <number-match.h>
+#include <gnm-format.h>
+#include <ranges.h>
#include <goffice/goffice.h>
#include <stdlib.h>
diff --git a/src/stf.c b/src/stf.c
index 64f3a33..ef99b39 100644
--- a/src/stf.c
+++ b/src/stf.c
@@ -22,34 +22,34 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "stf.h"
-#include "stf-export.h"
+#include <gnumeric.h>
+#include <stf.h>
+#include <stf-export.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 "command-context.h"
-#include "wbc-gtk.h"
-#include "workbook-view.h"
-#include "workbook.h"
-#include "dialogs/dialog-stf.h"
-#include "dialogs/dialog-stf-export.h"
-#include "position.h"
-#include "expr.h"
-#include "value.h"
-#include "gnm-format.h"
-#include "selection.h"
-#include "ranges.h"
-#include "clipboard.h"
-#include "parse-util.h"
-#include "commands.h"
-#include "gui-util.h"
-#include "gutils.h"
+#include <cell.h>
+#include <sheet.h>
+#include <sheet-view.h>
+#include <sheet-style.h>
+#include <style.h>
+#include <mstyle.h>
+#include <command-context.h>
+#include <wbc-gtk.h>
+#include <workbook-view.h>
+#include <workbook.h>
+#include <dialogs/dialog-stf.h>
+#include <dialogs/dialog-stf-export.h>
+#include <position.h>
+#include <expr.h>
+#include <value.h>
+#include <gnm-format.h>
+#include <selection.h>
+#include <ranges.h>
+#include <clipboard.h>
+#include <parse-util.h>
+#include <commands.h>
+#include <gui-util.h>
+#include <gutils.h>
#include <gsf/gsf-input.h>
#include <string.h>
diff --git a/src/style-border.c b/src/style-border.c
index a2cca9c..372936e 100644
--- a/src/style-border.c
+++ b/src/style-border.c
@@ -21,13 +21,13 @@
* USA
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "style-border.h"
+#include <gnumeric.h>
+#include <style-border.h>
-#include "style-color.h"
-#include "style.h"
-#include "sheet-style.h"
-#include "sheet.h"
+#include <style-color.h>
+#include <style.h>
+#include <sheet-style.h>
+#include <sheet.h>
#include <gdk/gdk.h>
#include <string.h>
diff --git a/src/style-border.h b/src/style-border.h
index 367669e..4b72402 100644
--- a/src/style-border.h
+++ b/src/style-border.h
@@ -2,7 +2,7 @@
#ifndef _GNM_STYLE_BORDER_H_
# define _GNM_STYLE_BORDER_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <gdk/gdk.h>
G_BEGIN_DECLS
diff --git a/src/style-color.c b/src/style-color.c
index 58776a5..062a777 100644
--- a/src/style-color.c
+++ b/src/style-color.c
@@ -7,9 +7,9 @@
*
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "style-color.h"
-#include "style-border.h"
+#include <gnumeric.h>
+#include <style-color.h>
+#include <style-border.h>
static GHashTable *style_color_hash;
static GnmColor *sc_black;
diff --git a/src/style-color.h b/src/style-color.h
index 0f30cbe..69e3782 100644
--- a/src/style-color.h
+++ b/src/style-color.h
@@ -2,8 +2,8 @@
#ifndef _GNM_STYLE_COLOR_H_
# define _GNM_STYLE_COLOR_H_
-#include "gnumeric.h"
-#include "libgnumeric.h"
+#include <gnumeric.h>
+#include <libgnumeric.h>
#include <goffice/goffice.h>
#include <gdk/gdk.h>
diff --git a/src/style-conditions.c b/src/style-conditions.c
index 228c7a1..af95d38 100644
--- a/src/style-conditions.c
+++ b/src/style-conditions.c
@@ -20,14 +20,14 @@
* USA
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "style-conditions.h"
-#include "mstyle.h"
-#include "expr.h"
-#include "expr-impl.h"
-#include "cell.h"
-#include "value.h"
-#include "sheet.h"
+#include <gnumeric.h>
+#include <style-conditions.h>
+#include <mstyle.h>
+#include <expr.h>
+#include <expr-impl.h>
+#include <cell.h>
+#include <value.h>
+#include <sheet.h>
#include <parse-util.h>
#include <gsf/gsf-impl-utils.h>
#include <string.h>
diff --git a/src/style-conditions.h b/src/style-conditions.h
index 29d6491..0cd237c 100644
--- a/src/style-conditions.h
+++ b/src/style-conditions.h
@@ -2,7 +2,7 @@
#ifndef _GNM_STYLE_CONDITIONS_H_
# define _GNM_STYLE_CONDITIONS_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <dependent.h>
G_BEGIN_DECLS
diff --git a/src/style-font.h b/src/style-font.h
index f998f11..f23f093 100644
--- a/src/style-font.h
+++ b/src/style-font.h
@@ -2,8 +2,8 @@
#ifndef _GNM_STYLE_FONT_H_
# define _GNM_STYLE_FONT_H_
-#include "gnumeric.h"
-#include "libgnumeric.h"
+#include <gnumeric.h>
+#include <libgnumeric.h>
#include <pango/pango.h>
G_BEGIN_DECLS
diff --git a/src/style.c b/src/style.c
index 657bc7d..d17bc54 100644
--- a/src/style.c
+++ b/src/style.c
@@ -8,20 +8,20 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "style.h"
-#include "style-font.h"
-
-#include "gnm-format.h"
-#include "style-color.h"
-#include "application.h"
-#include "sheet.h"
-#include "cell.h"
-#include "value.h"
-
-#include "gui-util.h"
-#include "mathfunc.h"
-#include "gnumeric-conf.h"
+#include <gnumeric.h>
+#include <style.h>
+#include <style-font.h>
+
+#include <gnm-format.h>
+#include <style-color.h>
+#include <application.h>
+#include <sheet.h>
+#include <cell.h>
+#include <value.h>
+
+#include <gui-util.h>
+#include <mathfunc.h>
+#include <gnumeric-conf.h>
#include <pango/pangocairo.h>
#include <gdk/gdk.h>
diff --git a/src/style.h b/src/style.h
index 0bbc571..1f1b756 100644
--- a/src/style.h
+++ b/src/style.h
@@ -2,8 +2,8 @@
#ifndef _GNM_STYLE_H_
# define _GNM_STYLE_H_
-#include "gnumeric.h"
-#include "libgnumeric.h"
+#include <gnumeric.h>
+#include <libgnumeric.h>
#include <pango/pango-context.h>
G_BEGIN_DECLS
@@ -46,7 +46,7 @@ typedef enum {
GNM_TEXT_DIR_LTR = 1
} GnmTextDir;
-#include "mstyle.h"
+#include <mstyle.h>
GType gnm_align_h_get_type (void);
#define GNM_ALIGN_H_TYPE (gnm_align_h_get_type ())
diff --git a/src/tools/analysis-anova.c b/src/tools/analysis-anova.c
index 5b0726f..5a8de1d 100644
--- a/src/tools/analysis-anova.c
+++ b/src/tools/analysis-anova.c
@@ -25,18 +25,18 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "analysis-anova.h"
-#include "analysis-tools.h"
-#include "value.h"
-#include "ranges.h"
-#include "expr.h"
-#include "func.h"
-#include "sheet.h"
-#include "numbers.h"
-#include "mstyle.h"
-#include "style-border.h"
-#include "style-color.h"
+#include <gnumeric.h>
+#include <tools/analysis-anova.h>
+#include <tools/analysis-tools.h>
+#include <value.h>
+#include <ranges.h>
+#include <expr.h>
+#include <func.h>
+#include <sheet.h>
+#include <numbers.h>
+#include <mstyle.h>
+#include <style-border.h>
+#include <style-color.h>
static gboolean
diff --git a/src/tools/analysis-anova.h b/src/tools/analysis-anova.h
index d23d78d..29a9443 100644
--- a/src/tools/analysis-anova.h
+++ b/src/tools/analysis-anova.h
@@ -26,11 +26,11 @@
#ifndef ANALYSIS_ANOVA_H
#define ANALYSIS_ANOVA_H
-#include "gnumeric.h"
-#include "numbers.h"
+#include <gnumeric.h>
+#include <numbers.h>
#include <tools/dao.h>
-#include "tools.h"
-#include "analysis-tools.h"
+#include <tools/tools.h>
+#include <tools/analysis-tools.h>
/**************** 2-Factor ANOVA ***************/
/*** with contingency table like data provision **/
diff --git a/src/tools/analysis-auto-expression.c b/src/tools/analysis-auto-expression.c
index 15cc062..637cecc 100644
--- a/src/tools/analysis-auto-expression.c
+++ b/src/tools/analysis-auto-expression.c
@@ -24,14 +24,14 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "analysis-auto-expression.h"
-#include "analysis-tools.h"
-#include "value.h"
-#include "ranges.h"
-#include "expr.h"
-#include "func.h"
-#include "numbers.h"
+#include <gnumeric.h>
+#include <tools/analysis-auto-expression.h>
+#include <tools/analysis-tools.h>
+#include <value.h>
+#include <ranges.h>
+#include <expr.h>
+#include <func.h>
+#include <numbers.h>
static gboolean
analysis_tool_auto_expression_engine_run (data_analysis_output_t *dao,
diff --git a/src/tools/analysis-auto-expression.h b/src/tools/analysis-auto-expression.h
index 07bc8e2..94c7e44 100644
--- a/src/tools/analysis-auto-expression.h
+++ b/src/tools/analysis-auto-expression.h
@@ -26,12 +26,12 @@
#ifndef ANALYSIS_AUTO_EXPRESSION_H
#define ANALYSIS_AUTO_EXPRESSION_H
-#include "gnumeric.h"
-#include "numbers.h"
+#include <gnumeric.h>
+#include <numbers.h>
#include <tools/dao.h>
-#include "tools.h"
-#include "analysis-tools.h"
-#include "sheet.h"
+#include <tools/tools.h>
+#include <tools/analysis-tools.h>
+#include <sheet.h>
typedef struct {
analysis_tools_data_generic_t base;
diff --git a/src/tools/analysis-chi-squared.c b/src/tools/analysis-chi-squared.c
index 1a3197c..52455b8 100644
--- a/src/tools/analysis-chi-squared.c
+++ b/src/tools/analysis-chi-squared.c
@@ -24,14 +24,14 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "analysis-chi-squared.h"
-#include "analysis-tools.h"
-#include "value.h"
-#include "ranges.h"
-#include "expr.h"
-#include "func.h"
-#include "numbers.h"
+#include <gnumeric.h>
+#include <tools/analysis-chi-squared.h>
+#include <tools/analysis-tools.h>
+#include <value.h>
+#include <ranges.h>
+#include <expr.h>
+#include <func.h>
+#include <numbers.h>
static gboolean
analysis_tool_chi_squared_engine_run (data_analysis_output_t *dao,
diff --git a/src/tools/analysis-chi-squared.h b/src/tools/analysis-chi-squared.h
index 7a81e56..197333e 100644
--- a/src/tools/analysis-chi-squared.h
+++ b/src/tools/analysis-chi-squared.h
@@ -26,12 +26,12 @@
#ifndef ANALYSIS_CHI_SQUARED_H
#define ANALYSIS_CHI_SQUARED_H
-#include "gnumeric.h"
-#include "numbers.h"
+#include <gnumeric.h>
+#include <numbers.h>
#include <tools/dao.h>
-#include "tools.h"
-#include "analysis-tools.h"
-#include "sheet.h"
+#include <tools/tools.h>
+#include <tools/analysis-tools.h>
+#include <sheet.h>
typedef struct {
WorkbookControl *wbc;
diff --git a/src/tools/analysis-exp-smoothing.c b/src/tools/analysis-exp-smoothing.c
index 13fe553..1247b1e 100644
--- a/src/tools/analysis-exp-smoothing.c
+++ b/src/tools/analysis-exp-smoothing.c
@@ -26,18 +26,18 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "analysis-exp-smoothing.h"
-#include "analysis-tools.h"
-#include "value.h"
-#include "ranges.h"
-#include "expr.h"
-#include "graph.h"
-#include "func.h"
-#include "numbers.h"
-#include "sheet-object-graph.h"
+#include <gnumeric.h>
+#include <tools/analysis-exp-smoothing.h>
+#include <tools/analysis-tools.h>
+#include <value.h>
+#include <ranges.h>
+#include <expr.h>
+#include <graph.h>
+#include <func.h>
+#include <numbers.h>
+#include <sheet-object-graph.h>
#include <goffice/goffice.h>
-#include "sheet.h"
+#include <sheet.h>
static GnmExpr const *
diff --git a/src/tools/analysis-exp-smoothing.h b/src/tools/analysis-exp-smoothing.h
index 69b0946..baf77c5 100644
--- a/src/tools/analysis-exp-smoothing.h
+++ b/src/tools/analysis-exp-smoothing.h
@@ -28,11 +28,11 @@
#ifndef ANALYSIS_EXP_SMOOTHING_H
#define ANALYSIS_EXP_SMOOTHING_H
-#include "gnumeric.h"
-#include "numbers.h"
+#include <gnumeric.h>
+#include <numbers.h>
#include <tools/dao.h>
-#include "tools.h"
-#include "analysis-tools.h"
+#include <tools/tools.h>
+#include <tools/analysis-tools.h>
typedef enum {
exp_smoothing_type_ses_h = 0,
diff --git a/src/tools/analysis-frequency.c b/src/tools/analysis-frequency.c
index a699c77..599e993 100644
--- a/src/tools/analysis-frequency.c
+++ b/src/tools/analysis-frequency.c
@@ -24,17 +24,17 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "analysis-frequency.h"
-#include "analysis-tools.h"
-#include "value.h"
-#include "ranges.h"
-#include "expr.h"
-#include "func.h"
-#include "numbers.h"
-#include "sheet-object-graph.h"
+#include <gnumeric.h>
+#include <tools/analysis-frequency.h>
+#include <tools/analysis-tools.h>
+#include <value.h>
+#include <ranges.h>
+#include <expr.h>
+#include <func.h>
+#include <numbers.h>
+#include <sheet-object-graph.h>
#include <goffice/goffice.h>
-#include "sheet.h"
+#include <sheet.h>
static gboolean
analysis_tool_frequency_engine_run (data_analysis_output_t *dao,
diff --git a/src/tools/analysis-frequency.h b/src/tools/analysis-frequency.h
index 63103b2..5973bee 100644
--- a/src/tools/analysis-frequency.h
+++ b/src/tools/analysis-frequency.h
@@ -26,11 +26,11 @@
#ifndef ANALYSIS_FREQUENCY_H
#define ANALYSIS_FREQUENCY_H
-#include "gnumeric.h"
-#include "numbers.h"
+#include <gnumeric.h>
+#include <numbers.h>
#include <tools/dao.h>
-#include "tools.h"
-#include "analysis-tools.h"
+#include <tools/tools.h>
+#include <tools/analysis-tools.h>
typedef enum {
NO_CHART = 0,
diff --git a/src/tools/analysis-histogram.c b/src/tools/analysis-histogram.c
index 1261f7e..4e21c8a 100644
--- a/src/tools/analysis-histogram.c
+++ b/src/tools/analysis-histogram.c
@@ -26,17 +26,17 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "analysis-histogram.h"
-#include "analysis-tools.h"
-#include "value.h"
-#include "ranges.h"
-#include "expr.h"
-#include "func.h"
-#include "numbers.h"
-#include "sheet-object-graph.h"
+#include <gnumeric.h>
+#include <tools/analysis-histogram.h>
+#include <tools/analysis-tools.h>
+#include <value.h>
+#include <ranges.h>
+#include <expr.h>
+#include <func.h>
+#include <numbers.h>
+#include <sheet-object-graph.h>
#include <goffice/goffice.h>
-#include "sheet.h"
+#include <sheet.h>
static GnmExpr const *
make_hist_expr (analysis_tools_data_histogram_t *info,
diff --git a/src/tools/analysis-histogram.h b/src/tools/analysis-histogram.h
index 105ab45..3ab1ef3 100644
--- a/src/tools/analysis-histogram.h
+++ b/src/tools/analysis-histogram.h
@@ -28,11 +28,11 @@
#ifndef ANALYSIS_HISTOGRAM_H
#define ANALYSIS_HISTOGRAM_H
-#include "gnumeric.h"
-#include "numbers.h"
+#include <gnumeric.h>
+#include <numbers.h>
#include <tools/dao.h>
-#include "tools.h"
-#include "analysis-tools.h"
+#include <tools/tools.h>
+#include <tools/analysis-tools.h>
typedef enum {
bintype_no_inf_lower = 0,
diff --git a/src/tools/analysis-kaplan-meier.c b/src/tools/analysis-kaplan-meier.c
index 909d32f..194b3b5 100644
--- a/src/tools/analysis-kaplan-meier.c
+++ b/src/tools/analysis-kaplan-meier.c
@@ -25,18 +25,18 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "analysis-kaplan-meier.h"
-#include "analysis-tools.h"
-#include "value.h"
-#include "ranges.h"
-#include "expr.h"
-#include "func.h"
-#include "numbers.h"
-#include "sheet-object-graph.h"
-#include "graph.h"
+#include <gnumeric.h>
+#include <tools/analysis-kaplan-meier.h>
+#include <tools/analysis-tools.h>
+#include <value.h>
+#include <ranges.h>
+#include <expr.h>
+#include <func.h>
+#include <numbers.h>
+#include <sheet-object-graph.h>
+#include <graph.h>
#include <goffice/goffice.h>
-#include "sheet.h"
+#include <sheet.h>
static gboolean
analysis_tool_kaplan_meier_engine_run (data_analysis_output_t *dao,
diff --git a/src/tools/analysis-kaplan-meier.h b/src/tools/analysis-kaplan-meier.h
index adb05c0..41a98a9 100644
--- a/src/tools/analysis-kaplan-meier.h
+++ b/src/tools/analysis-kaplan-meier.h
@@ -26,11 +26,11 @@
#ifndef ANALYSIS_KAPLAN_MEIER_H
#define ANALYSIS_KAPLAN_MEIER_H
-#include "gnumeric.h"
-#include "numbers.h"
+#include <gnumeric.h>
+#include <numbers.h>
#include <tools/dao.h>
-#include "tools.h"
-#include "analysis-tools.h"
+#include <tools/tools.h>
+#include <tools/analysis-tools.h>
/* typedef struct { */
/* analysis_tools_error_code_t err; */
diff --git a/src/tools/analysis-normality.c b/src/tools/analysis-normality.c
index ab7b886..28eefce 100644
--- a/src/tools/analysis-normality.c
+++ b/src/tools/analysis-normality.c
@@ -25,18 +25,18 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "analysis-normality.h"
-#include "analysis-tools.h"
-#include "value.h"
-#include "ranges.h"
-#include "expr.h"
-#include "func.h"
-#include "numbers.h"
-#include "sheet-object-graph.h"
-#include "graph.h"
+#include <gnumeric.h>
+#include <tools/analysis-normality.h>
+#include <tools/analysis-tools.h>
+#include <value.h>
+#include <ranges.h>
+#include <expr.h>
+#include <func.h>
+#include <numbers.h>
+#include <sheet-object-graph.h>
+#include <graph.h>
#include <goffice/goffice.h>
-#include "sheet.h"
+#include <sheet.h>
static gboolean
diff --git a/src/tools/analysis-normality.h b/src/tools/analysis-normality.h
index e2c9b56..c78b5da 100644
--- a/src/tools/analysis-normality.h
+++ b/src/tools/analysis-normality.h
@@ -26,11 +26,11 @@
#ifndef ANALYSIS_NORMALITY_H
#define ANALYSIS_NORMALITY_H
-#include "gnumeric.h"
-#include "numbers.h"
+#include <gnumeric.h>
+#include <numbers.h>
#include <tools/dao.h>
-#include "tools.h"
-#include "analysis-tools.h"
+#include <tools/tools.h>
+#include <tools/analysis-tools.h>
/**************** Normality Tests ***************/
diff --git a/src/tools/analysis-one-mean-test.c b/src/tools/analysis-one-mean-test.c
index 643b147..ec6de4c 100644
--- a/src/tools/analysis-one-mean-test.c
+++ b/src/tools/analysis-one-mean-test.c
@@ -24,14 +24,14 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "analysis-one-mean-test.h"
-#include "analysis-tools.h"
-#include "value.h"
-#include "ranges.h"
-#include "expr.h"
-#include "func.h"
-#include "numbers.h"
+#include <gnumeric.h>
+#include <tools/analysis-one-mean-test.h>
+#include <tools/analysis-tools.h>
+#include <value.h>
+#include <ranges.h>
+#include <expr.h>
+#include <func.h>
+#include <numbers.h>
static gboolean
analysis_tool_one_mean_test_engine_run (data_analysis_output_t *dao,
diff --git a/src/tools/analysis-one-mean-test.h b/src/tools/analysis-one-mean-test.h
index 781fdea..931e065 100644
--- a/src/tools/analysis-one-mean-test.h
+++ b/src/tools/analysis-one-mean-test.h
@@ -26,12 +26,12 @@
#ifndef ANALYSIS_ONE_MEAN_TEST_H
#define ANALYSIS_ONE_MEAN_TEST_H
-#include "gnumeric.h"
-#include "numbers.h"
+#include <gnumeric.h>
+#include <numbers.h>
#include <tools/dao.h>
-#include "tools.h"
-#include "analysis-tools.h"
-#include "sheet.h"
+#include <tools/tools.h>
+#include <tools/analysis-tools.h>
+#include <sheet.h>
typedef struct {
analysis_tools_data_generic_t base;
diff --git a/src/tools/analysis-principal-components.c b/src/tools/analysis-principal-components.c
index 906b47f..71b2682 100644
--- a/src/tools/analysis-principal-components.c
+++ b/src/tools/analysis-principal-components.c
@@ -24,14 +24,14 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "analysis-principal-components.h"
-#include "analysis-tools.h"
-#include "value.h"
-#include "ranges.h"
-#include "expr.h"
-#include "func.h"
-#include "numbers.h"
+#include <gnumeric.h>
+#include <tools/analysis-principal-components.h>
+#include <tools/analysis-tools.h>
+#include <value.h>
+#include <ranges.h>
+#include <expr.h>
+#include <func.h>
+#include <numbers.h>
static gboolean
analysis_tool_principal_components_engine_run (data_analysis_output_t *dao,
diff --git a/src/tools/analysis-principal-components.h b/src/tools/analysis-principal-components.h
index 4ec38cf..68b17a1 100644
--- a/src/tools/analysis-principal-components.h
+++ b/src/tools/analysis-principal-components.h
@@ -26,12 +26,12 @@
#ifndef ANALYSIS_PRINCIPAL_COMPONENTS_H
#define ANALYSIS_PRINCIPAL_COMPONENTS_H
-#include "gnumeric.h"
-#include "numbers.h"
+#include <gnumeric.h>
+#include <numbers.h>
#include <tools/dao.h>
-#include "tools.h"
-#include "analysis-tools.h"
-#include "sheet.h"
+#include <tools/tools.h>
+#include <tools/analysis-tools.h>
+#include <sheet.h>
gboolean analysis_tool_principal_components_engine (GOCmdContext *gcc, data_analysis_output_t *dao, gpointer
specs,
analysis_tool_engine_t selector, gpointer result);
diff --git a/src/tools/analysis-sign-test.c b/src/tools/analysis-sign-test.c
index af29876..f7bbc70 100644
--- a/src/tools/analysis-sign-test.c
+++ b/src/tools/analysis-sign-test.c
@@ -24,14 +24,14 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "analysis-sign-test.h"
-#include "analysis-tools.h"
-#include "value.h"
-#include "ranges.h"
-#include "expr.h"
-#include "func.h"
-#include "numbers.h"
+#include <gnumeric.h>
+#include <tools/analysis-sign-test.h>
+#include <tools/analysis-tools.h>
+#include <value.h>
+#include <ranges.h>
+#include <expr.h>
+#include <func.h>
+#include <numbers.h>
static gboolean
analysis_tool_sign_test_engine_run (data_analysis_output_t *dao,
diff --git a/src/tools/analysis-sign-test.h b/src/tools/analysis-sign-test.h
index 0d46c73..2c744fb 100644
--- a/src/tools/analysis-sign-test.h
+++ b/src/tools/analysis-sign-test.h
@@ -26,12 +26,12 @@
#ifndef ANALYSIS_SIGN_TEST_H
#define ANALYSIS_SIGN_TEST_H
-#include "gnumeric.h"
-#include "numbers.h"
+#include <gnumeric.h>
+#include <numbers.h>
#include <tools/dao.h>
-#include "tools.h"
-#include "analysis-tools.h"
-#include "sheet.h"
+#include <tools/tools.h>
+#include <tools/analysis-tools.h>
+#include <sheet.h>
typedef struct {
analysis_tools_data_generic_t base;
diff --git a/src/tools/analysis-signed-rank-test.c b/src/tools/analysis-signed-rank-test.c
index 68206a3..fbdd0f1 100644
--- a/src/tools/analysis-signed-rank-test.c
+++ b/src/tools/analysis-signed-rank-test.c
@@ -24,14 +24,14 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "analysis-signed-rank-test.h"
-#include "analysis-tools.h"
-#include "value.h"
-#include "ranges.h"
-#include "expr.h"
-#include "func.h"
-#include "numbers.h"
+#include <gnumeric.h>
+#include <tools/analysis-signed-rank-test.h>
+#include <tools/analysis-tools.h>
+#include <value.h>
+#include <ranges.h>
+#include <expr.h>
+#include <func.h>
+#include <numbers.h>
static inline GnmExpr const *
make_int (int n)
diff --git a/src/tools/analysis-signed-rank-test.h b/src/tools/analysis-signed-rank-test.h
index be738ab..d4bbaac 100644
--- a/src/tools/analysis-signed-rank-test.h
+++ b/src/tools/analysis-signed-rank-test.h
@@ -26,13 +26,13 @@
#ifndef ANALYSIS_SIGNED_RANK_TEST_H
#define ANALYSIS_SIGNED_RANK_TEST_H
-#include "gnumeric.h"
-#include "numbers.h"
+#include <gnumeric.h>
+#include <numbers.h>
#include <tools/dao.h>
-#include "tools.h"
-#include "analysis-tools.h"
-#include "analysis-sign-test.h"
-#include "sheet.h"
+#include <tools/tools.h>
+#include <tools/analysis-tools.h>
+#include <tools/analysis-sign-test.h>
+#include <sheet.h>
/* note: specs is a pointer to a analysis_tools_data_sign_test_t */
diff --git a/src/tools/analysis-tools.c b/src/tools/analysis-tools.c
index 4e2a6f4..94e1950 100644
--- a/src/tools/analysis-tools.c
+++ b/src/tools/analysis-tools.c
@@ -27,30 +27,30 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "analysis-tools.h"
-
-#include "mathfunc.h"
-#include "func.h"
-#include "expr.h"
-#include "position.h"
-#include "tools.h"
-#include "value.h"
-#include "cell.h"
-#include "sheet.h"
-#include "ranges.h"
-#include "parse-util.h"
-#include "style.h"
-#include "regression.h"
-#include "sheet-style.h"
-#include "workbook.h"
-#include "collect.h"
-#include "gnm-format.h"
-#include "sheet-object-cell-comment.h"
-#include "workbook-control.h"
-#include "command-context.h"
-#include "sheet-object-graph.h"
-#include "graph.h"
+#include <gnumeric.h>
+#include <tools/analysis-tools.h>
+
+#include <mathfunc.h>
+#include <func.h>
+#include <expr.h>
+#include <position.h>
+#include <tools/tools.h>
+#include <value.h>
+#include <cell.h>
+#include <sheet.h>
+#include <ranges.h>
+#include <parse-util.h>
+#include <style.h>
+#include <regression.h>
+#include <sheet-style.h>
+#include <workbook.h>
+#include <collect.h>
+#include <gnm-format.h>
+#include <sheet-object-cell-comment.h>
+#include <workbook-control.h>
+#include <command-context.h>
+#include <sheet-object-graph.h>
+#include <graph.h>
#include <goffice/goffice.h>
#include <string.h>
diff --git a/src/tools/analysis-tools.h b/src/tools/analysis-tools.h
index 0036f70..d8cf5ee 100644
--- a/src/tools/analysis-tools.h
+++ b/src/tools/analysis-tools.h
@@ -2,12 +2,12 @@
#ifndef GNUMERIC_ANALYSIS_TOOLS_H
#define GNUMERIC_ANALYSIS_TOOLS_H
-#include "gnumeric.h"
-#include "numbers.h"
+#include <gnumeric.h>
+#include <numbers.h>
#include <tools/dao.h>
-#include "tools.h"
-#include "regression.h"
-#include "func.h"
+#include <tools/tools.h>
+#include <regression.h>
+#include <func.h>
/*******************************************************************/
diff --git a/src/tools/analysis-wilcoxon-mann-whitney.c b/src/tools/analysis-wilcoxon-mann-whitney.c
index 549b6f8..4e02d44 100644
--- a/src/tools/analysis-wilcoxon-mann-whitney.c
+++ b/src/tools/analysis-wilcoxon-mann-whitney.c
@@ -24,14 +24,14 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "analysis-wilcoxon-mann-whitney.h"
-#include "analysis-tools.h"
-#include "value.h"
-#include "ranges.h"
-#include "expr.h"
-#include "func.h"
-#include "numbers.h"
+#include <gnumeric.h>
+#include <tools/analysis-wilcoxon-mann-whitney.h>
+#include <tools/analysis-tools.h>
+#include <value.h>
+#include <ranges.h>
+#include <expr.h>
+#include <func.h>
+#include <numbers.h>
static
GnmExpr const *analysis_tool_combine_area (GnmValue *val_1, GnmValue *val_2, Workbook *wb)
diff --git a/src/tools/analysis-wilcoxon-mann-whitney.h b/src/tools/analysis-wilcoxon-mann-whitney.h
index 3e1c9ca..28f51bd 100644
--- a/src/tools/analysis-wilcoxon-mann-whitney.h
+++ b/src/tools/analysis-wilcoxon-mann-whitney.h
@@ -26,12 +26,12 @@
#ifndef ANALYSIS_WILCOXON_MANN_WHITNEY_H
#define ANALYSIS_WILCOXON_MANN_WHITNEY_H
-#include "gnumeric.h"
-#include "numbers.h"
+#include <gnumeric.h>
+#include <numbers.h>
#include <tools/dao.h>
-#include "tools.h"
-#include "analysis-tools.h"
-#include "sheet.h"
+#include <tools/tools.h>
+#include <tools/analysis-tools.h>
+#include <sheet.h>
gboolean
analysis_tool_wilcoxon_mann_whitney_engine (GOCmdContext *gcc,
diff --git a/src/tools/auto-correct.c b/src/tools/auto-correct.c
index 689f60e..4d73425 100644
--- a/src/tools/auto-correct.c
+++ b/src/tools/auto-correct.c
@@ -25,13 +25,13 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "auto-correct.h"
+#include <gnumeric.h>
+#include <tools/auto-correct.h>
-#include "application.h"
-#include "gutils.h"
-#include "gnumeric-conf.h"
-#include "parse-util.h"
+#include <application.h>
+#include <gutils.h>
+#include <gnumeric-conf.h>
+#include <parse-util.h>
#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include <string.h>
diff --git a/src/tools/auto-correct.h b/src/tools/auto-correct.h
index 787bf77..4c57c79 100644
--- a/src/tools/auto-correct.h
+++ b/src/tools/auto-correct.h
@@ -1,7 +1,7 @@
#ifndef AUTO_CORRECT_H
#define AUTO_CORRECT_H
-#include "gnumeric.h"
+#include <gnumeric.h>
char *autocorrect_tool (char const *input);
diff --git a/src/tools/dao.c b/src/tools/dao.c
index ffcd9fb..3f6f469 100644
--- a/src/tools/dao.c
+++ b/src/tools/dao.c
@@ -27,23 +27,23 @@
#include <gnumeric-config.h>
#include <tools/dao.h>
-#include "expr.h"
-#include "value.h"
-#include "cell.h"
-#include "sheet.h"
-#include "ranges.h"
-#include "style.h"
-#include "sheet-style.h"
-#include "workbook.h"
-#include "workbook-view.h"
-#include "workbook-control.h"
-#include "command-context.h"
-#include "gnm-format.h"
-#include "sheet-merge.h"
-#include "sheet-object-cell-comment.h"
-#include "style-color.h"
-#include "style-border.h"
-#include "graph.h"
+#include <expr.h>
+#include <value.h>
+#include <cell.h>
+#include <sheet.h>
+#include <ranges.h>
+#include <style.h>
+#include <sheet-style.h>
+#include <workbook.h>
+#include <workbook-view.h>
+#include <workbook-control.h>
+#include <command-context.h>
+#include <gnm-format.h>
+#include <sheet-merge.h>
+#include <sheet-object-cell-comment.h>
+#include <style-color.h>
+#include <style-border.h>
+#include <graph.h>
#include <goffice/goffice.h>
#include <glib.h>
diff --git a/src/tools/dao.h b/src/tools/dao.h
index 6040967..b8ff75c 100644
--- a/src/tools/dao.h
+++ b/src/tools/dao.h
@@ -27,13 +27,13 @@
#ifndef GNUMERIC_DAO_H
#define GNUMERIC_DAO_H
-#include "gnumeric.h"
-#include "numbers.h"
-#include "style.h"
+#include <gnumeric.h>
+#include <numbers.h>
+#include <style.h>
#include <goffice/goffice.h>
-#include "style-color.h"
-#include "style-border.h"
-#include "graph.h"
+#include <style-color.h>
+#include <style-border.h>
+#include <graph.h>
typedef enum {
NewSheetOutput, NewWorkbookOutput, RangeOutput, InPlaceOutput
diff --git a/src/tools/data-shuffling.c b/src/tools/data-shuffling.c
index 924a81b..9231592 100644
--- a/src/tools/data-shuffling.c
+++ b/src/tools/data-shuffling.c
@@ -34,9 +34,9 @@
#include <command-context.h>
#include <goffice/goffice.h>
-#include "gnm-random.h"
-#include "tools/data-shuffling.h"
-#include "expr.h"
+#include <gnm-random.h>
+#include <tools/data-shuffling.h>
+#include <expr.h>
typedef struct {
diff --git a/src/tools/fill-series.c b/src/tools/fill-series.c
index f0b83a0..7374851 100644
--- a/src/tools/fill-series.c
+++ b/src/tools/fill-series.c
@@ -25,21 +25,21 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-
-#include "sheet.h"
-#include "sheet-filter.h"
-#include "cell.h"
-#include "ranges.h"
-#include "value.h"
-#include "gnm-format.h"
-#include "workbook.h"
-#include "tools.h"
-#include "numbers.h"
-#include "gnm-datetime.h"
-
-#include "mathfunc.h"
-#include "tools/fill-series.h"
+#include <gnumeric.h>
+
+#include <sheet.h>
+#include <sheet-filter.h>
+#include <cell.h>
+#include <ranges.h>
+#include <value.h>
+#include <gnm-format.h>
+#include <workbook.h>
+#include <tools/tools.h>
+#include <numbers.h>
+#include <gnm-datetime.h>
+
+#include <mathfunc.h>
+#include <tools/fill-series.h>
#include <goffice/goffice.h>
static void
diff --git a/src/tools/filter.c b/src/tools/filter.c
index 7d85f4f..e09bcaa 100644
--- a/src/tools/filter.c
+++ b/src/tools/filter.c
@@ -35,8 +35,8 @@
#include <selection.h>
#include <criteria.h>
-#include "filter.h"
-#include "analysis-tools.h"
+#include <tools/filter.h>
+#include <tools/analysis-tools.h>
static void
filter (data_analysis_output_t *dao, Sheet *sheet, GSList *rows,
diff --git a/src/tools/gnm-solver.c b/src/tools/gnm-solver.c
index 6e3e9c3..dcb488e 100644
--- a/src/tools/gnm-solver.c
+++ b/src/tools/gnm-solver.c
@@ -1,23 +1,23 @@
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "value.h"
-#include "cell.h"
-#include "expr.h"
-#include "expr-deriv.h"
-#include "sheet.h"
-#include "workbook.h"
-#include "rangefunc.h"
-#include "ranges.h"
-#include "gutils.h"
-#include "mathfunc.h"
-#include "gnm-solver.h"
-#include "workbook-view.h"
-#include "workbook-control.h"
-#include "application.h"
-#include "gnm-marshalers.h"
+#include <gnumeric.h>
+#include <value.h>
+#include <cell.h>
+#include <expr.h>
+#include <expr-deriv.h>
+#include <sheet.h>
+#include <workbook.h>
+#include <rangefunc.h>
+#include <ranges.h>
+#include <gutils.h>
+#include <mathfunc.h>
+#include <tools/gnm-solver.h>
+#include <workbook-view.h>
+#include <workbook-control.h>
+#include <application.h>
+#include <gnm-marshalers.h>
#include <tools/dao.h>
-#include "gui-util.h"
-#include "gnm-i18n.h"
+#include <gui-util.h>
+#include <gnm-i18n.h>
#include <gsf/gsf-impl-utils.h>
#include <gsf/gsf-output-stdio.h>
#include <glib/gi18n-lib.h>
diff --git a/src/tools/goal-seek.c b/src/tools/goal-seek.c
index eb06c5d..4076473 100644
--- a/src/tools/goal-seek.c
+++ b/src/tools/goal-seek.c
@@ -12,10 +12,10 @@
#endif
#include <gnumeric-config.h>
-#include "numbers.h"
-#include "gnumeric.h"
-#include "goal-seek.h"
-#include "gnm-random.h"
+#include <numbers.h>
+#include <gnumeric.h>
+#include <tools/goal-seek.h>
+#include <gnm-random.h>
#include <stdlib.h>
#include <math.h>
diff --git a/src/tools/goal-seek.h b/src/tools/goal-seek.h
index 9c0ca8f..9d1d8b1 100644
--- a/src/tools/goal-seek.h
+++ b/src/tools/goal-seek.h
@@ -1,7 +1,7 @@
#ifndef GNUMERIC_GOAL_SEEK_H
#define GNUMERIC_GOAL_SEEK_H
-#include "numbers.h"
+#include <numbers.h>
#include <glib.h>
typedef struct {
diff --git a/src/tools/random-generator-cor.c b/src/tools/random-generator-cor.c
index 4cffcb5..184631d 100644
--- a/src/tools/random-generator-cor.c
+++ b/src/tools/random-generator-cor.c
@@ -24,17 +24,17 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "random-generator-cor.h"
-#include "analysis-tools.h"
-#include "value.h"
-#include "ranges.h"
-#include "expr.h"
+#include <gnumeric.h>
+#include <tools/random-generator-cor.h>
+#include <tools/analysis-tools.h>
+#include <value.h>
+#include <ranges.h>
+#include <expr.h>
#include <tools/dao.h>
#include <tools/dao.h>
-#include "sheet.h"
-#include "func.h"
-#include "numbers.h"
+#include <sheet.h>
+#include <func.h>
+#include <numbers.h>
static gboolean
tool_random_cor_engine_run (data_analysis_output_t *dao,
diff --git a/src/tools/random-generator-cor.h b/src/tools/random-generator-cor.h
index a909c9b..178b2aa 100644
--- a/src/tools/random-generator-cor.h
+++ b/src/tools/random-generator-cor.h
@@ -1,10 +1,10 @@
#ifndef GNUMERIC_RANDOM_GENERATOR_COR_H
#define GNUMERIC_RANDOM_GENERATOR_COR_H
-#include "gnumeric.h"
-#include "numbers.h"
+#include <gnumeric.h>
+#include <numbers.h>
#include <tools/dao.h>
-#include "tools.h"
+#include <tools/tools.h>
typedef enum {
random_gen_cor_type_cov = 0,
diff --git a/src/tools/random-generator.c b/src/tools/random-generator.c
index 564c5b0..e909a5a 100644
--- a/src/tools/random-generator.c
+++ b/src/tools/random-generator.c
@@ -26,22 +26,22 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "random-generator.h"
-
-#include "gnm-random.h"
-#include "rangefunc.h"
-#include "tools.h"
-#include "value.h"
-#include "cell.h"
-#include "sheet.h"
-#include "ranges.h"
-#include "style.h"
-#include "sheet-style.h"
-#include "workbook.h"
-#include "gnm-format.h"
-#include "command-context.h"
-#include "sheet-object-cell-comment.h"
+#include <gnumeric.h>
+#include <tools/random-generator.h>
+
+#include <gnm-random.h>
+#include <rangefunc.h>
+#include <tools/tools.h>
+#include <value.h>
+#include <cell.h>
+#include <sheet.h>
+#include <ranges.h>
+#include <style.h>
+#include <sheet-style.h>
+#include <workbook.h>
+#include <gnm-format.h>
+#include <command-context.h>
+#include <sheet-object-cell-comment.h>
#include <string.h>
#include <math.h>
diff --git a/src/tools/random-generator.h b/src/tools/random-generator.h
index 0d37b4a..20d9843 100644
--- a/src/tools/random-generator.h
+++ b/src/tools/random-generator.h
@@ -1,10 +1,10 @@
#ifndef GNUMERIC_RANDOM_GENERATOR_H
#define GNUMERIC_RANDOM_GENERATOR_H
-#include "gnumeric.h"
-#include "numbers.h"
+#include <gnumeric.h>
+#include <numbers.h>
#include <tools/dao.h>
-#include "tools.h"
+#include <tools/tools.h>
typedef enum {
diff --git a/src/tools/scenarios.c b/src/tools/scenarios.c
index ea43bbc..15b06b7 100644
--- a/src/tools/scenarios.c
+++ b/src/tools/scenarios.c
@@ -31,10 +31,10 @@
#include <workbook.h>
#include <expr.h>
-#include "scenarios.h"
+#include <tools/scenarios.h>
#include <tools/dao.h>
-#include "clipboard.h"
-#include "parse-util.h"
+#include <clipboard.h>
+#include <parse-util.h>
#include <goffice/goffice.h>
#include <string.h>
diff --git a/src/tools/simulation.c b/src/tools/simulation.c
index 529e0a2..cc84034 100644
--- a/src/tools/simulation.c
+++ b/src/tools/simulation.c
@@ -33,8 +33,8 @@
#include <sheet.h>
#include <mathfunc.h>
-#include "rangefunc.h"
-#include "simulation.h"
+#include <rangefunc.h>
+#include <tools/simulation.h>
static void
init_stats (simstats_t *stats, simulation_t *sim)
diff --git a/src/tools/tabulate.c b/src/tools/tabulate.c
index 819c73d..0eb2c38 100644
--- a/src/tools/tabulate.c
+++ b/src/tools/tabulate.c
@@ -22,28 +22,28 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "tabulate.h"
+#include <gnumeric.h>
+#include <tools/tabulate.h>
-#include "tools.h"
-#include "command-context.h"
+#include <tools/tools.h>
+#include <command-context.h>
#include <workbook-control.h>
-#include "ranges.h"
-#include "value.h"
-#include "sheet.h"
-#include "mstyle.h"
-#include "workbook.h"
-#include "cell.h"
-#include "commands.h"
-#include "gnm-format.h"
-#include "number-match.h"
-#include "mstyle.h"
-#include "style-border.h"
-#include "sheet-style.h"
-#include "style-color.h"
-#include "mathfunc.h"
-#include "application.h"
+#include <ranges.h>
+#include <value.h>
+#include <sheet.h>
+#include <mstyle.h>
+#include <workbook.h>
+#include <cell.h>
+#include <commands.h>
+#include <gnm-format.h>
+#include <number-match.h>
+#include <mstyle.h>
+#include <style-border.h>
+#include <sheet-style.h>
+#include <style-color.h>
+#include <mathfunc.h>
+#include <application.h>
static GnmValue *
diff --git a/src/tools/tabulate.h b/src/tools/tabulate.h
index 8a64054..a8e46db 100644
--- a/src/tools/tabulate.h
+++ b/src/tools/tabulate.h
@@ -1,10 +1,10 @@
#ifndef GNUMERIC_TABULATE_H
#define GNUMERIC_TABULATE_H
-#include "gnumeric.h"
-#include "numbers.h"
+#include <gnumeric.h>
+#include <numbers.h>
#include <tools/dao.h>
-#include "tools.h"
+#include <tools/tools.h>
typedef struct {
GnmCell *target;
diff --git a/src/tools/tools.h b/src/tools/tools.h
index 370ede7..30ba938 100644
--- a/src/tools/tools.h
+++ b/src/tools/tools.h
@@ -15,8 +15,8 @@
#ifndef GNUMERIC_TOOLS_H
#define GNUMERIC_TOOLS_H
-#include "gnumeric.h"
-#include "numbers.h"
+#include <gnumeric.h>
+#include <numbers.h>
#include <tools/dao.h>
typedef enum {
diff --git a/src/undo.c b/src/undo.c
index f6c1a3c..5f22b11 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -23,13 +23,13 @@
#include <gnumeric-config.h>
-#include "undo.h"
-#include "sheet.h"
-#include "sheet-view.h"
-#include "sheet-control-gui.h"
-#include "wbc-gtk.h"
-#include "wbc-gtk-impl.h"
-#include "colrow.h"
+#include <undo.h>
+#include <sheet.h>
+#include <sheet-view.h>
+#include <sheet-control-gui.h>
+#include <wbc-gtk.h>
+#include <wbc-gtk-impl.h>
+#include <colrow.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
diff --git a/src/undo.h b/src/undo.h
index 9199855..f3bd269 100644
--- a/src/undo.h
+++ b/src/undo.h
@@ -2,10 +2,10 @@
#ifndef _GNM_UNDO_H_
#define _GNM_UNDO_H_
-#include "gnumeric.h"
-#include "sheet.h"
-#include "colrow.h"
-#include "sheet-filter.h"
+#include <gnumeric.h>
+#include <sheet.h>
+#include <colrow.h>
+#include <sheet-filter.h>
#include <goffice/goffice.h>
#include <glib-object.h>
diff --git a/src/validation-combo.h b/src/validation-combo.h
index cc49be9..2fed538 100644
--- a/src/validation-combo.h
+++ b/src/validation-combo.h
@@ -2,7 +2,7 @@
#ifndef _GNM_VALIDATION_COMBO_H_
# define _GNM_VALIDATION_COMBO_H_
-#include "gnm-cell-combo.h"
+#include <gnm-cell-combo.h>
G_BEGIN_DECLS
diff --git a/src/validation.c b/src/validation.c
index c136fa3..143c546 100644
--- a/src/validation.c
+++ b/src/validation.c
@@ -22,25 +22,25 @@
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "validation.h"
-#include "validation-combo.h"
-
-#include "numbers.h"
-#include "expr.h"
-#include "mstyle.h"
-#include "sheet.h"
-#include "cell.h"
-#include "value.h"
-#include "workbook.h"
-#include "workbook-control.h"
-#include "parse-util.h"
-
-#include "sheet-view.h"
-#include "sheet-object.h"
-#include "sheet-style.h"
-#include "widgets/gnm-validation-combo-view.h"
-#include "widgets/gnm-cell-combo-view.h"
+#include <gnumeric.h>
+#include <validation.h>
+#include <validation-combo.h>
+
+#include <numbers.h>
+#include <expr.h>
+#include <mstyle.h>
+#include <sheet.h>
+#include <cell.h>
+#include <value.h>
+#include <workbook.h>
+#include <workbook-control.h>
+#include <parse-util.h>
+
+#include <sheet-view.h>
+#include <sheet-object.h>
+#include <sheet-style.h>
+#include <widgets/gnm-validation-combo-view.h>
+#include <widgets/gnm-cell-combo-view.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
diff --git a/src/validation.h b/src/validation.h
index c57dff6..0ad4be3 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -2,8 +2,8 @@
#ifndef _GNM_VALIDATION_H_
# define _GNM_VALIDATION_H_
-#include "gnumeric.h"
-#include "dependent.h"
+#include <gnumeric.h>
+#include <dependent.h>
G_BEGIN_DECLS
diff --git a/src/value-sheet.c b/src/value-sheet.c
index 051378e..fde6915 100644
--- a/src/value-sheet.c
+++ b/src/value-sheet.c
@@ -8,15 +8,15 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-
-#include "value.h"
-#include "gnm-format.h"
-#include "ranges.h"
-#include "sheet.h"
-#include "cell.h"
-#include "workbook.h"
-#include "parse-util.h"
+#include <gnumeric.h>
+
+#include <value.h>
+#include <gnm-format.h>
+#include <ranges.h>
+#include <sheet.h>
+#include <cell.h>
+#include <workbook.h>
+#include <parse-util.h>
#include <goffice/goffice.h>
/* Debugging utility to print a GnmValue */
diff --git a/src/value.c b/src/value.c
index af27c5e..c110091 100644
--- a/src/value.c
+++ b/src/value.c
@@ -11,17 +11,17 @@
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "value.h"
-
-#include "parse-util.h"
-#include "style.h"
-#include "gnm-format.h"
-#include "position.h"
-#include "mathfunc.h"
-#include "gutils.h"
-#include "workbook.h"
-#include "expr.h"
+#include <gnumeric.h>
+#include <value.h>
+
+#include <parse-util.h>
+#include <style.h>
+#include <gnm-format.h>
+#include <position.h>
+#include <mathfunc.h>
+#include <gutils.h>
+#include <workbook.h>
+#include <expr.h>
#include <ranges.h>
#include <sheet.h>
#include <cell.h>
diff --git a/src/value.h b/src/value.h
index 344ed4a..fafa346 100644
--- a/src/value.h
+++ b/src/value.h
@@ -2,10 +2,10 @@
#ifndef _GNM_VALUE_H_
# define _GNM_VALUE_H_
-#include "gnumeric.h"
-#include "position.h"
-#include "numbers.h"
-#include "parse-util.h"
+#include <gnumeric.h>
+#include <position.h>
+#include <numbers.h>
+#include <parse-util.h>
#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/src/wbc-gtk-actions.c b/src/wbc-gtk-actions.c
index 0aa4483..ed079bf 100644
--- a/src/wbc-gtk-actions.c
+++ b/src/wbc-gtk-actions.c
@@ -22,52 +22,52 @@
*
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-
-#include "libgnumeric.h"
-#include "application.h"
-#include "gnm-commands-slicer.h"
-#include "commands.h"
-#include "clipboard.h"
-#include "selection.h"
-#include "search.h"
-#include "ranges.h"
-#include "cell.h"
-#include "stf.h"
-#include "value.h"
-#include "gnm-format.h"
-#include "sheet.h"
-#include "sort.h"
-#include "sheet-merge.h"
-#include "sheet-filter.h"
-#include "sheet-utils.h"
-#include "sheet-style.h"
-#include "style-border.h"
-#include "style-color.h"
-#include "tools/filter.h"
-#include "sheet-control-gui-priv.h"
-#include "sheet-view.h"
-#include "cmd-edit.h"
-#include "workbook.h"
-#include "workbook-view.h"
-#include "wbc-gtk-impl.h"
-#include "workbook-cmd-format.h"
-#include "dialogs/dialogs.h"
-#include "sheet-object-image.h"
-#include "sheet-object-widget.h"
-#include "gnm-so-filled.h"
-#include "gnm-so-line.h"
-#include "sheet-object-graph.h"
-#include "sheet-object-component.h"
-#include "gui-util.h"
-#include "gui-file.h"
-#include "gnumeric-conf.h"
-#include "expr.h"
-#include "print.h"
-#include "print-info.h"
-#include "gnm-pane-impl.h"
-#include "gutils.h"
-#include "widgets/gnm-fontbutton.h"
+#include <gnumeric.h>
+
+#include <libgnumeric.h>
+#include <application.h>
+#include <gnm-commands-slicer.h>
+#include <commands.h>
+#include <clipboard.h>
+#include <selection.h>
+#include <search.h>
+#include <ranges.h>
+#include <cell.h>
+#include <stf.h>
+#include <value.h>
+#include <gnm-format.h>
+#include <sheet.h>
+#include <sort.h>
+#include <sheet-merge.h>
+#include <sheet-filter.h>
+#include <sheet-utils.h>
+#include <sheet-style.h>
+#include <style-border.h>
+#include <style-color.h>
+#include <tools/filter.h>
+#include <sheet-control-gui-priv.h>
+#include <sheet-view.h>
+#include <cmd-edit.h>
+#include <workbook.h>
+#include <workbook-view.h>
+#include <wbc-gtk-impl.h>
+#include <workbook-cmd-format.h>
+#include <dialogs/dialogs.h>
+#include <sheet-object-image.h>
+#include <sheet-object-widget.h>
+#include <gnm-so-filled.h>
+#include <gnm-so-line.h>
+#include <sheet-object-graph.h>
+#include <sheet-object-component.h>
+#include <gui-util.h>
+#include <gui-file.h>
+#include <gnumeric-conf.h>
+#include <expr.h>
+#include <print.h>
+#include <print-info.h>
+#include <gnm-pane-impl.h>
+#include <gutils.h>
+#include <widgets/gnm-fontbutton.h>
#include <goffice/goffice.h>
#include <goffice/component/goffice-component.h>
diff --git a/src/wbc-gtk-edit.c b/src/wbc-gtk-edit.c
index e8079d7..72a0915 100644
--- a/src/wbc-gtk-edit.c
+++ b/src/wbc-gtk-edit.c
@@ -22,35 +22,35 @@
* USA
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-
-#include "gnm-pane-impl.h"
-#include "wbc-gtk-impl.h"
-#include "workbook-view.h"
-#include "workbook-priv.h"
-#include "application.h"
-#include "clipboard.h"
-#include "complete-sheet.h"
-#include "commands.h"
-#include "gnumeric-conf.h"
-#include "mstyle.h"
-#include "style-color.h"
-#include "sheet-control-gui-priv.h"
-#include "sheet-style.h"
-#include "sheet-view.h"
-#include "sheet.h"
-#include "cell.h"
-#include "expr.h"
-#include "gnm-format.h"
-#include "number-match.h"
-#include "parse-util.h"
-#include "ranges.h"
-#include "selection.h"
-#include "validation.h"
-#include "value.h"
-#include "widgets/gnumeric-expr-entry.h"
-#include "gui-util.h"
-#include "command-context.h"
+#include <gnumeric.h>
+
+#include <gnm-pane-impl.h>
+#include <wbc-gtk-impl.h>
+#include <workbook-view.h>
+#include <workbook-priv.h>
+#include <application.h>
+#include <clipboard.h>
+#include <complete-sheet.h>
+#include <commands.h>
+#include <gnumeric-conf.h>
+#include <mstyle.h>
+#include <style-color.h>
+#include <sheet-control-gui-priv.h>
+#include <sheet-style.h>
+#include <sheet-view.h>
+#include <sheet.h>
+#include <cell.h>
+#include <expr.h>
+#include <gnm-format.h>
+#include <number-match.h>
+#include <parse-util.h>
+#include <ranges.h>
+#include <selection.h>
+#include <validation.h>
+#include <value.h>
+#include <widgets/gnumeric-expr-entry.h>
+#include <gui-util.h>
+#include <command-context.h>
#include <goffice/goffice.h>
#include <glib/gi18n-lib.h>
diff --git a/src/wbc-gtk-impl.h b/src/wbc-gtk-impl.h
index 8613c2e..1d18ae9 100644
--- a/src/wbc-gtk-impl.h
+++ b/src/wbc-gtk-impl.h
@@ -2,12 +2,12 @@
#ifndef _GNM_WBC_GTK_IMPL_H_
# define _GNM_WBC_GTK_IMPL_H_
-#include "gnumeric.h"
-#include "wbc-gtk.h"
-#include "workbook-control-priv.h"
-#include "style.h"
-#include "widgets/gnumeric-expr-entry.h"
-#include "widgets/gnm-notebook.h"
+#include <gnumeric.h>
+#include <wbc-gtk.h>
+#include <workbook-control-priv.h>
+#include <style.h>
+#include <widgets/gnumeric-expr-entry.h>
+#include <widgets/gnm-notebook.h>
#include <goffice/goffice.h>
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 85c4329..8c65d1a 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -22,49 +22,49 @@
* USA
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "wbc-gtk-impl.h"
-#include "workbook-view.h"
-#include "workbook-priv.h"
-#include "gui-util.h"
-#include "gutils.h"
-#include "gui-file.h"
-#include "sheet-control-gui-priv.h"
-#include "sheet.h"
-#include "sheet-private.h"
-#include "sheet-view.h"
-#include "sheet-style.h"
-#include "sheet-filter.h"
-#include "commands.h"
-#include "dependent.h"
-#include "application.h"
-#include "history.h"
-#include "func.h"
-#include "value.h"
-#include "style-font.h"
-#include "gnm-format.h"
-#include "expr.h"
-#include "style-color.h"
-#include "style-border.h"
-#include "gnumeric-conf.h"
-#include "dialogs/dialogs.h"
-#include "gui-clipboard.h"
-#include "libgnumeric.h"
-#include "gnm-pane-impl.h"
-#include "graph.h"
-#include "selection.h"
-#include "file-autoft.h"
-#include "ranges.h"
-#include "tools/analysis-auto-expression.h"
-#include "sheet-object-cell-comment.h"
-#include "print-info.h"
-#include "expr-name.h"
+#include <gnumeric.h>
+#include <wbc-gtk-impl.h>
+#include <workbook-view.h>
+#include <workbook-priv.h>
+#include <gui-util.h>
+#include <gutils.h>
+#include <gui-file.h>
+#include <sheet-control-gui-priv.h>
+#include <sheet.h>
+#include <sheet-private.h>
+#include <sheet-view.h>
+#include <sheet-style.h>
+#include <sheet-filter.h>
+#include <commands.h>
+#include <dependent.h>
+#include <application.h>
+#include <history.h>
+#include <func.h>
+#include <value.h>
+#include <style-font.h>
+#include <gnm-format.h>
+#include <expr.h>
+#include <style-color.h>
+#include <style-border.h>
+#include <gnumeric-conf.h>
+#include <dialogs/dialogs.h>
+#include <gui-clipboard.h>
+#include <libgnumeric.h>
+#include <gnm-pane-impl.h>
+#include <graph.h>
+#include <selection.h>
+#include <file-autoft.h>
+#include <ranges.h>
+#include <tools/analysis-auto-expression.h>
+#include <sheet-object-cell-comment.h>
+#include <print-info.h>
+#include <expr-name.h>
#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include <gsf/gsf-doc-meta-data.h>
-#include "gdk/gdkkeysyms-compat.h"
-#include "gnm-i18n.h"
+#include <gdk/gdkkeysyms-compat.h>
+#include <gnm-i18n.h>
#include <string.h>
#define GET_GUI_ITEM(i_) (gpointer)(gtk_builder_get_object(wbcg->gui, (i_)))
diff --git a/src/wbc-gtk.h b/src/wbc-gtk.h
index e57fc75..46b1db2 100644
--- a/src/wbc-gtk.h
+++ b/src/wbc-gtk.h
@@ -2,10 +2,10 @@
#ifndef _GNM_WBC_GTK_H_
# define _GNM_WBC_GTK_H_
-#include "gnumeric.h"
-#include "gnumeric-fwd.h"
-#include "workbook-control.h"
-#include "widgets/gnumeric-expr-entry.h"
+#include <gnumeric.h>
+#include <gnumeric-fwd.h>
+#include <workbook-control.h>
+#include <widgets/gnumeric-expr-entry.h>
G_BEGIN_DECLS
diff --git a/src/widgets/gnm-cell-combo-view-impl.h b/src/widgets/gnm-cell-combo-view-impl.h
index ac224cc..cbac252 100644
--- a/src/widgets/gnm-cell-combo-view-impl.h
+++ b/src/widgets/gnm-cell-combo-view-impl.h
@@ -1,8 +1,8 @@
#ifndef GNM_CELL_COMBO_VIEW_IMPL_H
#define GNM_CELL_COMBO_VIEW_IMPL_H
-#include "gnumeric-fwd.h"
-#include "sheet-object-impl.h"
+#include <gnumeric-fwd.h>
+#include <sheet-object-impl.h>
typedef SheetObjectView GnmCComboView;
typedef struct {
diff --git a/src/widgets/gnm-cell-combo-view.c b/src/widgets/gnm-cell-combo-view.c
index 83daa2e..6b410e2 100644
--- a/src/widgets/gnm-cell-combo-view.c
+++ b/src/widgets/gnm-cell-combo-view.c
@@ -22,15 +22,15 @@
*/
#include <gnumeric-config.h>
-#include "gnm-cell-combo-view.h"
-#include "gnm-cell-combo-view-impl.h"
-
-#include "wbc-gtk.h"
-#include "sheet.h"
-#include "sheet-control-gui.h"
-#include "sheet-merge.h"
-#include "gnm-pane-impl.h"
-#include "ranges.h"
+#include <widgets/gnm-cell-combo-view.h>
+#include <widgets/gnm-cell-combo-view-impl.h>
+
+#include <wbc-gtk.h>
+#include <sheet.h>
+#include <sheet-control-gui.h>
+#include <sheet-merge.h>
+#include <gnm-pane-impl.h>
+#include <ranges.h>
#include <goffice/goffice.h>
#include <gdk/gdk.h>
diff --git a/src/widgets/gnm-cell-combo-view.h b/src/widgets/gnm-cell-combo-view.h
index b9121b1..e26722c 100644
--- a/src/widgets/gnm-cell-combo-view.h
+++ b/src/widgets/gnm-cell-combo-view.h
@@ -1,7 +1,7 @@
#ifndef GNM_CELL_COMBO_VIEW_H
#define GNM_CELL_COMBO_VIEW_H
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <glib-object.h>
SheetObjectView *gnm_cell_combo_view_new (SheetObject *so, GType type,
diff --git a/src/widgets/gnm-dao.c b/src/widgets/gnm-dao.c
index c2338de..ca2fc45 100644
--- a/src/widgets/gnm-dao.c
+++ b/src/widgets/gnm-dao.c
@@ -18,8 +18,8 @@
**/
#include <gnumeric-config.h>
-#include "gnm-dao.h"
-#include "gnumeric-expr-entry.h"
+#include <widgets/gnm-dao.h>
+#include <widgets/gnumeric-expr-entry.h>
#include <tools/dao.h>
#include <value.h>
#include <workbook-control.h>
diff --git a/src/widgets/gnm-filter-combo-view.c b/src/widgets/gnm-filter-combo-view.c
index 02adc85..4de0907 100644
--- a/src/widgets/gnm-filter-combo-view.c
+++ b/src/widgets/gnm-filter-combo-view.c
@@ -22,24 +22,24 @@
*/
#include <gnumeric-config.h>
-#include "gnm-filter-combo-view.h"
-#include "gnm-cell-combo-view-impl.h"
-
-#include "gnumeric.h"
-#include "sheet-filter.h"
-#include "sheet-filter-combo.h"
-#include "gnm-format.h"
-#include "value.h"
-#include "cell.h"
-#include "commands.h"
-#include "sheet.h"
-#include "sheet-object-impl.h"
-#include "wbc-gtk.h"
-#include "workbook.h"
-#include "style-color.h"
-#include "sheet-control-gui.h"
-#include "../dialogs/dialogs.h"
-#include "wbc-gtk-impl.h"
+#include <widgets/gnm-filter-combo-view.h>
+#include <widgets/gnm-cell-combo-view-impl.h>
+
+#include <gnumeric.h>
+#include <sheet-filter.h>
+#include <sheet-filter-combo.h>
+#include <gnm-format.h>
+#include <value.h>
+#include <cell.h>
+#include <commands.h>
+#include <sheet.h>
+#include <sheet-object-impl.h>
+#include <wbc-gtk.h>
+#include <workbook.h>
+#include <style-color.h>
+#include <sheet-control-gui.h>
+#include <dialogs/dialogs.h>
+#include <wbc-gtk-impl.h>
#include <undo.h>
#include <goffice/goffice.h>
diff --git a/src/widgets/gnm-fontbutton.c b/src/widgets/gnm-fontbutton.c
index dd9cfed..5547817 100644
--- a/src/widgets/gnm-fontbutton.c
+++ b/src/widgets/gnm-fontbutton.c
@@ -1,7 +1,7 @@
/* Mostly a copy of gtkfontbutton.c awaiting a fix for 695776. */
#include <gnumeric-config.h>
-#include "gnm-fontbutton.h"
+#include <widgets/gnm-fontbutton.h>
typedef enum {
GTK_FONT_CHOOSER_PROP_FIRST = 0x4000,
diff --git a/src/widgets/gnm-format-sel.c b/src/widgets/gnm-format-sel.c
index 7207ed1..8a3c32d 100644
--- a/src/widgets/gnm-format-sel.c
+++ b/src/widgets/gnm-format-sel.c
@@ -16,10 +16,10 @@
**/
#include <gnumeric-config.h>
-#include "gnm-format-sel.h"
-#include "src/value.h"
-#include "src/gnm-format.h"
-#include "src/style-font.h"
+#include <widgets/gnm-format-sel.h>
+#include <src/value.h>
+#include <src/gnm-format.h>
+#include <src/style-font.h>
static char *
cb_generate_preview (GOFormatSel *gfs, PangoAttrList **attrs)
diff --git a/src/widgets/gnm-format-sel.h b/src/widgets/gnm-format-sel.h
index 8090594..c32feb5 100644
--- a/src/widgets/gnm-format-sel.h
+++ b/src/widgets/gnm-format-sel.h
@@ -20,7 +20,7 @@
#ifndef GNM_FORMAT_SEL_H
#define GNM_FORMAT_SEL_H
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/widgets/gnm-notebook.c b/src/widgets/gnm-notebook.c
index ccff859..a9621be 100644
--- a/src/widgets/gnm-notebook.c
+++ b/src/widgets/gnm-notebook.c
@@ -19,9 +19,9 @@
**/
#include <gnumeric-config.h>
-#include "gnm-notebook.h"
+#include <widgets/gnm-notebook.h>
#include <goffice/goffice.h>
-#include "gnm-i18n.h"
+#include <gnm-i18n.h>
#include <gsf/gsf-impl-utils.h>
/* ------------------------------------------------------------------------- */
diff --git a/src/widgets/gnm-radiobutton.c b/src/widgets/gnm-radiobutton.c
index dd6a1bf..5ecd67d 100644
--- a/src/widgets/gnm-radiobutton.c
+++ b/src/widgets/gnm-radiobutton.c
@@ -18,7 +18,7 @@
**/
#include <gnumeric-config.h>
-#include "gnm-radiobutton.h"
+#include <widgets/gnm-radiobutton.h>
#include <gsf/gsf-impl-utils.h>
typedef GtkRadioButtonClass GnmRadioButtonClass;
diff --git a/src/widgets/gnm-sheet-sel.c b/src/widgets/gnm-sheet-sel.c
index df91db4..fce7f62 100644
--- a/src/widgets/gnm-sheet-sel.c
+++ b/src/widgets/gnm-sheet-sel.c
@@ -18,11 +18,11 @@
**/
#include <gnumeric-config.h>
-#include "gnm-sheet-sel.h"
-#include "gnm-i18n.h"
-#include "sheet.h"
-#include "workbook.h"
-#include "application.h"
+#include <widgets/gnm-sheet-sel.h>
+#include <gnm-i18n.h>
+#include <sheet.h>
+#include <workbook.h>
+#include <application.h>
#define SHEET_KEY "__sheet"
diff --git a/src/widgets/gnm-sheet-sel.h b/src/widgets/gnm-sheet-sel.h
index 1db863f..7dfae9c 100644
--- a/src/widgets/gnm-sheet-sel.h
+++ b/src/widgets/gnm-sheet-sel.h
@@ -20,8 +20,8 @@
#ifndef GNM_SHEET_SEL_H
#define GNM_SHEET_SEL_H
-#include "gnumeric.h"
-#include "widgets/gnm-workbook-sel.h"
+#include <gnumeric.h>
+#include <widgets/gnm-workbook-sel.h>
#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/widgets/gnm-sheet-slicer-combo-view.c b/src/widgets/gnm-sheet-slicer-combo-view.c
index 6ca6997..e3fdd70 100644
--- a/src/widgets/gnm-sheet-slicer-combo-view.c
+++ b/src/widgets/gnm-sheet-slicer-combo-view.c
@@ -22,18 +22,18 @@
*/
#include <gnumeric-config.h>
-#include "gnm-sheet-slicer-combo-view.h"
-#include "gnm-cell-combo-view-impl.h"
-
-#include "gnm-sheet-slicer-combo.h"
-#include "workbook.h"
-#include "sheet.h"
-#include "sheet-view.h"
-#include "value.h"
-
-#include "gnumeric.h"
-#include "go-data-slicer-field.h"
-#include "go-data-cache-field.h"
+#include <widgets/gnm-sheet-slicer-combo-view.h>
+#include <widgets/gnm-cell-combo-view-impl.h>
+
+#include <gnm-sheet-slicer-combo.h>
+#include <workbook.h>
+#include <sheet.h>
+#include <sheet-view.h>
+#include <value.h>
+
+#include <gnumeric.h>
+#include <go-data-slicer-field.h>
+#include <go-data-cache-field.h>
#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
diff --git a/src/widgets/gnm-so-anchor-mode-chooser.c b/src/widgets/gnm-so-anchor-mode-chooser.c
index 58ecf9f..a7533c4 100644
--- a/src/widgets/gnm-so-anchor-mode-chooser.c
+++ b/src/widgets/gnm-so-anchor-mode-chooser.c
@@ -19,7 +19,7 @@
*/
#include <gnumeric-config.h>
-#include "gnm-so-anchor-mode-chooser.h"
+#include <widgets/gnm-so-anchor-mode-chooser.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
diff --git a/src/widgets/gnm-so-anchor-mode-chooser.h b/src/widgets/gnm-so-anchor-mode-chooser.h
index ca45257..69a9499 100644
--- a/src/widgets/gnm-so-anchor-mode-chooser.h
+++ b/src/widgets/gnm-so-anchor-mode-chooser.h
@@ -21,8 +21,8 @@
#ifndef GNM_SO_ANCHOR_MODE_CHOOSER_H
#define GNM_SO_ANCHOR_MODE_CHOOSER_H
-#include "gnumeric.h"
-#include "sheet-object.h"
+#include <gnumeric.h>
+#include <sheet-object.h>
#include <glib-object.h>
typedef struct _GnmSOAnchorModeChooser GnmSOAnchorModeChooser;
diff --git a/src/widgets/gnm-validation-combo-view.c b/src/widgets/gnm-validation-combo-view.c
index 6b8ba34..86b61e1 100644
--- a/src/widgets/gnm-validation-combo-view.c
+++ b/src/widgets/gnm-validation-combo-view.c
@@ -23,22 +23,22 @@
*/
#include <gnumeric-config.h>
-#include "gnm-validation-combo-view.h"
-#include "gnm-cell-combo-view-impl.h"
-
-#include "validation-combo.h"
-#include "commands.h"
-#include "gnm-format.h"
-#include "workbook-control.h"
-#include "workbook.h"
-#include "sheet-control-gui.h"
-#include "sheet-view.h"
-#include "sheet.h"
-#include "cell.h"
-#include "expr.h"
-#include "value.h"
-
-#include "gnumeric.h"
+#include <widgets/gnm-validation-combo-view.h>
+#include <widgets/gnm-cell-combo-view-impl.h>
+
+#include <validation-combo.h>
+#include <commands.h>
+#include <gnm-format.h>
+#include <workbook-control.h>
+#include <workbook.h>
+#include <sheet-control-gui.h>
+#include <sheet-view.h>
+#include <sheet.h>
+#include <cell.h>
+#include <expr.h>
+#include <value.h>
+
+#include <gnumeric.h>
#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
#include <glib/gi18n-lib.h>
diff --git a/src/widgets/gnm-workbook-sel.c b/src/widgets/gnm-workbook-sel.c
index 5f5aa40..8b03149 100644
--- a/src/widgets/gnm-workbook-sel.c
+++ b/src/widgets/gnm-workbook-sel.c
@@ -18,10 +18,10 @@
**/
#include <gnumeric-config.h>
-#include "gnm-workbook-sel.h"
-#include "gnm-i18n.h"
-#include "workbook.h"
-#include "application.h"
+#include <widgets/gnm-workbook-sel.h>
+#include <gnm-i18n.h>
+#include <workbook.h>
+#include <application.h>
#define WB_KEY "__wb"
diff --git a/src/widgets/gnm-workbook-sel.h b/src/widgets/gnm-workbook-sel.h
index c84851a..0b38f06 100644
--- a/src/widgets/gnm-workbook-sel.h
+++ b/src/widgets/gnm-workbook-sel.h
@@ -20,7 +20,7 @@
#ifndef GNM_WORKBOOK_SEL_H
#define GNM_WORKBOOK_SEL_H
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/widgets/gnumeric-cell-renderer-expr-entry.c b/src/widgets/gnumeric-cell-renderer-expr-entry.c
index ab74c4b..c353b8b 100644
--- a/src/widgets/gnumeric-cell-renderer-expr-entry.c
+++ b/src/widgets/gnumeric-cell-renderer-expr-entry.c
@@ -16,9 +16,9 @@
*/
#include <gnumeric-config.h>
-#include "gnumeric-cell-renderer-expr-entry.h"
-#include "gnumeric-expr-entry.h"
-#include "wbc-gtk.h"
+#include <widgets/gnumeric-cell-renderer-expr-entry.h>
+#include <widgets/gnumeric-expr-entry.h>
+#include <wbc-gtk.h>
#include <dead-kittens.h>
#define GNUMERIC_CELL_RENDERER_EXPR_ENTRY_PATH "gnumeric-cell-renderer-expr-entry-path"
diff --git a/src/widgets/gnumeric-cell-renderer-expr-entry.h b/src/widgets/gnumeric-cell-renderer-expr-entry.h
index 923ee91..f1c41fb 100644
--- a/src/widgets/gnumeric-cell-renderer-expr-entry.h
+++ b/src/widgets/gnumeric-cell-renderer-expr-entry.h
@@ -18,8 +18,8 @@
#ifndef __GNUMERIC_CELL_RENDERER_EXPR_ENTRY_H__
#define __GNUMERIC_CELL_RENDERER_EXPR_ENTRY_H__
-#include "gnumeric-cell-renderer-text.h"
-#include "gnumeric-expr-entry.h"
+#include <widgets/gnumeric-cell-renderer-text.h>
+#include <widgets/gnumeric-expr-entry.h>
#include <gnumeric-fwd.h>
G_BEGIN_DECLS
diff --git a/src/widgets/gnumeric-cell-renderer-text.c b/src/widgets/gnumeric-cell-renderer-text.c
index 5800184..a4fc821 100644
--- a/src/widgets/gnumeric-cell-renderer-text.c
+++ b/src/widgets/gnumeric-cell-renderer-text.c
@@ -16,7 +16,7 @@
*/
#include <gnumeric-config.h>
-#include "gnumeric-cell-renderer-text.h"
+#include <widgets/gnumeric-cell-renderer-text.h>
#include <dead-kittens.h>
#include <gui-util.h>
diff --git a/src/widgets/gnumeric-cell-renderer-toggle.c b/src/widgets/gnumeric-cell-renderer-toggle.c
index 08a63bb..7045c64 100644
--- a/src/widgets/gnumeric-cell-renderer-toggle.c
+++ b/src/widgets/gnumeric-cell-renderer-toggle.c
@@ -20,9 +20,9 @@
*/
#include <gnumeric-config.h>
-#include "gnumeric-cell-renderer-toggle.h"
+#include <widgets/gnumeric-cell-renderer-toggle.h>
#include <gsf/gsf-impl-utils.h>
-#include "gnm-i18n.h"
+#include <gnm-i18n.h>
static void gnumeric_cell_renderer_toggle_get_property (GObject *object,
guint param_id,
diff --git a/src/widgets/gnumeric-dashed-canvas-line.c b/src/widgets/gnumeric-dashed-canvas-line.c
index cf96f8a..e687ca7 100644
--- a/src/widgets/gnumeric-dashed-canvas-line.c
+++ b/src/widgets/gnumeric-dashed-canvas-line.c
@@ -8,7 +8,7 @@
*/
#include <gnumeric-config.h>
#include <gnumeric.h>
-#include "gnumeric-dashed-canvas-line.h"
+#include <widgets/gnumeric-dashed-canvas-line.h>
#include <gsf/gsf-impl-utils.h>
#include <math.h>
diff --git a/src/widgets/gnumeric-dashed-canvas-line.h b/src/widgets/gnumeric-dashed-canvas-line.h
index c348565..e6e509a 100644
--- a/src/widgets/gnumeric-dashed-canvas-line.h
+++ b/src/widgets/gnumeric-dashed-canvas-line.h
@@ -3,7 +3,7 @@
/* dashed Line item for the canvas */
#include <goffice/goffice.h>
-#include "style-border.h"
+#include <style-border.h>
#define GNM_DASHED_CANVAS_LINE_TYPE\
(gnumeric_dashed_canvas_line_get_type ())
diff --git a/src/widgets/gnumeric-expr-entry.c b/src/widgets/gnumeric-expr-entry.c
index 91758a0..fb9543d 100644
--- a/src/widgets/gnumeric-expr-entry.c
+++ b/src/widgets/gnumeric-expr-entry.c
@@ -9,9 +9,9 @@
*/
#include <gnumeric-config.h>
-#include "gnm-i18n.h"
+#include <gnm-i18n.h>
#include <gnumeric.h>
-#include "gnumeric-expr-entry.h"
+#include <widgets/gnumeric-expr-entry.h>
#include <wbc-gtk-impl.h>
#include <sheet-control-gui-priv.h>
diff --git a/src/widgets/gnumeric-expr-entry.h b/src/widgets/gnumeric-expr-entry.h
index 3df879e..430e6cb 100644
--- a/src/widgets/gnumeric-expr-entry.h
+++ b/src/widgets/gnumeric-expr-entry.h
@@ -1,8 +1,8 @@
#ifndef GNUMERIC_EXPR_ENTRY_H
#define GNUMERIC_EXPR_ENTRY_H
-#include "gnumeric-fwd.h"
-#include "parse-util.h"
+#include <gnumeric-fwd.h>
+#include <parse-util.h>
#define GNM_EXPR_ENTRY_TYPE (gnm_expr_entry_get_type ())
#define GNM_EXPR_ENTRY(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNM_EXPR_ENTRY_TYPE, GnmExprEntry))
diff --git a/src/widgets/gnumeric-lazy-list.c b/src/widgets/gnumeric-lazy-list.c
index b737b6b..2153d65 100644
--- a/src/widgets/gnumeric-lazy-list.c
+++ b/src/widgets/gnumeric-lazy-list.c
@@ -1,5 +1,5 @@
#include <gnumeric-config.h>
-#include "gnumeric-lazy-list.h"
+#include <widgets/gnumeric-lazy-list.h>
#include <glib/gi18n-lib.h>
#include <gnm-marshalers.h>
diff --git a/src/widgets/gnumeric-text-view.c b/src/widgets/gnumeric-text-view.c
index 1fd787a..f445e70 100644
--- a/src/widgets/gnumeric-text-view.c
+++ b/src/widgets/gnumeric-text-view.c
@@ -20,9 +20,9 @@
*/
#include <gnumeric-config.h>
-#include "gnm-i18n.h"
+#include <gnm-i18n.h>
#include <gnumeric.h>
-#include "gnumeric-text-view.h"
+#include <widgets/gnumeric-text-view.h>
#include <gui-util.h>
diff --git a/src/widgets/gnumeric-text-view.h b/src/widgets/gnumeric-text-view.h
index 4fbf4b4..74dbf07 100644
--- a/src/widgets/gnumeric-text-view.h
+++ b/src/widgets/gnumeric-text-view.h
@@ -22,7 +22,7 @@
#ifndef GNUMERIC_TEXT_VIEW_H
#define GNUMERIC_TEXT_VIEW_H
-#include "gnumeric-fwd.h"
+#include <gnumeric-fwd.h>
#define GNM_TEXT_VIEW_TYPE (gnm_text_view_get_type ())
#define GNM_TEXT_VIEW(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNM_TEXT_VIEW_TYPE, GnmTextView))
diff --git a/src/workbook-cmd-format.c b/src/workbook-cmd-format.c
index e7f0962..6b81efe 100644
--- a/src/workbook-cmd-format.c
+++ b/src/workbook-cmd-format.c
@@ -8,28 +8,28 @@
*/
#include <gnumeric-config.h>
#include <glib/gi18n-lib.h>
-#include "gnumeric.h"
-#include "workbook-cmd-format.h"
-
-#include "cell.h"
-#include "dependent.h"
-#include "expr.h"
-#include "func.h"
-#include "ranges.h"
-#include "gui-util.h"
-#include "selection.h"
-#include "sheet-merge.h"
-#include "sheet-view.h"
-#include "value.h"
-#include "workbook-control.h"
-#include "workbook-view.h"
-#include "workbook.h"
-#include "application.h"
-#include "dialogs/dialogs.h"
-#include "sheet.h"
-#include "commands.h"
-#include "style-border.h"
-#include "style-color.h"
+#include <gnumeric.h>
+#include <workbook-cmd-format.h>
+
+#include <cell.h>
+#include <dependent.h>
+#include <expr.h>
+#include <func.h>
+#include <ranges.h>
+#include <gui-util.h>
+#include <selection.h>
+#include <sheet-merge.h>
+#include <sheet-view.h>
+#include <value.h>
+#include <workbook-control.h>
+#include <workbook-view.h>
+#include <workbook.h>
+#include <application.h>
+#include <dialogs/dialogs.h>
+#include <sheet.h>
+#include <commands.h>
+#include <style-border.h>
+#include <style-color.h>
struct closure_colrow_resize {
gboolean is_cols;
diff --git a/src/workbook-cmd-format.h b/src/workbook-cmd-format.h
index c7535e1..3b40dc3 100644
--- a/src/workbook-cmd-format.h
+++ b/src/workbook-cmd-format.h
@@ -2,7 +2,7 @@
#ifndef _GNM_WORKBOOK_CMD_FORMAT_H_
# define _GNM_WORKBOOK_CMD_FORMAT_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
G_BEGIN_DECLS
diff --git a/src/workbook-control-priv.h b/src/workbook-control-priv.h
index 155107f..e019c04 100644
--- a/src/workbook-control-priv.h
+++ b/src/workbook-control-priv.h
@@ -2,7 +2,7 @@
#ifndef _GNM_WORKBOOK_CONTROL_PRIV_H_
# define _GNM_WORKBOOK_CONTROL_PRIV_H_
-#include "workbook-control.h"
+#include <workbook-control.h>
#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/workbook-control.c b/src/workbook-control.c
index 891a5e0..c90e962 100644
--- a/src/workbook-control.c
+++ b/src/workbook-control.c
@@ -22,23 +22,23 @@
*/
#include <gnumeric-config.h>
-#include "gnm-i18n.h"
-#include "gnumeric.h"
-#include "workbook-control-priv.h"
-
-#include "application.h"
-#include "workbook-view.h"
-#include "workbook-priv.h"
-#include "sheet.h"
-#include "sheet-view.h"
-#include "sheet-utils.h"
-#include "selection.h"
-#include "commands.h"
-#include "value.h"
-#include "ranges.h"
-#include "expr-name.h"
-#include "expr.h"
-#include "command-context.h"
+#include <gnm-i18n.h>
+#include <gnumeric.h>
+#include <workbook-control-priv.h>
+
+#include <application.h>
+#include <workbook-view.h>
+#include <workbook-priv.h>
+#include <sheet.h>
+#include <sheet-view.h>
+#include <sheet-utils.h>
+#include <selection.h>
+#include <commands.h>
+#include <value.h>
+#include <ranges.h>
+#include <expr-name.h>
+#include <expr.h>
+#include <command-context.h>
#include <goffice/goffice.h>
#include <gsf/gsf-impl-utils.h>
diff --git a/src/workbook-control.h b/src/workbook-control.h
index a1bbcaf..a3170e4 100644
--- a/src/workbook-control.h
+++ b/src/workbook-control.h
@@ -2,8 +2,8 @@
#ifndef _GNM_WORKBOOK_CONTROL_H_
# define _GNM_WORKBOOK_CONTROL_H_
-#include "gnumeric.h"
-#include "validation.h"
+#include <gnumeric.h>
+#include <validation.h>
#include <glib-object.h>
G_BEGIN_DECLS
diff --git a/src/workbook-priv.h b/src/workbook-priv.h
index 0ff9cfd..c5fa5cd 100644
--- a/src/workbook-priv.h
+++ b/src/workbook-priv.h
@@ -2,7 +2,7 @@
#ifndef _GNM_WORKBOOK_PRIV_H_
# define _GNM_WORKBOOK_PRIV_H_
-#include "workbook.h"
+#include <workbook.h>
#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/workbook-view.c b/src/workbook-view.c
index c88bf62..99fb083 100644
--- a/src/workbook-view.c
+++ b/src/workbook-view.c
@@ -21,46 +21,46 @@
* USA
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "workbook-view.h"
-
-#include "workbook-control-priv.h"
-#include "workbook-priv.h"
-#include "application.h"
-#include "sheet.h"
-#include "sheet-view.h"
-#include "sheet-merge.h"
-#include "sheet-style.h"
-#include "func.h"
-#include "expr.h"
-#include "expr-name.h"
-#include "value.h"
-#include "ranges.h"
-#include "selection.h"
-#include "mstyle.h"
-#include "validation.h"
-#include "validation-combo.h"
-#include "gnm-sheet-slicer.h"
-#include "gnm-sheet-slicer-combo.h"
-#include "position.h"
-#include "cell.h"
-#include "gutils.h"
-#include "command-context.h"
-#include "auto-format.h"
-#include "sheet-object.h"
-#include "gnumeric-conf.h"
+#include <gnumeric.h>
+#include <workbook-view.h>
+
+#include <workbook-control-priv.h>
+#include <workbook-priv.h>
+#include <application.h>
+#include <sheet.h>
+#include <sheet-view.h>
+#include <sheet-merge.h>
+#include <sheet-style.h>
+#include <func.h>
+#include <expr.h>
+#include <expr-name.h>
+#include <value.h>
+#include <ranges.h>
+#include <selection.h>
+#include <mstyle.h>
+#include <validation.h>
+#include <validation-combo.h>
+#include <gnm-sheet-slicer.h>
+#include <gnm-sheet-slicer-combo.h>
+#include <position.h>
+#include <cell.h>
+#include <gutils.h>
+#include <command-context.h>
+#include <auto-format.h>
+#include <sheet-object.h>
+#include <gnumeric-conf.h>
#include <goffice/goffice.h>
#include <gsf/gsf-meta-names.h>
#include <gsf/gsf-impl-utils.h>
#include <gsf/gsf-output-stdio.h>
#include <gsf/gsf-input.h>
-#include "gnm-i18n.h"
+#include <gnm-i18n.h>
#include <glib/gstdio.h>
#include <string.h>
#include <unistd.h>
#include <stdlib.h>
-#include "mathfunc.h"
+#include <mathfunc.h>
#ifdef G_OS_WIN32
#include <windows.h>
diff --git a/src/workbook-view.h b/src/workbook-view.h
index f0adc76..bfbcd82 100644
--- a/src/workbook-view.h
+++ b/src/workbook-view.h
@@ -2,8 +2,8 @@
#ifndef _GNM_WORKBOOK_VIEW_H_
# define _GNM_WORKBOOK_VIEW_H_
-#include "gnumeric.h"
-#include "dependent.h"
+#include <gnumeric.h>
+#include <dependent.h>
#include <goffice/goffice.h>
G_BEGIN_DECLS
diff --git a/src/workbook.c b/src/workbook.c
index e4b5623..49bab74 100644
--- a/src/workbook.c
+++ b/src/workbook.c
@@ -13,39 +13,39 @@
* Copyright (C) 1999-2009 Morten Welinder (terra gnome org)
*/
#include <gnumeric-config.h>
-#include "gnumeric.h"
-#include "workbook-priv.h"
-#include "compilation.h"
-
-#include "workbook-view.h"
-#include "workbook-control.h"
-#include "command-context.h"
-#include "application.h"
-#include "gnumeric-conf.h"
-#include "sheet.h"
-#include "sheet-view.h"
-#include "sheet-control.h"
-#include "cell.h"
-#include "expr.h"
-#include "expr-name.h"
-#include "dependent.h"
-#include "value.h"
-#include "ranges.h"
-#include "history.h"
-#include "commands.h"
-#include "libgnumeric.h"
-#include "gutils.h"
-#include "gnm-marshalers.h"
-#include "style-color.h"
-#include "sheet-style.h"
-#include "sheet-object-graph.h"
+#include <gnumeric.h>
+#include <workbook-priv.h>
+#include <compilation.h>
+
+#include <workbook-view.h>
+#include <workbook-control.h>
+#include <command-context.h>
+#include <application.h>
+#include <gnumeric-conf.h>
+#include <sheet.h>
+#include <sheet-view.h>
+#include <sheet-control.h>
+#include <cell.h>
+#include <expr.h>
+#include <expr-name.h>
+#include <dependent.h>
+#include <value.h>
+#include <ranges.h>
+#include <history.h>
+#include <commands.h>
+#include <libgnumeric.h>
+#include <gutils.h>
+#include <gnm-marshalers.h>
+#include <style-color.h>
+#include <sheet-style.h>
+#include <sheet-object-graph.h>
#include <goffice/goffice.h>
#include <gsf/gsf-doc-meta-data.h>
#include <gsf/gsf-impl-utils.h>
#include <gsf/gsf-meta-names.h>
-#include "gnm-i18n.h"
+#include <gnm-i18n.h>
#include <string.h>
#include <errno.h>
diff --git a/src/workbook.h b/src/workbook.h
index c35d0b1..fad516c 100644
--- a/src/workbook.h
+++ b/src/workbook.h
@@ -2,10 +2,10 @@
#ifndef _GNM_WORKBOOK_H_
# define _GNM_WORKBOOK_H_
-#include "gnumeric.h"
+#include <gnumeric.h>
#include <goffice/goffice.h>
#include <glib-object.h>
-#include "gui-file.h"
+#include <gui-file.h>
G_BEGIN_DECLS
diff --git a/src/xml-sax-read.c b/src/xml-sax-read.c
index 850933b..07df96b 100644
--- a/src/xml-sax-read.c
+++ b/src/xml-sax-read.c
@@ -24,47 +24,47 @@
#include <gnumeric-config.h>
#include <gnumeric.h>
-#include "xml-sax.h"
-#include "xml-io-version.h"
-#include "gnm-plugin.h"
-#include "sheet-view.h"
-#include "sheet-style.h"
-#include "sheet-merge.h"
-#include "sheet-filter.h"
-#include "sheet.h"
-#include "ranges.h"
+#include <xml-sax.h>
+#include <xml-io-version.h>
+#include <gnm-plugin.h>
+#include <sheet-view.h>
+#include <sheet-style.h>
+#include <sheet-merge.h>
+#include <sheet-filter.h>
+#include <sheet.h>
+#include <ranges.h>
#include <tools/gnm-solver.h>
#include <tools/scenarios.h>
-#include "style.h"
-#include "style-border.h"
-#include "style-color.h"
-#include "style-conditions.h"
-#include "validation.h"
-#include "hlink.h"
-#include "input-msg.h"
-#include "cell.h"
-#include "position.h"
-#include "expr.h"
-#include "expr-name.h"
-#include "print-info.h"
-#include "value.h"
-#include "selection.h"
-#include "command-context.h"
-#include "workbook-view.h"
-#include "workbook-control.h"
-#include "workbook.h"
-#include "sheet-object-impl.h"
-#include "sheet-object-cell-comment.h"
-#include "gnm-so-line.h"
-#include "gnm-so-filled.h"
-#include "gnm-so-path.h"
-#include "gnm-format.h"
-#include "sheet-object-graph.h"
-#include "sheet-object-component.h"
-#include "application.h"
-#include "gutils.h"
-#include "clipboard.h"
-#include "number-match.h"
+#include <style.h>
+#include <style-border.h>
+#include <style-color.h>
+#include <style-conditions.h>
+#include <validation.h>
+#include <hlink.h>
+#include <input-msg.h>
+#include <cell.h>
+#include <position.h>
+#include <expr.h>
+#include <expr-name.h>
+#include <print-info.h>
+#include <value.h>
+#include <selection.h>
+#include <command-context.h>
+#include <workbook-view.h>
+#include <workbook-control.h>
+#include <workbook.h>
+#include <sheet-object-impl.h>
+#include <sheet-object-cell-comment.h>
+#include <gnm-so-line.h>
+#include <gnm-so-filled.h>
+#include <gnm-so-path.h>
+#include <gnm-format.h>
+#include <sheet-object-graph.h>
+#include <sheet-object-component.h>
+#include <application.h>
+#include <gutils.h>
+#include <clipboard.h>
+#include <number-match.h>
#include <goffice/goffice.h>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]