Remove unnecessary include directives of hash.h

diff --git a/src/data/file-name.c b/src/data/file-name.c
index e3047a3354cd3506917cefcb3e0a23587138981c..1b31048e211b75dd301fc87d5c928cfe0bc764f6 100644 (file)
--- 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 b729770a91c7c294b99b0cbe5172245bdef128b0..c148a7f09a0792bfe9c964ceb57fea3ffc85d43f 100644 (file)
--- 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 7b1b25512a89358b966d44416467dfd5e4bf2b10..22656f19b3cb9699eab3cc91ec559bcb5a835ff3 100644 (file)
--- 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 7aeb70d922c516e53b90b189228c2abb6d5ccbad..268023cf2f3ed71ab529e7f41a1afe9144ddc839 100644 (file)
--- 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 422639b17819375f9f3619cdb8490e377468e730..65b250e085f40c1a791735bbb6273c2df7f664ff 100644 (file)
--- 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 9968d9f9fb4e6067219dd9f7ccef2cc15518b0d7..f703722c3f39ec1e02a0691d2b96609fbced4123 100644 (file)
--- 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 2f8b4023c9c7a58765212c774cc357e891397fc0..bc3c767cdb416a587d154405f941641bfd3e6e54 100644 (file)
--- 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 ce5cc15ddf7fb7f9c63931164674750752608fd8..3e1df58fd85b186673f9663cb770ecb0ed440f29 100644 (file)
--- 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 64204b78ec374cd0ef3477e0157b9a3883e994bf..8de2ee18183161d824cf187743dbcf95276cdfb6 100644 (file)
--- 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 c175831d8dacb6c3d448ac2821a9d7362725e1b5..ecd13aa536e8d536ec30195d6147122540806979 100644 (file)
--- 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 db871b8734be012be056124c7b91335dd2685cc8..24130cbc30abfa4830aff59ff96f7023cd2284d1 100644 (file)
--- 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 5e3ea11f24654d0af73ff4cc1113123134bca00b..226518f261c02c91983845f420e3e2b72ca5ba34 100644 (file)
--- 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 b92018fdb400e9fe88d72ec93eed6d04d40d9bbe..3287509c982c3398dcee96a0e17eea4ea21b929d 100644 (file)
--- 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 91a17d1a14fc23e89e5d0cd2984b8888d6eba51b..182e092e14c7a52079f50fc4829ae0657c8e0e1b 100644 (file)
--- 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 d4ac27dde74044a92f48d3748df8e3e1ce0dd4ca..e4239fda6adbbd45695b4350c93e64f7a51ade9b 100644 (file)
--- 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 db206ee910510c766d9b366accd04b73b4faadf6..5f20a2e3f0bf96da24b6a7214d6f0538a475ced9 100644 (file)
--- 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 071253f3efa17ab64e2f412c724011055f3186d1..75eef106c11f00f9797cbdf3db3102a2a393b120 100644 (file)
--- 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 625291360fb7ed453472982f01b084bf46edf003..4ed897ee3a6e172fbb80ab9fe0c5a90ec738af6c 100644 (file)
--- 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 56360cabc0c47c4f11eb52f17af8fe91b5f088a1..69e2ed9546f95a80966fd70113b1ce2c68777e7f 100644 (file)
--- 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 *,