[gnumeric] Compilation: fix up tools includes.

[Morten Welinder <mortenw src gnome org>]

commit 8c09233c22d0bb6a48570647415ed3389a4e6f5d
Author: Morten Welinder <terra gnome org>
Date:   Tue May 15 22:27:09 2018 -0400

    Compilation: fix up tools includes.

 src/Makefile.am                                    |    1 -
 src/application.c                                  |    1 -
 src/commands.c                                     |    6 +++---
 src/dialogs/dialog-advanced-filter.c               |    4 ++--
 src/dialogs/dialog-analysis-tool-chi-squared.c     |    4 ++--
 src/dialogs/dialog-analysis-tool-frequency.c       |    4 ++--
 src/dialogs/dialog-analysis-tool-kaplan-meier.c    |    4 ++--
 src/dialogs/dialog-analysis-tool-normality.c       |    4 ++--
 src/dialogs/dialog-analysis-tool-one-mean.c        |    4 ++--
 .../dialog-analysis-tool-principal-components.c    |    4 ++--
 src/dialogs/dialog-analysis-tool-sign-test.c       |    6 +++---
 .../dialog-analysis-tool-wilcoxon-mann-whitney.c   |    4 ++--
 src/dialogs/dialog-analysis-tools.c                |    8 ++++----
 src/dialogs/dialog-fill-series.c                   |    2 +-
 src/dialogs/dialog-goal-seek.c                     |    2 +-
 src/dialogs/dialog-random-generator-cor.c          |    2 +-
 src/dialogs/dialog-random-generator.c              |    2 +-
 src/dialogs/dialog-scenarios.c                     |    4 ++--
 src/dialogs/dialog-shuffle.c                       |    2 +-
 src/dialogs/dialog-simulation.c                    |    2 +-
 src/dialogs/dialog-solver.c                        |    2 +-
 src/sheet.c                                        |    2 +-
 src/tools/analysis-anova.h                         |    2 +-
 src/tools/analysis-auto-expression.h               |    2 +-
 src/tools/analysis-chi-squared.h                   |    2 +-
 src/tools/analysis-exp-smoothing.h                 |    2 +-
 src/tools/analysis-frequency.h                     |    2 +-
 src/tools/analysis-histogram.h                     |    2 +-
 src/tools/analysis-kaplan-meier.h                  |    2 +-
 src/tools/analysis-normality.h                     |    2 +-
 src/tools/analysis-one-mean-test.h                 |    2 +-
 src/tools/analysis-principal-components.h          |    2 +-
 src/tools/analysis-sign-test.h                     |    2 +-
 src/tools/analysis-signed-rank-test.h              |    2 +-
 src/tools/analysis-tools.h                         |    2 +-
 src/tools/analysis-wilcoxon-mann-whitney.h         |    2 +-
 src/tools/dao.c                                    |    2 +-
 src/tools/data-shuffling.c                         |    3 +--
 src/tools/data-shuffling.h                         |    2 +-
 src/tools/fill-series.c                            |    3 +--
 src/tools/fill-series.h                            |    2 +-
 src/tools/filter.h                                 |    2 +-
 src/tools/gnm-solver.c                             |    2 +-
 src/tools/random-generator-cor.c                   |    4 ++--
 src/tools/random-generator-cor.h                   |    2 +-
 src/tools/random-generator.h                       |    2 +-
 src/tools/scenarios.c                              |    2 +-
 src/tools/simulation.h                             |    2 +-
 src/tools/tabulate.h                               |    2 +-
 src/tools/tools.h                                  |    2 +-
 50 files changed, 65 insertions(+), 69 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index ffb19ba..88dd6bf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,7 +34,6 @@ AM_CPPFLAGS =                                                                 \
        -I$(top_srcdir)                                                 \
        -I$(srcdir)                                                     \
        -I$(srcdir)/widgets                                             \
-       -I$(srcdir)/tools                                               \
        $(GNUMERIC_CFLAGS)
 
 # A hint is needed to build these headers first:
diff --git a/src/application.c b/src/application.c
index cc05afe..d1e9c4d 100644
--- a/src/application.c
+++ b/src/application.c
@@ -19,7 +19,6 @@
 #include "sheet-view.h"
 #include "sheet-private.h"
 #include "sheet-object.h"
-#include "auto-correct.h"
 #include "gutils.h"
 #include "ranges.h"
 #include "sheet-object.h"
diff --git a/src/commands.c b/src/commands.c
index 0a018f3..8db0be4 100644
--- a/src/commands.c
+++ b/src/commands.c
@@ -55,7 +55,7 @@
 #include "selection.h"
 #include "colrow.h"
 #include "style-border.h"
-#include "auto-correct.h"
+#include "tools/auto-correct.h"
 #include "sheet-autofill.h"
 #include "mstyle.h"
 #include "search.h"
@@ -74,8 +74,8 @@
 #include "auto-format.h"
 #include "tools/dao.h"
 #include "gnumeric-conf.h"
-#include "scenarios.h"
-#include "data-shuffling.h"
+#include "tools/scenarios.h"
+#include "tools/data-shuffling.h"
 #include "tools/tabulate.h"
 #include "wbc-gtk.h"
 #include "undo.h"
diff --git a/src/dialogs/dialog-advanced-filter.c b/src/dialogs/dialog-advanced-filter.c
index 7f94d4a..1f3eba9 100644
--- a/src/dialogs/dialog-advanced-filter.c
+++ b/src/dialogs/dialog-advanced-filter.c
@@ -40,8 +40,8 @@
 #include <gtk/gtk.h>
 #include <widgets/gnumeric-expr-entry.h>
 #include <widgets/gnm-dao.h>
-#include "filter.h"
-#include "analysis-tools.h"
+#include "tools/filter.h"
+#include "tools/analysis-tools.h"
 #include "commands.h"
 
 
diff --git a/src/dialogs/dialog-analysis-tool-chi-squared.c b/src/dialogs/dialog-analysis-tool-chi-squared.c
index 85e0758..f2b4cc8 100644
--- a/src/dialogs/dialog-analysis-tool-chi-squared.c
+++ b/src/dialogs/dialog-analysis-tool-chi-squared.c
@@ -25,8 +25,8 @@
 #include <glib/gi18n-lib.h>
 #include <gnumeric.h>
 #include "dialogs.h"
-#include "analysis-chi-squared.h"
-#include "analysis-tools.h"
+#include "tools/analysis-chi-squared.h"
+#include "tools/analysis-tools.h"
 
 #include <workbook.h>
 #include <workbook-control.h>
diff --git a/src/dialogs/dialog-analysis-tool-frequency.c b/src/dialogs/dialog-analysis-tool-frequency.c
index dd61f6d..0822b60 100644
--- a/src/dialogs/dialog-analysis-tool-frequency.c
+++ b/src/dialogs/dialog-analysis-tool-frequency.c
@@ -25,8 +25,8 @@
 #include <glib/gi18n-lib.h>
 #include <gnumeric.h>
 #include "dialogs.h"
-#include "analysis-frequency.h"
-#include "analysis-tools.h"
+#include "tools/analysis-frequency.h"
+#include "tools/analysis-tools.h"
 
 #include <workbook.h>
 #include <workbook-control.h>
diff --git a/src/dialogs/dialog-analysis-tool-kaplan-meier.c b/src/dialogs/dialog-analysis-tool-kaplan-meier.c
index 424432b..5d86eea 100644
--- a/src/dialogs/dialog-analysis-tool-kaplan-meier.c
+++ b/src/dialogs/dialog-analysis-tool-kaplan-meier.c
@@ -25,8 +25,8 @@
 #include <glib/gi18n-lib.h>
 #include <gnumeric.h>
 #include "dialogs.h"
-#include "analysis-kaplan-meier.h"
-#include "analysis-tools.h"
+#include "tools/analysis-kaplan-meier.h"
+#include "tools/analysis-tools.h"
 
 #include <workbook.h>
 #include <workbook-control.h>
diff --git a/src/dialogs/dialog-analysis-tool-normality.c b/src/dialogs/dialog-analysis-tool-normality.c
index 68c240e..c69ca90 100644
--- a/src/dialogs/dialog-analysis-tool-normality.c
+++ b/src/dialogs/dialog-analysis-tool-normality.c
@@ -25,8 +25,8 @@
 #include <glib/gi18n-lib.h>
 #include <gnumeric.h>
 #include "dialogs.h"
-#include "analysis-normality.h"
-#include "analysis-tools.h"
+#include "tools/analysis-normality.h"
+#include "tools/analysis-tools.h"
 
 #include <workbook.h>
 #include <workbook-control.h>
diff --git a/src/dialogs/dialog-analysis-tool-one-mean.c b/src/dialogs/dialog-analysis-tool-one-mean.c
index fcdd729..3113137 100644
--- a/src/dialogs/dialog-analysis-tool-one-mean.c
+++ b/src/dialogs/dialog-analysis-tool-one-mean.c
@@ -25,8 +25,8 @@
 #include <glib/gi18n-lib.h>
 #include <gnumeric.h>
 #include "dialogs.h"
-#include "analysis-one-mean-test.h"
-#include "analysis-tools.h"
+#include "tools/analysis-one-mean-test.h"
+#include "tools/analysis-tools.h"
 
 #include <workbook.h>
 #include <workbook-control.h>
diff --git a/src/dialogs/dialog-analysis-tool-principal-components.c 
b/src/dialogs/dialog-analysis-tool-principal-components.c
index 8abcd44..8bcb698 100644
--- a/src/dialogs/dialog-analysis-tool-principal-components.c
+++ b/src/dialogs/dialog-analysis-tool-principal-components.c
@@ -25,8 +25,8 @@
 #include <glib/gi18n-lib.h>
 #include <gnumeric.h>
 #include "dialogs.h"
-#include "analysis-principal-components.h"
-#include "analysis-tools.h"
+#include "tools/analysis-principal-components.h"
+#include "tools/analysis-tools.h"
 
 #include <workbook.h>
 #include <workbook-control.h>
diff --git a/src/dialogs/dialog-analysis-tool-sign-test.c b/src/dialogs/dialog-analysis-tool-sign-test.c
index 1da143f..194a20b 100644
--- a/src/dialogs/dialog-analysis-tool-sign-test.c
+++ b/src/dialogs/dialog-analysis-tool-sign-test.c
@@ -25,9 +25,9 @@
 #include <glib/gi18n-lib.h>
 #include <gnumeric.h>
 #include "dialogs.h"
-#include "analysis-sign-test.h"
-#include "analysis-signed-rank-test.h"
-#include "analysis-tools.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>
diff --git a/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c 
b/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
index ca9af37..ac30262 100644
--- a/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
+++ b/src/dialogs/dialog-analysis-tool-wilcoxon-mann-whitney.c
@@ -25,8 +25,8 @@
 #include <glib/gi18n-lib.h>
 #include <gnumeric.h>
 #include "dialogs.h"
-#include "analysis-wilcoxon-mann-whitney.h"
-#include "analysis-tools.h"
+#include "tools/analysis-wilcoxon-mann-whitney.h"
+#include "tools/analysis-tools.h"
 
 #include <workbook.h>
 #include <workbook-control.h>
diff --git a/src/dialogs/dialog-analysis-tools.c b/src/dialogs/dialog-analysis-tools.c
index 71a3e04..1613be1 100644
--- a/src/dialogs/dialog-analysis-tools.c
+++ b/src/dialogs/dialog-analysis-tools.c
@@ -25,10 +25,10 @@
 #include <glib/gi18n-lib.h>
 #include <gnumeric.h>
 #include "dialogs.h"
-#include "analysis-tools.h"
-#include "analysis-anova.h"
-#include "analysis-histogram.h"
-#include "analysis-exp-smoothing.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>
diff --git a/src/dialogs/dialog-fill-series.c b/src/dialogs/dialog-fill-series.c
index dfe3dad..34eafc5 100644
--- a/src/dialogs/dialog-fill-series.c
+++ b/src/dialogs/dialog-fill-series.c
@@ -47,7 +47,7 @@
 #include <dialogs/dao-gui-utils.h>
 
 #include <gtk/gtk.h>
-#include "fill-series.h"
+#include "tools/fill-series.h"
 
 #define FILL_SERIES_KEY "fill-series-dialog"
 
diff --git a/src/dialogs/dialog-goal-seek.c b/src/dialogs/dialog-goal-seek.c
index 43b4c2c..188fc49 100644
--- a/src/dialogs/dialog-goal-seek.c
+++ b/src/dialogs/dialog-goal-seek.c
@@ -42,7 +42,7 @@
 #include <workbook-control.h>
 #include <wbc-gtk.h>
 #include <workbook-view.h>
-#include <goal-seek.h>
+#include <tools/goal-seek.h>
 #include <mathfunc.h>
 #include <widgets/gnumeric-expr-entry.h>
 #include <selection.h>
diff --git a/src/dialogs/dialog-random-generator-cor.c b/src/dialogs/dialog-random-generator-cor.c
index da6dfa7..27648be 100644
--- a/src/dialogs/dialog-random-generator-cor.c
+++ b/src/dialogs/dialog-random-generator-cor.c
@@ -26,7 +26,7 @@
 #include "dialogs.h"
 #include "help.h"
 #include "dialogs/tool-dialogs.h"
-#include "random-generator-cor.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 d9815a4..9e61773 100644
--- a/src/dialogs/dialog-random-generator.c
+++ b/src/dialogs/dialog-random-generator.c
@@ -27,7 +27,7 @@
 #include "dialogs.h"
 #include "help.h"
 #include "dialogs/tool-dialogs.h"
-#include "random-generator.h"
+#include "tools/random-generator.h"
 
 #include <workbook.h>
 #include <workbook-control.h>
diff --git a/src/dialogs/dialog-scenarios.c b/src/dialogs/dialog-scenarios.c
index 342cc1b..d68c458 100644
--- a/src/dialogs/dialog-scenarios.c
+++ b/src/dialogs/dialog-scenarios.c
@@ -36,8 +36,8 @@
 #include <ranges.h>
 #include <value.h>
 #include <cell.h>
-#include <dao.h>
-#include "scenarios.h"
+#include <tools/dao.h>
+#include "tools/scenarios.h"
 
 #include <gtk/gtk.h>
 #include <goffice/goffice.h>
diff --git a/src/dialogs/dialog-shuffle.c b/src/dialogs/dialog-shuffle.c
index 1a30fc2..de6f0f2 100644
--- a/src/dialogs/dialog-shuffle.c
+++ b/src/dialogs/dialog-shuffle.c
@@ -41,7 +41,7 @@
 
 #include <gtk/gtk.h>
 #include <widgets/gnumeric-expr-entry.h>
-#include "data-shuffling.h"
+#include <tools/data-shuffling.h>
 
 
 #define SHUFFLE_KEY         "shuffle-dialog"
diff --git a/src/dialogs/dialog-simulation.c b/src/dialogs/dialog-simulation.c
index 1ddaeed..0394eb1 100644
--- a/src/dialogs/dialog-simulation.c
+++ b/src/dialogs/dialog-simulation.c
@@ -35,7 +35,7 @@
 
 #include <widgets/gnumeric-expr-entry.h>
 #include <widgets/gnm-dao.h>
-#include "simulation.h"
+#include "tools/simulation.h"
 
 #include <string.h>
 #include <gtk/gtk.h>
diff --git a/src/dialogs/dialog-solver.c b/src/dialogs/dialog-solver.c
index 7c0677c..c9394a1 100644
--- a/src/dialogs/dialog-solver.c
+++ b/src/dialogs/dialog-solver.c
@@ -50,7 +50,7 @@
 #include <gtk/gtk.h>
 #include <goffice/goffice.h>
 #include <string.h>
-#include <scenarios.h>
+#include <tools/scenarios.h>
 
 #define SOLVER_KEY            "solver-dialog"
 
diff --git a/src/sheet.c b/src/sheet.c
index a947b62..a3bc821 100644
--- a/src/sheet.c
+++ b/src/sheet.c
@@ -61,7 +61,7 @@
 #include "sheet-filter.h"
 #include "sheet-filter-combo.h"
 #include "gnm-sheet-slicer.h"
-#include "scenarios.h"
+#include "tools/scenarios.h"
 #include "cell-draw.h"
 #include "sort.h"
 #include "gutils.h"
diff --git a/src/tools/analysis-anova.h b/src/tools/analysis-anova.h
index 81279af..d23d78d 100644
--- a/src/tools/analysis-anova.h
+++ b/src/tools/analysis-anova.h
@@ -28,7 +28,7 @@
 
 #include "gnumeric.h"
 #include "numbers.h"
-#include "dao.h"
+#include <tools/dao.h>
 #include "tools.h"
 #include "analysis-tools.h"
 
diff --git a/src/tools/analysis-auto-expression.h b/src/tools/analysis-auto-expression.h
index 3217f3f..07bc8e2 100644
--- a/src/tools/analysis-auto-expression.h
+++ b/src/tools/analysis-auto-expression.h
@@ -28,7 +28,7 @@
 
 #include "gnumeric.h"
 #include "numbers.h"
-#include "dao.h"
+#include <tools/dao.h>
 #include "tools.h"
 #include "analysis-tools.h"
 #include "sheet.h"
diff --git a/src/tools/analysis-chi-squared.h b/src/tools/analysis-chi-squared.h
index 6cba014..7a81e56 100644
--- a/src/tools/analysis-chi-squared.h
+++ b/src/tools/analysis-chi-squared.h
@@ -28,7 +28,7 @@
 
 #include "gnumeric.h"
 #include "numbers.h"
-#include "dao.h"
+#include <tools/dao.h>
 #include "tools.h"
 #include "analysis-tools.h"
 #include "sheet.h"
diff --git a/src/tools/analysis-exp-smoothing.h b/src/tools/analysis-exp-smoothing.h
index 33dc943..69b0946 100644
--- a/src/tools/analysis-exp-smoothing.h
+++ b/src/tools/analysis-exp-smoothing.h
@@ -30,7 +30,7 @@
 
 #include "gnumeric.h"
 #include "numbers.h"
-#include "dao.h"
+#include <tools/dao.h>
 #include "tools.h"
 #include "analysis-tools.h"
 
diff --git a/src/tools/analysis-frequency.h b/src/tools/analysis-frequency.h
index 80f0e27..63103b2 100644
--- a/src/tools/analysis-frequency.h
+++ b/src/tools/analysis-frequency.h
@@ -28,7 +28,7 @@
 
 #include "gnumeric.h"
 #include "numbers.h"
-#include "dao.h"
+#include <tools/dao.h>
 #include "tools.h"
 #include "analysis-tools.h"
 
diff --git a/src/tools/analysis-histogram.h b/src/tools/analysis-histogram.h
index bc86c31..105ab45 100644
--- a/src/tools/analysis-histogram.h
+++ b/src/tools/analysis-histogram.h
@@ -30,7 +30,7 @@
 
 #include "gnumeric.h"
 #include "numbers.h"
-#include "dao.h"
+#include <tools/dao.h>
 #include "tools.h"
 #include "analysis-tools.h"
 
diff --git a/src/tools/analysis-kaplan-meier.h b/src/tools/analysis-kaplan-meier.h
index 1d9975f..adb05c0 100644
--- a/src/tools/analysis-kaplan-meier.h
+++ b/src/tools/analysis-kaplan-meier.h
@@ -28,7 +28,7 @@
 
 #include "gnumeric.h"
 #include "numbers.h"
-#include "dao.h"
+#include <tools/dao.h>
 #include "tools.h"
 #include "analysis-tools.h"
 
diff --git a/src/tools/analysis-normality.h b/src/tools/analysis-normality.h
index 5cf03cf..e2c9b56 100644
--- a/src/tools/analysis-normality.h
+++ b/src/tools/analysis-normality.h
@@ -28,7 +28,7 @@
 
 #include "gnumeric.h"
 #include "numbers.h"
-#include "dao.h"
+#include <tools/dao.h>
 #include "tools.h"
 #include "analysis-tools.h"
 
diff --git a/src/tools/analysis-one-mean-test.h b/src/tools/analysis-one-mean-test.h
index 0761e4d..781fdea 100644
--- a/src/tools/analysis-one-mean-test.h
+++ b/src/tools/analysis-one-mean-test.h
@@ -28,7 +28,7 @@
 
 #include "gnumeric.h"
 #include "numbers.h"
-#include "dao.h"
+#include <tools/dao.h>
 #include "tools.h"
 #include "analysis-tools.h"
 #include "sheet.h"
diff --git a/src/tools/analysis-principal-components.h b/src/tools/analysis-principal-components.h
index 25268c6..4ec38cf 100644
--- a/src/tools/analysis-principal-components.h
+++ b/src/tools/analysis-principal-components.h
@@ -28,7 +28,7 @@
 
 #include "gnumeric.h"
 #include "numbers.h"
-#include "dao.h"
+#include <tools/dao.h>
 #include "tools.h"
 #include "analysis-tools.h"
 #include "sheet.h"
diff --git a/src/tools/analysis-sign-test.h b/src/tools/analysis-sign-test.h
index 135a8f1..0d46c73 100644
--- a/src/tools/analysis-sign-test.h
+++ b/src/tools/analysis-sign-test.h
@@ -28,7 +28,7 @@
 
 #include "gnumeric.h"
 #include "numbers.h"
-#include "dao.h"
+#include <tools/dao.h>
 #include "tools.h"
 #include "analysis-tools.h"
 #include "sheet.h"
diff --git a/src/tools/analysis-signed-rank-test.h b/src/tools/analysis-signed-rank-test.h
index 04283af..be738ab 100644
--- a/src/tools/analysis-signed-rank-test.h
+++ b/src/tools/analysis-signed-rank-test.h
@@ -28,7 +28,7 @@
 
 #include "gnumeric.h"
 #include "numbers.h"
-#include "dao.h"
+#include <tools/dao.h>
 #include "tools.h"
 #include "analysis-tools.h"
 #include "analysis-sign-test.h"
diff --git a/src/tools/analysis-tools.h b/src/tools/analysis-tools.h
index 6aeef6f..0036f70 100644
--- a/src/tools/analysis-tools.h
+++ b/src/tools/analysis-tools.h
@@ -4,7 +4,7 @@
 
 #include "gnumeric.h"
 #include "numbers.h"
-#include "dao.h"
+#include <tools/dao.h>
 #include "tools.h"
 #include "regression.h"
 #include "func.h"
diff --git a/src/tools/analysis-wilcoxon-mann-whitney.h b/src/tools/analysis-wilcoxon-mann-whitney.h
index 6043096..3e1c9ca 100644
--- a/src/tools/analysis-wilcoxon-mann-whitney.h
+++ b/src/tools/analysis-wilcoxon-mann-whitney.h
@@ -28,7 +28,7 @@
 
 #include "gnumeric.h"
 #include "numbers.h"
-#include "dao.h"
+#include <tools/dao.h>
 #include "tools.h"
 #include "analysis-tools.h"
 #include "sheet.h"
diff --git a/src/tools/dao.c b/src/tools/dao.c
index 3db7363..ffcd9fb 100644
--- a/src/tools/dao.c
+++ b/src/tools/dao.c
@@ -25,7 +25,7 @@
  */
 
 #include <gnumeric-config.h>
-#include "dao.h"
+#include <tools/dao.h>
 
 #include "expr.h"
 #include "value.h"
diff --git a/src/tools/data-shuffling.c b/src/tools/data-shuffling.c
index 476c261..924a81b 100644
--- a/src/tools/data-shuffling.c
+++ b/src/tools/data-shuffling.c
@@ -35,8 +35,7 @@
 #include <goffice/goffice.h>
 
 #include "gnm-random.h"
-#include "data-shuffling.h"
-#include "dao.h"
+#include "tools/data-shuffling.h"
 #include "expr.h"
 
 
diff --git a/src/tools/data-shuffling.h b/src/tools/data-shuffling.h
index c3c966a..37c47df 100644
--- a/src/tools/data-shuffling.h
+++ b/src/tools/data-shuffling.h
@@ -2,7 +2,7 @@
 #define __DATA_SHUFFLING_H__
 
 #include <gnumeric.h>
-#include <dao.h>
+#include <tools/dao.h>
 
 
 #define SHUFFLE_COLS  0
diff --git a/src/tools/fill-series.c b/src/tools/fill-series.c
index 6281748..f0b83a0 100644
--- a/src/tools/fill-series.c
+++ b/src/tools/fill-series.c
@@ -39,8 +39,7 @@
 #include "gnm-datetime.h"
 
 #include "mathfunc.h"
-#include "fill-series.h"
-#include "dao.h"
+#include "tools/fill-series.h"
 #include <goffice/goffice.h>
 
 static void
diff --git a/src/tools/fill-series.h b/src/tools/fill-series.h
index 51a1bf4..98afaca 100644
--- a/src/tools/fill-series.h
+++ b/src/tools/fill-series.h
@@ -2,7 +2,7 @@
 #define __FILL_SERIES_H__
 
 #include <gnumeric.h>
-#include <dao.h>
+#include <tools/dao.h>
 
 
 typedef enum {
diff --git a/src/tools/filter.h b/src/tools/filter.h
index 41c16e3..29eaf60 100644
--- a/src/tools/filter.h
+++ b/src/tools/filter.h
@@ -2,7 +2,7 @@
 #define __FILTER_H__
 
 #include <gnumeric.h>
-#include <dao.h>
+#include <tools/dao.h>
 
 gint advanced_filter (WorkbookControl        *wbc,
                      data_analysis_output_t *dao,
diff --git a/src/tools/gnm-solver.c b/src/tools/gnm-solver.c
index c144672..6e3e9c3 100644
--- a/src/tools/gnm-solver.c
+++ b/src/tools/gnm-solver.c
@@ -15,7 +15,7 @@
 #include "workbook-control.h"
 #include "application.h"
 #include "gnm-marshalers.h"
-#include "dao.h"
+#include <tools/dao.h>
 #include "gui-util.h"
 #include "gnm-i18n.h"
 #include <gsf/gsf-impl-utils.h>
diff --git a/src/tools/random-generator-cor.c b/src/tools/random-generator-cor.c
index f23ea87..4cffcb5 100644
--- a/src/tools/random-generator-cor.c
+++ b/src/tools/random-generator-cor.c
@@ -30,8 +30,8 @@
 #include "value.h"
 #include "ranges.h"
 #include "expr.h"
-#include "dao.h"
-#include "dao.h"
+#include <tools/dao.h>
+#include <tools/dao.h>
 #include "sheet.h"
 #include "func.h"
 #include "numbers.h"
diff --git a/src/tools/random-generator-cor.h b/src/tools/random-generator-cor.h
index 38dff9a..a909c9b 100644
--- a/src/tools/random-generator-cor.h
+++ b/src/tools/random-generator-cor.h
@@ -3,7 +3,7 @@
 
 #include "gnumeric.h"
 #include "numbers.h"
-#include "dao.h"
+#include <tools/dao.h>
 #include "tools.h"
 
 typedef enum {
diff --git a/src/tools/random-generator.h b/src/tools/random-generator.h
index ca9170c..0d37b4a 100644
--- a/src/tools/random-generator.h
+++ b/src/tools/random-generator.h
@@ -3,7 +3,7 @@
 
 #include "gnumeric.h"
 #include "numbers.h"
-#include "dao.h"
+#include <tools/dao.h>
 #include "tools.h"
 
 
diff --git a/src/tools/scenarios.c b/src/tools/scenarios.c
index 175d8b2..ea43bbc 100644
--- a/src/tools/scenarios.c
+++ b/src/tools/scenarios.c
@@ -32,7 +32,7 @@
 #include <expr.h>
 
 #include "scenarios.h"
-#include "dao.h"
+#include <tools/dao.h>
 #include "clipboard.h"
 #include "parse-util.h"
 #include <goffice/goffice.h>
diff --git a/src/tools/simulation.h b/src/tools/simulation.h
index 7fe0e37..0df9dae 100644
--- a/src/tools/simulation.h
+++ b/src/tools/simulation.h
@@ -3,7 +3,7 @@
 #ifndef __SIMULATION_H__
 #define __SIMULATION_H__
 
-#include "dao.h"
+#include <tools/dao.h>
 
 typedef enum {
        MedianErr = 1, ModeErr = 2, StddevErr = 4, VarErr = 8, SkewErr = 16,
diff --git a/src/tools/tabulate.h b/src/tools/tabulate.h
index b6238cc..8a64054 100644
--- a/src/tools/tabulate.h
+++ b/src/tools/tabulate.h
@@ -3,7 +3,7 @@
 
 #include "gnumeric.h"
 #include "numbers.h"
-#include "dao.h"
+#include <tools/dao.h>
 #include "tools.h"
 
 typedef struct {
diff --git a/src/tools/tools.h b/src/tools/tools.h
index 5e75b66..370ede7 100644
--- a/src/tools/tools.h
+++ b/src/tools/tools.h
@@ -17,7 +17,7 @@
 
 #include "gnumeric.h"
 #include "numbers.h"
-#include "dao.h"
+#include <tools/dao.h>
 
 typedef enum {
        TOOL_ENGINE_UPDATE_DAO = 0,