From 6d53d2b45f5385271dd21e8df1b5ac23d20be9fb Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Mon, 19 Jul 2010 18:47:38 +0200
Subject: [PATCH] Remove unnecessary include directives of hash.h

---
 src/data/file-name.c                       | 2 +-
 src/data/por-file-reader.c                 | 1 -
 src/data/por-file-writer.c                 | 1 -
 src/data/sys-file-reader.c                 | 1 -
 src/data/value.c                           | 2 +-
 src/data/variable.c                        | 2 +-
 src/language/control/temporary.c           | 1 -
 src/language/dictionary/apply-dictionary.c | 1 -
 src/language/dictionary/modify-variables.c | 1 -
 src/language/dictionary/rename-variables.c | 1 -
 src/language/dictionary/sys-file-info.c    | 1 -
 src/language/dictionary/value-labels.c     | 1 -
 src/language/stats/binomial.c              | 2 --
 src/language/stats/chisquare.h             | 5 -----
 src/language/stats/examine.q               | 1 -
 src/language/stats/glm.q                   | 1 -
 src/language/stats/means.q                 | 1 -
 src/language/stats/npar-summary.c          | 1 -
 src/libpspp/sparse-array.h                 | 2 +-
 19 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/src/data/file-name.c b/src/data/file-name.c
index e3047a33..1b31048e 100644
--- a/src/data/file-name.c
+++ b/src/data/file-name.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 
 #include "data/settings.h"
-#include "libpspp/hash.h"
+#include "libpspp/hash-functions.h"
 #include "libpspp/message.h"
 #include "libpspp/str.h"
 #include "libpspp/version.h"
diff --git a/src/data/por-file-reader.c b/src/data/por-file-reader.c
index b729770a..c148a7f0 100644
--- a/src/data/por-file-reader.c
+++ b/src/data/por-file-reader.c
@@ -37,7 +37,6 @@
 #include <data/value-labels.h>
 #include <data/variable.h>
 #include <libpspp/compiler.h>
-#include <libpspp/hash.h>
 #include <libpspp/message.h>
 #include <libpspp/misc.h>
 #include <libpspp/pool.h>
diff --git a/src/data/por-file-writer.c b/src/data/por-file-writer.c
index 7b1b2551..22656f19 100644
--- a/src/data/por-file-writer.c
+++ b/src/data/por-file-writer.c
@@ -39,7 +39,6 @@
 #include <data/value-labels.h>
 #include <data/variable.h>
 
-#include <libpspp/hash.h>
 #include <libpspp/message.h>
 #include <libpspp/misc.h>
 #include <libpspp/str.h>
diff --git a/src/data/sys-file-reader.c b/src/data/sys-file-reader.c
index 7aeb70d9..268023cf 100644
--- a/src/data/sys-file-reader.c
+++ b/src/data/sys-file-reader.c
@@ -42,7 +42,6 @@
 #include "libpspp/array.h"
 #include "libpspp/assertion.h"
 #include "libpspp/compiler.h"
-#include "libpspp/hash.h"
 #include "libpspp/i18n.h"
 #include "libpspp/message.h"
 #include "libpspp/misc.h"
diff --git a/src/data/value.c b/src/data/value.c
index 422639b1..65b250e0 100644
--- a/src/data/value.c
+++ b/src/data/value.c
@@ -19,7 +19,7 @@
 
 #include <data/val-type.h>
 #include <data/variable.h>
-#include <libpspp/hash.h>
+#include <libpspp/hash-functions.h>
 #include <libpspp/pool.h>
 #include <libpspp/str.h>
 #include <gl/unistr.h>
diff --git a/src/data/variable.c b/src/data/variable.c
index 9968d9f9..f703722c 100644
--- a/src/data/variable.c
+++ b/src/data/variable.c
@@ -31,7 +31,7 @@
 #include <libpspp/misc.h>
 #include <libpspp/assertion.h>
 #include <libpspp/compiler.h>
-#include <libpspp/hash.h>
+#include <libpspp/hash-functions.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
 
diff --git a/src/language/control/temporary.c b/src/language/control/temporary.c
index 2f8b4023..bc3c767c 100644
--- a/src/language/control/temporary.c
+++ b/src/language/control/temporary.c
@@ -27,7 +27,6 @@
 #include <data/variable.h>
 #include <language/command.h>
 #include <language/lexer/lexer.h>
-#include <libpspp/hash.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
 
diff --git a/src/language/dictionary/apply-dictionary.c b/src/language/dictionary/apply-dictionary.c
index ce5cc15d..3e1df58f 100644
--- a/src/language/dictionary/apply-dictionary.c
+++ b/src/language/dictionary/apply-dictionary.c
@@ -29,7 +29,6 @@
 #include <language/command.h>
 #include <language/data-io/file-handle.h>
 #include <language/lexer/lexer.h>
-#include <libpspp/hash.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
 
diff --git a/src/language/dictionary/modify-variables.c b/src/language/dictionary/modify-variables.c
index 64204b78..8de2ee18 100644
--- a/src/language/dictionary/modify-variables.c
+++ b/src/language/dictionary/modify-variables.c
@@ -28,7 +28,6 @@
 #include <libpspp/array.h>
 #include <libpspp/bit-vector.h>
 #include <libpspp/compiler.h>
-#include <libpspp/hash.h>
 #include <libpspp/message.h>
 #include <libpspp/misc.h>
 #include <libpspp/str.h>
diff --git a/src/language/dictionary/rename-variables.c b/src/language/dictionary/rename-variables.c
index c175831d..ecd13aa5 100644
--- a/src/language/dictionary/rename-variables.c
+++ b/src/language/dictionary/rename-variables.c
@@ -24,7 +24,6 @@
 #include <language/command.h>
 #include <language/lexer/lexer.h>
 #include <language/lexer/variable-parser.h>
-#include <libpspp/hash.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
 
diff --git a/src/language/dictionary/sys-file-info.c b/src/language/dictionary/sys-file-info.c
index db871b87..24130cbc 100644
--- a/src/language/dictionary/sys-file-info.c
+++ b/src/language/dictionary/sys-file-info.c
@@ -35,7 +35,6 @@
 #include <language/lexer/lexer.h>
 #include <language/lexer/variable-parser.h>
 #include <libpspp/array.h>
-#include <libpspp/hash.h>
 #include <libpspp/message.h>
 #include <libpspp/message.h>
 #include <libpspp/misc.h>
diff --git a/src/language/dictionary/value-labels.c b/src/language/dictionary/value-labels.c
index 5e3ea11f..226518f2 100644
--- a/src/language/dictionary/value-labels.c
+++ b/src/language/dictionary/value-labels.c
@@ -26,7 +26,6 @@
 #include <language/lexer/lexer.h>
 #include <language/lexer/value-parser.h>
 #include <language/lexer/variable-parser.h>
-#include <libpspp/hash.h>
 #include <libpspp/message.h>
 #include <libpspp/str.h>
 
diff --git a/src/language/stats/binomial.c b/src/language/stats/binomial.c
index b92018fd..3287509c 100644
--- a/src/language/stats/binomial.c
+++ b/src/language/stats/binomial.c
@@ -45,8 +45,6 @@
 
 #include <minmax.h>
 
-#include <libpspp/hash.h>
-
 static double calculate_binomial_internal (double n1, double n2,
 					   double p);
 
diff --git a/src/language/stats/chisquare.h b/src/language/stats/chisquare.h
index 91a17d1a..182e092e 100644
--- a/src/language/stats/chisquare.h
+++ b/src/language/stats/chisquare.h
@@ -35,13 +35,8 @@ struct chisquare_test
 };
 
 struct casereader;
-struct dictionary;
-struct hsh_table;
 struct dataset;
 
-void chisquare_insert_variables (const struct npar_test *test,
-				 struct hsh_table *variables);
-
 
 void chisquare_execute (const struct dataset *ds,
 			struct casereader *input,
diff --git a/src/language/stats/examine.q b/src/language/stats/examine.q
index d4ac27dd..e4239fda 100644
--- a/src/language/stats/examine.q
+++ b/src/language/stats/examine.q
@@ -43,7 +43,6 @@
 #include <language/dictionary/split-file.h>
 #include <language/lexer/lexer.h>
 #include <libpspp/compiler.h>
-#include <libpspp/hash.h>
 #include <libpspp/message.h>
 #include <libpspp/misc.h>
 #include <libpspp/str.h>
diff --git a/src/language/stats/glm.q b/src/language/stats/glm.q
index db206ee9..5f20a2e3 100644
--- a/src/language/stats/glm.q
+++ b/src/language/stats/glm.q
@@ -36,7 +36,6 @@
 #include <language/data-io/file-handle.h>
 #include <language/lexer/lexer.h>
 #include <libpspp/compiler.h>
-#include <libpspp/hash.h>
 #include <libpspp/message.h>
 #include <math/covariance.h>
 #include <math/linreg.h>
diff --git a/src/language/stats/means.q b/src/language/stats/means.q
index 071253f3..75eef106 100644
--- a/src/language/stats/means.q
+++ b/src/language/stats/means.q
@@ -24,7 +24,6 @@
 #include <data/variable.h>
 #include <language/command.h>
 #include <language/lexer/lexer.h>
-#include <libpspp/hash.h>
 #include <libpspp/message.h>
 
 #include "xalloc.h"
diff --git a/src/language/stats/npar-summary.c b/src/language/stats/npar-summary.c
index 62529136..4ed897ee 100644
--- a/src/language/stats/npar-summary.c
+++ b/src/language/stats/npar-summary.c
@@ -19,7 +19,6 @@
 #include <data/format.h>
 #include <output/tab.h>
 #include <data/casereader.h>
-#include <libpspp/hash.h>
 #include <data/variable.h>
 #include "npar-summary.h"
 #include <math/moments.h>
diff --git a/src/libpspp/sparse-array.h b/src/libpspp/sparse-array.h
index 56360cab..69e2ed95 100644
--- a/src/libpspp/sparse-array.h
+++ b/src/libpspp/sparse-array.h
@@ -36,7 +36,7 @@
 #include <stddef.h>
 #include <stdbool.h>
 
-#include <libpspp/hash.h>
+struct pool;
 
 struct sparse_array *sparse_array_create (size_t elem_size);
 struct sparse_array *sparse_array_create_pool (struct pool *,
-- 
2.30.2