Update all #include directives to the currently preferred style.

I left src/ui/gui alone for now.

diff --git a/src/data/any-reader.c b/src/data/any-reader.c
index 807c4fe90e95aab67a2b91bd0226820feecd462a..03a7b23bce3f46aa68d6ef904eb8b43d2b1b02b1 100644 (file)
--- a/src/data/any-reader.c
+++ b/src/data/any-reader.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,21 +15,25 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include "any-reader.h"
+
+#include "data/any-reader.h"
+
 #include <assert.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <libpspp/assertion.h>
-#include <libpspp/message.h>
-#include "file-handle-def.h"
-#include "file-name.h"
-#include "por-file-reader.h"
-#include "sys-file-reader.h"
-#include <libpspp/str.h>
-#include "scratch-reader.h"
-#include "xalloc.h"
+
+#include "data/file-handle-def.h"
+#include "data/file-name.h"
+#include "data/por-file-reader.h"
+#include "data/scratch-reader.h"
+#include "data/sys-file-reader.h"
+#include "libpspp/assertion.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/data/any-writer.c b/src/data/any-writer.c
index 94dff952f1ea6a42dbd8a154d62e4c39c4a48f72..b398c70f8ece923455b9fa0b5d62f41e90814a10 100644 (file)
--- a/src/data/any-writer.c
+++ b/src/data/any-writer.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,21 +15,25 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include "any-writer.h"
+
+#include "data/any-writer.h"
+
 #include <assert.h>
 #include <errno.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <libpspp/assertion.h>
-#include <libpspp/message.h>
-#include "file-handle-def.h"
-#include "file-name.h"
-#include "por-file-writer.h"
-#include "sys-file-writer.h"
-#include <libpspp/str.h>
-#include "scratch-writer.h"
-#include "xalloc.h"
+
+#include "data/file-handle-def.h"
+#include "data/file-name.h"
+#include "data/por-file-writer.h"
+#include "data/scratch-writer.h"
+#include "data/sys-file-writer.h"
+#include "libpspp/assertion.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/data/attributes.c b/src/data/attributes.c
index d99e945b014def2836ec1eb57ea33631fc5086d4..7fc546ee23771e7382232b88c92555289aa8df80 100644 (file)
--- a/src/data/attributes.c
+++ b/src/data/attributes.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,12 +16,15 @@
 
 #include <config.h>
 
-#include <data/attributes.h>
+#include "data/attributes.h"
+
 #include <assert.h>
 #include <string.h>
-#include <libpspp/array.h>
-#include <libpspp/hash-functions.h>
-#include "xalloc.h"
+
+#include "libpspp/array.h"
+#include "libpspp/hash-functions.h"
+
+#include "gl/xalloc.h"
 
 /* A custom attribute of the sort maintained by the DATAFILE
    ATTRIBUTE and VARIABLE ATTRIBUTE commands.

diff --git a/src/data/attributes.h b/src/data/attributes.h
index 87cb7726f8e01a2846299e5da069cba41bbaa244..61b68f116094c0451f704bd3785897a43099c6bd 100644 (file)
--- a/src/data/attributes.h
+++ b/src/data/attributes.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 #ifndef DATA_ATTRIBUTES_H
 #define DATA_ATTRIBUTES_H 1
 
-#include <libpspp/hmapx.h>
+#include "libpspp/hmapx.h"
 
 /* This header supports custom attribute of the sort maintained
    by the DATAFILE ATTRIBUTE and VARIABLE ATTRIBUTE commands.

diff --git a/src/data/calendar.c b/src/data/calendar.c
index ef6aa6755e4a922171fa863020091cf8094e5405..a2bb7e600004c6cd025c90e0c26641e12fe30ce0 100644 (file)
--- a/src/data/calendar.c
+++ b/src/data/calendar.c
@@ -1,9 +1,28 @@
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 2006, 2007, 2008, 2010, 2011 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
 #include <config.h>
-#include "calendar.h"
+
+#include "data/calendar.h"
+
 #include <assert.h>
 #include <stdbool.h>
-#include <data/settings.h>
-#include <data/val-type.h>
+
+#include "data/settings.h"
+#include "data/val-type.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/data/case-map.c b/src/data/case-map.c
index 49297d1349f5c50661e904408f6135684786e710..c54e6753fe74bab580984479e4573dabe9988c04 100644 (file)
--- a/src/data/case-map.c
+++ b/src/data/case-map.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,19 +16,19 @@
 
 #include <config.h>
 
-#include <data/case-map.h>
+#include "data/case-map.h"
 
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <data/casereader.h>
-#include <data/casewriter.h>
-#include <data/dictionary.h>
-#include <data/variable.h>
-#include <data/case.h>
-#include <libpspp/assertion.h>
+#include "data/casereader.h"
+#include "data/casewriter.h"
+#include "data/dictionary.h"
+#include "data/variable.h"
+#include "data/case.h"
+#include "libpspp/assertion.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 /* A case map. */
 struct case_map

diff --git a/src/data/case-matcher.c b/src/data/case-matcher.c
index 37cb4a60748a4b60e2416476a0ed629ff8f90620..46272bbed693011e14c4d324092932c40e053229 100644 (file)
--- a/src/data/case-matcher.c
+++ b/src/data/case-matcher.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,16 +16,16 @@
 
 #include <config.h>
 
-#include <data/case-matcher.h>
+#include "data/case-matcher.h"
 
 #include <stdlib.h>
 
-#include <data/case.h>
-#include <data/subcase.h>
-#include <data/value.h>
-#include <libpspp/assertion.h>
+#include "data/case.h"
+#include "data/subcase.h"
+#include "data/value.h"
+#include "libpspp/assertion.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 struct case_matcher_input
   {

diff --git a/src/data/case-tmpfile.c b/src/data/case-tmpfile.c
index 58e437ad1b45686000c0b320e028e0f0d8ad641a..907a926f9ece6281de146af02adbd880a5570d23 100644 (file)
--- a/src/data/case-tmpfile.c
+++ b/src/data/case-tmpfile.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,18 +16,18 @@
 
 #include <config.h>
 
-#include <data/case-tmpfile.h>
+#include "data/case-tmpfile.h"
 
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <libpspp/assertion.h>
-#include <libpspp/taint.h>
-#include <libpspp/ext-array.h>
+#include "libpspp/assertion.h"
+#include "libpspp/taint.h"
+#include "libpspp/ext-array.h"
 
-#include "error.h"
-#include "xalloc.h"
+#include "gl/error.h"
+#include "gl/xalloc.h"
 
 /* A temporary file that stores an array of cases. */
 struct case_tmpfile

diff --git a/src/data/case-tmpfile.h b/src/data/case-tmpfile.h
index bbf736e3d13080f365c2932e4d65294ef63d2549..3659e5805e1e8a73c9a17c381c8ae8e1eff10768 100644 (file)
--- a/src/data/case-tmpfile.h
+++ b/src/data/case-tmpfile.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@
 #ifndef DATA_CASE_TMPFILE_H
 #define DATA_CASE_TMPFILE_H 1
 
-#include <data/case.h>
+#include "data/case.h"
 
 struct caseproto;
 

diff --git a/src/data/case.c b/src/data/case.c
index ffb47fe809f5050cb7390b9fb59a5a62d08c2f39..bb6f7c0a8e05c735f9b17cd0aab309993e4d7a21 100644 (file)
--- a/src/data/case.c
+++ b/src/data/case.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,19 +16,19 @@
 
 #include <config.h>
 
-#include <data/case.h>
+#include "data/case.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdlib.h>
 
-#include <data/value.h>
-#include <data/variable.h>
-#include <libpspp/assertion.h>
-#include <libpspp/str.h>
+#include "data/value.h"
+#include "data/variable.h"
+#include "libpspp/assertion.h"
+#include "libpspp/str.h"
 
-#include "minmax.h"
-#include "xalloc.h"
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 
 /* Set this flag to 1 to copy cases instead of ref counting them.
    This is sometimes helpful in debugging situations. */

diff --git a/src/data/case.h b/src/data/case.h
index c07b07d2b9c4a062ae37a6452ec30cdcf03f8120..1f5e192f3d748ec0050f3d00c5f6006b156434e7 100644 (file)
--- a/src/data/case.h
+++ b/src/data/case.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,8 +21,9 @@
 #include <stddef.h>
 #include <stdbool.h>
 #include <stdlib.h>
-#include <libpspp/compiler.h>
-#include <data/caseproto.h>
+
+#include "libpspp/compiler.h"
+#include "data/caseproto.h"
 
 struct variable;
 

diff --git a/src/data/casegrouper.c b/src/data/casegrouper.c
index dee1488e9e297145f22782518dd16887315c389e..52238c8c610dff3593eaf6c82553f5e21d8215a7 100644 (file)
--- a/src/data/casegrouper.c
+++ b/src/data/casegrouper.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,17 +16,17 @@
 
 #include <config.h>
 
-#include <data/casegrouper.h>
+#include "data/casegrouper.h"
 
 #include <stdlib.h>
 
-#include <data/casereader.h>
-#include <data/casewriter.h>
-#include <data/dictionary.h>
-#include <data/subcase.h>
-#include <libpspp/taint.h>
+#include "data/casereader.h"
+#include "data/casewriter.h"
+#include "data/dictionary.h"
+#include "data/subcase.h"
+#include "libpspp/taint.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 /* A casegrouper. */
 struct casegrouper

diff --git a/src/data/caseinit.c b/src/data/caseinit.c
index 572f9160292e670f1a60ae99c226b2ad13b064de..69a0f01869fb7a66c97522d0a86243b9f523dfaf 100644 (file)
--- a/src/data/caseinit.c
+++ b/src/data/caseinit.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,21 +16,21 @@
 
 #include <config.h>
 
-#include <data/caseinit.h>
+#include "data/caseinit.h"
 
 #include <stdbool.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <data/case.h>
-#include <data/dictionary.h>
-#include <data/value.h>
-#include <data/variable.h>
-#include <libpspp/array.h>
-#include <libpspp/assertion.h>
-#include <libpspp/compiler.h>
+#include "data/case.h"
+#include "data/dictionary.h"
+#include "data/value.h"
+#include "data/variable.h"
+#include "libpspp/array.h"
+#include "libpspp/assertion.h"
+#include "libpspp/compiler.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 \f
 /* Initializer list: a set of values to write to locations within
    a case. */

diff --git a/src/data/caseproto.c b/src/data/caseproto.c
index 9837013acb8bee86cb6d30bf0876a706a05dbc71..d62af283de2945cc2139f980d8c4dea5a0a431b2 100644 (file)
--- a/src/data/caseproto.c
+++ b/src/data/caseproto.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,14 +16,15 @@
 
 #include <config.h>
 
-#include <data/caseproto.h>
-#include <data/val-type.h>
-#include <data/value.h>
-#include <libpspp/array.h>
-#include <libpspp/assertion.h>
-#include <libpspp/pool.h>
+#include "data/caseproto.h"
 
-#include "minmax.h"
+#include "data/val-type.h"
+#include "data/value.h"
+#include "libpspp/array.h"
+#include "libpspp/assertion.h"
+#include "libpspp/pool.h"
+
+#include "gl/minmax.h"
 
 static struct caseproto *caseproto_unshare (struct caseproto *);
 static bool try_init_long_strings (const struct caseproto *,

diff --git a/src/data/caseproto.h b/src/data/caseproto.h
index b0f45c418c47aae8017b0469a5307cff6b9cd7f6..0bc02812d18590aeb3ba4ca664445f8134d488bf 100644 (file)
--- a/src/data/caseproto.h
+++ b/src/data/caseproto.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,9 +21,10 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdlib.h>
-#include <data/value.h>
-#include <libpspp/cast.h>
-#include <libpspp/compiler.h>
+
+#include "data/value.h"
+#include "libpspp/cast.h"
+#include "libpspp/compiler.h"
 
 /* Case prototype.
 

diff --git a/src/data/casereader-filter.c b/src/data/casereader-filter.c
index da515c6dda4152f499a2acac3435c6fa944803ea..15fa4a5e6701605ec107fe43a599fab71d48f043 100644 (file)
--- a/src/data/casereader-filter.c
+++ b/src/data/casereader-filter.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,18 +16,18 @@
 
 #include <config.h>
 
-#include <data/casereader.h>
+#include "data/casereader.h"
 
 #include <stdlib.h>
 
-#include <data/casereader-provider.h>
-#include <data/casewriter.h>
-#include <data/variable.h>
-#include <data/dictionary.h>
-#include <libpspp/taint.h>
-#include <libpspp/message.h>
+#include "data/casereader-provider.h"
+#include "data/casewriter.h"
+#include "data/variable.h"
+#include "data/dictionary.h"
+#include "libpspp/taint.h"
+#include "libpspp/message.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/data/casereader-project.c b/src/data/casereader-project.c
index 116a3359b4408caf2a51912a45095ea3ffb5843d..d3d560f2088deaa734a512e5487e172aee92f4ad 100644 (file)
--- a/src/data/casereader-project.c
+++ b/src/data/casereader-project.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,8 +16,8 @@
 
 #include <config.h>
 
-#include <data/casereader-provider.h>
-#include <data/subcase.h>
+#include "data/casereader-provider.h"
+#include "data/subcase.h"
 
 #include "gl/xalloc.h"
 

diff --git a/src/data/casereader-provider.h b/src/data/casereader-provider.h
index b8d53500504fb2c2595e894b9baf944a8651d0b7..f22cf4accff7b8063b9d812e39f077ea8e206533 100644 (file)
--- a/src/data/casereader-provider.h
+++ b/src/data/casereader-provider.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@
 #ifndef DATA_CASEREADER_PROVIDER_H
 #define DATA_CASEREADER_PROVIDER_H 1
 
-#include <data/casereader.h>
+#include "data/casereader.h"
 
 /* Casereader class for sequential data sources. */
 struct casereader_class

diff --git a/src/data/casereader-select.c b/src/data/casereader-select.c
index d75a605b01349eef258f0fdbe9d04994553e68bc..26accb4107a1074fc7273b74ad9c3b0edae27e2f 100644 (file)
--- a/src/data/casereader-select.c
+++ b/src/data/casereader-select.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 #include <config.h>
 
-#include <data/casereader-provider.h>
+#include "data/casereader-provider.h"
 
 #include "gl/xalloc.h"
 

diff --git a/src/data/casereader-translator.c b/src/data/casereader-translator.c
index fc823049d570df34863291ab4b0650f2cba6d26b..062184691defe569321351b5f1304709fcfb2273 100644 (file)
--- a/src/data/casereader-translator.c
+++ b/src/data/casereader-translator.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,15 +15,16 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include <data/val-type.h>
-#include <data/casereader.h>
+
 #include <stdlib.h>
 
-#include <data/variable.h>
-#include <data/casereader-provider.h>
-#include <libpspp/taint.h>
+#include "data/casereader-provider.h"
+#include "data/casereader.h"
+#include "data/val-type.h"
+#include "data/variable.h"
+#include "libpspp/taint.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 /* Casereader that applies a user-supplied function to translate
    each case into another in an arbitrary fashion. */

diff --git a/src/data/casereader.h b/src/data/casereader.h
index a2e789ae6f777c8fc3688c3dc9110180434f75f0..8f80c30ca0799033499b0f71a9716065fb9f0908 100644 (file)
--- a/src/data/casereader.h
+++ b/src/data/casereader.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -51,9 +51,9 @@
 #ifndef DATA_CASEREADER_H
 #define DATA_CASEREADER_H 1
 
-#include <libpspp/compiler.h>
-#include <data/case.h>
-#include <data/missing-values.h>
+#include "libpspp/compiler.h"
+#include "data/case.h"
+#include "data/missing-values.h"
 
 struct dictionary;
 struct casereader;

diff --git a/src/data/casewindow.c b/src/data/casewindow.c
index 936b6aa940051be14a422fde8a8773f22388eeb7..804a58aa517cbb344fb5a8f56b9616da5e5168b4 100644 (file)
--- a/src/data/casewindow.c
+++ b/src/data/casewindow.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,17 +20,17 @@
 
 #include <config.h>
 
-#include <data/casewindow.h>
+#include "data/casewindow.h"
 
 #include <stdlib.h>
 
-#include <data/case-tmpfile.h>
-#include <libpspp/assertion.h>
-#include <libpspp/compiler.h>
-#include <libpspp/deque.h>
-#include <libpspp/taint.h>
+#include "data/case-tmpfile.h"
+#include "libpspp/assertion.h"
+#include "libpspp/compiler.h"
+#include "libpspp/deque.h"
+#include "libpspp/taint.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 /* A queue of cases. */
 struct casewindow

diff --git a/src/data/casewindow.h b/src/data/casewindow.h
index b303c85dab5b53d99391a2698901a83065ea0a54..c7a863eaa89544f5ebf89f3e1b333530b8c75574 100644 (file)
--- a/src/data/casewindow.h
+++ b/src/data/casewindow.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 #ifndef DATA_CASEWINDOW_H
 #define DATA_CASEWINDOW_H 1
 
-#include <data/case.h>
+#include "data/case.h"
 
 struct caseproto;
 

diff --git a/src/data/casewriter-provider.h b/src/data/casewriter-provider.h
index 7231a1f3bbfc1af5580547ae723090f03035f098..822edfd0da59ee284bb57f70c0f8613c81eca0b4 100644 (file)
--- a/src/data/casewriter-provider.h
+++ b/src/data/casewriter-provider.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 #ifndef DATA_CASEWRITER_PROVIDER_H
 #define DATA_CASEWRITER_PROVIDER_H 1
 
-#include <data/casewriter.h>
+#include "data/casewriter.h"
 
 struct casewriter_class
   {

diff --git a/src/data/casewriter-translator.c b/src/data/casewriter-translator.c
index e80b9d68187b3f65e33b35051b0b6d891ca5f312..c750c7c73b21f69cdfd852bebfb4b7d3de39d40e 100644 (file)
--- a/src/data/casewriter-translator.c
+++ b/src/data/casewriter-translator.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,14 +16,14 @@
 
 #include <config.h>
 
-#include <data/casewriter.h>
-#include <data/casewriter-provider.h>
+#include "data/casewriter.h"
+#include "data/casewriter-provider.h"
 
 #include <stdlib.h>
 
-#include <libpspp/taint.h>
+#include "libpspp/taint.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 struct casewriter_translator
   {

diff --git a/src/data/casewriter.c b/src/data/casewriter.c
index 7631d776d3d2ac59cf336eccde48446aa8832b80..6029fc0dbe561fae7db8870559a260da072146cc 100644 (file)
--- a/src/data/casewriter.c
+++ b/src/data/casewriter.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,21 +16,21 @@
 
 #include <config.h>
 
-#include <data/casewriter.h>
-#include <data/casewriter-provider.h>
+#include "data/casewriter.h"
+#include "data/casewriter-provider.h"
 
 #include <assert.h>
 #include <stdlib.h>
 
-#include <data/casereader.h>
-#include <data/casereader-provider.h>
-#include <data/casewindow.h>
-#include <data/settings.h>
-#include <libpspp/assertion.h>
-#include <libpspp/compiler.h>
-#include <libpspp/taint.h>
+#include "data/casereader.h"
+#include "data/casereader-provider.h"
+#include "data/casewindow.h"
+#include "data/settings.h"
+#include "libpspp/assertion.h"
+#include "libpspp/compiler.h"
+#include "libpspp/taint.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 /* A casewriter. */
 struct casewriter

diff --git a/src/data/casewriter.h b/src/data/casewriter.h
index 146cc654608f754e2f7178c9738c477c7644627b..ffe7798a8f15d67267c5363ee15b80c4f62b227a 100644 (file)
--- a/src/data/casewriter.h
+++ b/src/data/casewriter.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,8 +18,8 @@
 #define DATA_CASEWRITER_H 1
 
 #include <stdbool.h>
-#include <data/transformations.h>
-#include <libpspp/compiler.h>
+#include "data/transformations.h"
+#include "libpspp/compiler.h"
 
 struct casewriter;
 

diff --git a/src/data/data-out.c b/src/data/data-out.c
index 96bf58bd6238c6ab34d3dfee5317eab4b52ec9d9..df447a6a12cac594c38937725030767c44d7999e 100644 (file)
--- a/src/data/data-out.c
+++ b/src/data/data-out.c
@@ -16,7 +16,7 @@
 
 #include <config.h>
 
-#include "data-out.h"
+#include "data/data-out.h"
 
 #include <ctype.h>
 #include <float.h>
@@ -26,22 +26,21 @@
 #include <time.h>
 #include <unistr.h>
 
-#include <data/calendar.h>
-#include <data/format.h>
-#include <data/settings.h>
-#include <data/value.h>
-
-#include <libpspp/assertion.h>
-#include <libpspp/cast.h>
-#include <libpspp/float-format.h>
-#include <libpspp/integer-format.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <libpspp/str.h>
-#include <libpspp/pool.h>
-#include <libpspp/i18n.h>
-
-#include "minmax.h"
+#include "data/calendar.h"
+#include "data/format.h"
+#include "data/settings.h"
+#include "data/value.h"
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "libpspp/float-format.h"
+#include "libpspp/i18n.h"
+#include "libpspp/integer-format.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/pool.h"
+#include "libpspp/str.h"
+
+#include "gl/minmax.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/data/data-out.h b/src/data/data-out.h
index 00affb0a3f15f1db99819f92be1ed61dcb620acc..7dff441289c76e6b155719d230f1e776762499e0 100644 (file)
--- a/src/data/data-out.h
+++ b/src/data/data-out.h
@@ -18,8 +18,8 @@
 #define DATA_OUT_H 1
 
 #include <stdbool.h>
-#include <libpspp/float-format.h>
-#include <libpspp/integer-format.h>
+#include "libpspp/float-format.h"
+#include "libpspp/integer-format.h"
 
 struct fmt_spec;
 struct string;

diff --git a/src/data/datasheet.c b/src/data/datasheet.c
index de59e73fe842f4fa94009d24b626cc9157464306..ad8333256c0bd2732692d107910c85ae2ef8fb6d 100644 (file)
--- a/src/data/datasheet.c
+++ b/src/data/datasheet.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,28 +16,28 @@
 
 #include <config.h>
 
-#include <data/datasheet.h>
+#include "data/datasheet.h"
 
 #include <stdlib.h>
 #include <string.h>
 
-#include <data/casereader-provider.h>
-#include <data/casereader.h>
-#include <data/casewriter.h>
-#include <data/lazy-casereader.h>
-#include <data/settings.h>
-#include <libpspp/array.h>
-#include <libpspp/assertion.h>
-#include <libpspp/misc.h>
-#include <libpspp/range-map.h>
-#include <libpspp/range-set.h>
-#include <libpspp/sparse-xarray.h>
-#include <libpspp/taint.h>
-#include <libpspp/tower.h>
-
-#include "minmax.h"
-#include "md4.h"
-#include "xalloc.h"
+#include "data/casereader-provider.h"
+#include "data/casereader.h"
+#include "data/casewriter.h"
+#include "data/lazy-casereader.h"
+#include "data/settings.h"
+#include "libpspp/array.h"
+#include "libpspp/assertion.h"
+#include "libpspp/misc.h"
+#include "libpspp/range-map.h"
+#include "libpspp/range-set.h"
+#include "libpspp/sparse-xarray.h"
+#include "libpspp/taint.h"
+#include "libpspp/tower.h"
+
+#include "gl/minmax.h"
+#include "gl/md4.h"
+#include "gl/xalloc.h"
 
 struct column;
 

diff --git a/src/data/datasheet.h b/src/data/datasheet.h
index 0508896ae9e30876be39c4e749aabe50d4e572ee..ab6c28d80af56697d18151ac7884106487b7ebfb 100644 (file)
--- a/src/data/datasheet.h
+++ b/src/data/datasheet.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,8 +17,8 @@
 #ifndef DATA_DATASHEET_H
 #define DATA_DATASHEET_H 1
 
-#include <data/case.h>
-#include <data/value.h>
+#include "data/case.h"
+#include "data/value.h"
 
 struct caseproto;
 struct casereader;

diff --git a/src/data/dict-class.c b/src/data/dict-class.c
index c79b29a28fb387d0bea1ed6024240c7785abe4f1..5f0d036f1b0d5b8543eb86213c645135544655ad 100644 (file)
--- a/src/data/dict-class.c
+++ b/src/data/dict-class.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,9 +16,9 @@
 
 #include <config.h>
 
-#include <data/dict-class.h>
+#include "data/dict-class.h"
 
-#include <libpspp/assertion.h>
+#include "libpspp/assertion.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/data/dictionary.h b/src/data/dictionary.h
index 3455a74f9677dcbb7be4ae50ff8e3844c9963b7b..dd220e4de15d5475fe2fb3dca58ae7f069c22b96 100644 (file)
--- a/src/data/dictionary.h
+++ b/src/data/dictionary.h
@@ -19,8 +19,8 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include <data/case.h>
-#include <data/dict-class.h>
+#include "data/case.h"
+#include "data/dict-class.h"
 
 struct string;
 struct ccase;

diff --git a/src/data/file-handle-def.c b/src/data/file-handle-def.c
index 2d69e2586d256a320ac1f47a1fb230669d45281b..d411d6917d0ef73d9fc04c1875ebe942f72fa3f8 100644 (file)
--- a/src/data/file-handle-def.c
+++ b/src/data/file-handle-def.c
@@ -16,25 +16,25 @@
 
 #include <config.h>
 
-#include "file-handle-def.h"
+#include "data/file-handle-def.h"
 
 #include <assert.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <libpspp/compiler.h>
-#include <libpspp/hmap.h>
-#include <libpspp/i18n.h>
-#include <libpspp/ll.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
-#include <libpspp/hash-functions.h>
-#include <data/file-name.h>
-#include <data/variable.h>
-#include <data/scratch-handle.h>
-
-#include "xalloc.h"
+#include "libpspp/compiler.h"
+#include "libpspp/hmap.h"
+#include "libpspp/i18n.h"
+#include "libpspp/ll.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+#include "libpspp/hash-functions.h"
+#include "data/file-name.h"
+#include "data/variable.h"
+#include "data/scratch-handle.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/data/format-guesser.c b/src/data/format-guesser.c
index bdf46a0671fccc5f9dd8a06ac61247229d225edc..17c5da90ceb8b2f74012889a3bcd036a798ef799 100644 (file)
--- a/src/data/format-guesser.c
+++ b/src/data/format-guesser.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2008, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,19 +16,19 @@
 
 #include <config.h>
 
-#include "format-guesser.h"
+#include "data/format-guesser.h"
 
 #include <stdlib.h>
 #include <string.h>
 
-#include "c-ctype.h"
-#include "minmax.h"
-#include "xalloc.h"
+#include "data/format.h"
+#include "data/settings.h"
+#include "libpspp/assertion.h"
+#include "libpspp/str.h"
 
-#include <data/format.h>
-#include <data/settings.h>
-#include <libpspp/assertion.h>
-#include <libpspp/str.h>
+#include "gl/c-ctype.h"
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 
 /* A token in which potential date or time fields are broken.
 

diff --git a/src/data/format-guesser.h b/src/data/format-guesser.h
index 23249f6a85c10f261e04a6efd20551c926357e9d..395da5771e82ce086af5b14f63437aabe8b44fe6 100644 (file)
--- a/src/data/format-guesser.h
+++ b/src/data/format-guesser.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,7 +17,8 @@
 #ifndef FORMAT_GUESSER_H
 #define FORMAT_GUESSER_H 1
 
-#include <libpspp/str.h>
+#include "libpspp/str.h"
+
 struct fmt_spec;
 
 struct fmt_guesser *fmt_guesser_create (void);

diff --git a/src/data/format.h b/src/data/format.h
index 7df374453def01b5392c2149c57bb203f2723d0e..481ac87fd2894119f6e184b74c4b8c87686dbf93 100644 (file)
--- a/src/data/format.h
+++ b/src/data/format.h
@@ -20,8 +20,8 @@
 /* Display format types. */
 
 #include <stdbool.h>
-#include <libpspp/str.h>
-#include <data/val-type.h>
+#include "data/val-type.h"
+#include "libpspp/str.h"
 
 /* Format type categories.
 

diff --git a/src/data/gnumeric-reader.c b/src/data/gnumeric-reader.c
index 9772d82af576f36af9219c06ee15d2e196f93529..6392f9b805d620ccbea4bf139bbbfc3c0cf3aac9 100644 (file)
--- a/src/data/gnumeric-reader.c
+++ b/src/data/gnumeric-reader.c
@@ -18,10 +18,10 @@
 
 #include <config.h>
 
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
 
-#include "minmax.h"
+#include "gl/minmax.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -40,26 +40,24 @@ gnumeric_open_reader (struct gnumeric_read_info *gri, struct dictionary **dict)
 
 #else
 
+#include "data/gnumeric-reader.h"
+
 #include <assert.h>
 #include <stdbool.h>
 #include <errno.h>
-
-#include <xalloc.h>
-
 #include <libxml/xmlreader.h>
 #include <zlib.h>
 
-#include <data/case.h>
-#include <data/casereader-provider.h>
-#include <data/dictionary.h>
-#include <data/identifier.h>
-#include <data/variable.h>
-#include <data/value.h>
-
-#include <libpspp/i18n.h>
-#include <libpspp/str.h>
+#include "data/case.h"
+#include "data/casereader-provider.h"
+#include "data/dictionary.h"
+#include "data/identifier.h"
+#include "data/value.h"
+#include "data/variable.h"
+#include "libpspp/i18n.h"
+#include "libpspp/str.h"
 
-#include "gnumeric-reader.h"
+#include "gl/xalloc.h"
 
 /* Default width of string variables. */
 #define GNUMERIC_DEFAULT_WIDTH 8

diff --git a/src/data/lazy-casereader.c b/src/data/lazy-casereader.c
index 44897d165a3537fa69d9cdaf7c3418e24031bfab..bc68b938d5b0169ad0278a8ca760060c5e2c931a 100644 (file)
--- a/src/data/lazy-casereader.c
+++ b/src/data/lazy-casereader.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,16 +16,16 @@
 
 #include <config.h>
 
-#include <data/lazy-casereader.h>
+#include "data/lazy-casereader.h"
 
 #include <stdlib.h>
 
-#include <data/case.h>
-#include <data/casereader.h>
-#include <data/casereader-provider.h>
-#include <libpspp/assertion.h>
+#include "data/case.h"
+#include "data/casereader.h"
+#include "data/casereader-provider.h"
+#include "libpspp/assertion.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 /* A lazy casereader's auxiliary data. */
 struct lazy_casereader

diff --git a/src/data/lazy-casereader.h b/src/data/lazy-casereader.h
index 561d98eb943e0ff50fca1600957eb2a646bc5045..ed0e37b4f92e5c4ea673329cca7535a8081f7df5 100644 (file)
--- a/src/data/lazy-casereader.h
+++ b/src/data/lazy-casereader.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
 #define DATA_LAZY_CASEREADER_H 1
 
 #include <stdbool.h>
-#include <data/case.h>
+#include "data/case.h"
 
 struct casereader *lazy_casereader_create (const struct caseproto *,
                                            casenumber case_cnt,

diff --git a/src/data/missing-values.c b/src/data/missing-values.c
index 61bb9bcb13c4968a4500fc4fc98ee13e2f631c1b..0fc9d01af01ae5a7842aebf3a8285217485de3ca 100644 (file)
--- a/src/data/missing-values.c
+++ b/src/data/missing-values.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2005, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,12 +15,15 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include <data/missing-values.h>
+
+#include "data/missing-values.h"
+
 #include <assert.h>
 #include <stdlib.h>
-#include <data/variable.h>
-#include <libpspp/assertion.h>
-#include <libpspp/str.h>
+
+#include "data/variable.h"
+#include "libpspp/assertion.h"
+#include "libpspp/str.h"
 
 /* Types of user-missing values.
    Invisible--use access functions defined below instead. */

diff --git a/src/data/por-file-reader.c b/src/data/por-file-reader.c
index bee1008ee36b939ba7c719e0be5e66fb32b37ec1..3f8ee3c9fee47601c651850ba2ce6e3195028da0 100644 (file)
--- a/src/data/por-file-reader.c
+++ b/src/data/por-file-reader.c
@@ -15,7 +15,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include "por-file-reader.h"
+
+#include "data/por-file-reader.h"
 
 #include <ctype.h>
 #include <errno.h>
@@ -26,21 +27,21 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <data/casereader-provider.h>
-#include <data/casereader.h>
-#include <data/dictionary.h>
-#include <data/file-handle-def.h>
-#include <data/file-name.h>
-#include <data/format.h>
-#include <data/missing-values.h>
-#include <data/short-names.h>
-#include <data/value-labels.h>
-#include <data/variable.h>
-#include <libpspp/compiler.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <libpspp/pool.h>
-#include <libpspp/str.h>
+#include "data/casereader-provider.h"
+#include "data/casereader.h"
+#include "data/dictionary.h"
+#include "data/file-handle-def.h"
+#include "data/file-name.h"
+#include "data/format.h"
+#include "data/missing-values.h"
+#include "data/short-names.h"
+#include "data/value-labels.h"
+#include "data/variable.h"
+#include "libpspp/compiler.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/pool.h"
+#include "libpspp/str.h"
 
 #include "gl/intprops.h"
 #include "gl/minmax.h"

diff --git a/src/data/por-file-writer.c b/src/data/por-file-writer.c
index c5f758a1e5db1a1a16545fdd7cd35cf86e2f322c..ee84e7c9c29aec8c44096d70aa64b790c21e5d6c 100644 (file)
--- a/src/data/por-file-writer.c
+++ b/src/data/por-file-writer.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,7 +15,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include "por-file-writer.h"
+
+#include "data/por-file-writer.h"
 
 #include <ctype.h>
 #include <errno.h>
@@ -26,26 +27,25 @@
 #include <sys/stat.h>
 #include <time.h>
 
-#include <data/case.h>
-#include <data/casewriter-provider.h>
-#include <data/casewriter.h>
-#include <data/dictionary.h>
-#include <data/file-handle-def.h>
-#include <data/file-name.h>
-#include <data/format.h>
-#include <data/make-file.h>
-#include <data/missing-values.h>
-#include <data/short-names.h>
-#include <data/value-labels.h>
-#include <data/variable.h>
-
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <libpspp/str.h>
-#include <libpspp/version.h>
-
-#include "minmax.h"
-#include "xalloc.h"
+#include "data/case.h"
+#include "data/casewriter-provider.h"
+#include "data/casewriter.h"
+#include "data/dictionary.h"
+#include "data/file-handle-def.h"
+#include "data/file-name.h"
+#include "data/format.h"
+#include "data/make-file.h"
+#include "data/missing-values.h"
+#include "data/short-names.h"
+#include "data/value-labels.h"
+#include "data/variable.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
+#include "libpspp/version.h"
+
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/data/procedure.h b/src/data/procedure.h
index bb4dad2b14ac91528c13be0e5455c6bcf7e1f362..fd3af6042140fee4bdfd30740e944a3d5db8adb3 100644 (file)
--- a/src/data/procedure.h
+++ b/src/data/procedure.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,8 +20,8 @@
 #include <time.h>
 #include <stdbool.h>
 
-#include <data/transformations.h>
-#include <libpspp/compiler.h>
+#include "data/transformations.h"
+#include "libpspp/compiler.h"
 
 struct casereader;
 struct dataset;

diff --git a/src/data/psql-reader.c b/src/data/psql-reader.c
index 378a56affbb45f66fd04a889fcc8c53d5fc66941..346d214ad31e6d43050dccba941979390cb5cf33 100644 (file)
--- a/src/data/psql-reader.c
+++ b/src/data/psql-reader.c
@@ -16,23 +16,23 @@
 
 #include <config.h>
 
-#include <data/casereader-provider.h>
-#include <libpspp/message.h>
-#include <gl/xalloc.h>
-#include <data/dictionary.h>
-#include <math.h>
-#include <stdlib.h>
-
-#include "psql-reader.h"
-#include "variable.h"
-#include "format.h"
-#include "calendar.h"
+#include "data/psql-reader.h"
 
 #include <inttypes.h>
-#include <libpspp/misc.h>
-#include <libpspp/str.h>
+#include <math.h>
+#include <stdlib.h>
 
-#include "minmax.h"
+#include "data/calendar.h"
+#include "data/casereader-provider.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/variable.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
+
+#include "gl/xalloc.h"
+#include "gl/minmax.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/data/psql-reader.h b/src/data/psql-reader.h
index 2811daa5f7bcacab52e7520a7fb8901b3eb66253..8fd584c60cdb7cbf7ad1695bf3d6de5e21b1fc6e 100644 (file)
--- a/src/data/psql-reader.h
+++ b/src/data/psql-reader.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 #define PSQL_READER_H 1
 
 #include <stdbool.h>
-#include <libpspp/str.h>
+#include "libpspp/str.h"
 
 struct casereader;
 

diff --git a/src/data/scratch-handle.c b/src/data/scratch-handle.c
index 66819369c162d9a8b857d9bfb7cd78f0e12380c9..a95f2cc29d168775005fbcccf56a51a9223e14e0 100644 (file)
--- a/src/data/scratch-handle.c
+++ b/src/data/scratch-handle.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,10 +15,13 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
+
+#include "data/scratch-handle.h"
+
 #include <stdlib.h>
-#include <data/casereader.h>
-#include <data/scratch-handle.h>
-#include <data/dictionary.h>
+
+#include "data/casereader.h"
+#include "data/dictionary.h"
 
 /* Destroys HANDLE. */
 void

diff --git a/src/data/scratch-reader.c b/src/data/scratch-reader.c
index 3aa1768d562e1b7bac6441d86981c3b1bdbc1fdf..5def728ed84ea52c109a154246373c912db03c68 100644 (file)
--- a/src/data/scratch-reader.c
+++ b/src/data/scratch-reader.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,19 +16,19 @@
 
 #include <config.h>
 
-#include <data/scratch-reader.h>
+#include "data/scratch-reader.h"
 
 #include <stdlib.h>
 
-#include <data/case.h>
-#include <data/casereader.h>
-#include <data/dictionary.h>
-#include <data/file-handle-def.h>
-#include <data/scratch-handle.h>
-#include <libpspp/assertion.h>
-#include <libpspp/message.h>
+#include "data/case.h"
+#include "data/casereader.h"
+#include "data/dictionary.h"
+#include "data/file-handle-def.h"
+#include "data/scratch-handle.h"
+#include "libpspp/assertion.h"
+#include "libpspp/message.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/data/scratch-writer.c b/src/data/scratch-writer.c
index 631305fe9d96c6a668c33473780867930f88d3a4..2c545c7d01a7520f2bc668759abbff19a495f5a1 100644 (file)
--- a/src/data/scratch-writer.c
+++ b/src/data/scratch-writer.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,23 +16,23 @@
 
 #include <config.h>
 
-#include "scratch-writer.h"
+#include "data/scratch-writer.h"
 
 #include <stdlib.h>
 
-#include <data/case.h>
-#include <data/case-map.h>
-#include <data/casereader.h>
-#include <data/casewriter-provider.h>
-#include <data/casewriter.h>
-#include <data/dictionary.h>
-#include <data/file-handle-def.h>
-#include <data/scratch-handle.h>
-#include <data/variable.h>
-#include <libpspp/compiler.h>
-#include <libpspp/taint.h>
-
-#include "xalloc.h"
+#include "data/case.h"
+#include "data/case-map.h"
+#include "data/casereader.h"
+#include "data/casewriter-provider.h"
+#include "data/casewriter.h"
+#include "data/dictionary.h"
+#include "data/file-handle-def.h"
+#include "data/scratch-handle.h"
+#include "data/variable.h"
+#include "libpspp/compiler.h"
+#include "libpspp/taint.h"
+
+#include "gl/xalloc.h"
 
 #define N_(msgid) (msgid)
 

diff --git a/src/data/subcase.c b/src/data/subcase.c
index 32056215e4ace37d4fcd9b544c3e48c493d82dec..f87093cd18413cbf97351ffdac019e807db33191 100644 (file)
--- a/src/data/subcase.c
+++ b/src/data/subcase.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,13 +15,16 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include <data/subcase.h>
+
+#include "data/subcase.h"
+
 #include <stdlib.h>
-#include <data/case.h>
-#include <data/variable.h>
-#include <libpspp/assertion.h>
 
-#include "xalloc.h"
+#include "data/case.h"
+#include "data/variable.h"
+#include "libpspp/assertion.h"
+
+#include "gl/xalloc.h"
 
 static void invalidate_proto (struct subcase *sc);
 

diff --git a/src/data/sys-file-reader.h b/src/data/sys-file-reader.h
index 242857494ee365af5238936bdd8c7e2027c30c0a..749565165ff5259f8ca741eafa19c66d9995ab47 100644 (file)
--- a/src/data/sys-file-reader.h
+++ b/src/data/sys-file-reader.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,9 +20,9 @@
 #include <stdbool.h>
 #include <stdio.h>
 
-#include <data/case.h>
-#include <libpspp/float-format.h>
-#include <libpspp/integer-format.h>
+#include "data/case.h"
+#include "libpspp/float-format.h"
+#include "libpspp/integer-format.h"
 
 /* Reading system files. */
 

diff --git a/src/data/transformations.c b/src/data/transformations.c
index 2a73cade41bbcf6e4c55622c5d00b9d8b18505b6..8321cf5d4eba5ef2e9674bb6cd9ada6977311141 100644 (file)
--- a/src/data/transformations.c
+++ b/src/data/transformations.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,14 +16,14 @@
 
 #include <config.h>
 
-#include <data/transformations.h>
+#include "data/transformations.h"
 
 #include <assert.h>
 #include <stdlib.h>
 
-#include <libpspp/str.h>
+#include "libpspp/str.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 /* A single transformation. */
 struct transformation

diff --git a/src/data/transformations.h b/src/data/transformations.h
index 59001f1139da18a544775337b9921baa435b7e6c..013bcaa731e8e29adedaad8eb04d75b46e3e37e4 100644 (file)
--- a/src/data/transformations.h
+++ b/src/data/transformations.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include <data/case.h>
+#include "data/case.h"
 
 /* trns_proc_func return values. */
 enum trns_result

diff --git a/src/data/val-type.h b/src/data/val-type.h
index 27139af9a88feed090bf58440f3d520d28e00703..8aaa06a0d92e95fc90acbafe0dc140122c281a4c 100644 (file)
--- a/src/data/val-type.h
+++ b/src/data/val-type.h
@@ -1,5 +1,5 @@
 /* PSPP - computes sample statistics.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2011 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License as
@@ -21,7 +21,7 @@
 
 #include <float.h>
 #include <stdbool.h>
-#include <libpspp/float-format.h>
+#include "libpspp/float-format.h"
 
 /* Special numeric values. */
 #define SYSMIS (-DBL_MAX)               /* System-missing value. */

diff --git a/src/data/value-labels.c b/src/data/value-labels.c
index b1c0dc7ae2682c9fec73dd2d322fea651e251002..6d8f517510c59f62f7b29b852f4dd1107e01da45 100644 (file)
--- a/src/data/value-labels.c
+++ b/src/data/value-labels.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,23 +16,23 @@
 
 #include <config.h>
 
-#include "value-labels.h"
+#include "data/value-labels.h"
 
 #include <stdlib.h>
 
-#include <data/data-out.h>
-#include <data/value.h>
-#include <data/variable.h>
-#include <libpspp/array.h>
-#include <libpspp/cast.h>
-#include <libpspp/compiler.h>
-#include <libpspp/hash-functions.h>
-#include <libpspp/hmap.h>
-#include <libpspp/intern.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
+#include "data/data-out.h"
+#include "data/value.h"
+#include "data/variable.h"
+#include "libpspp/array.h"
+#include "libpspp/cast.h"
+#include "libpspp/compiler.h"
+#include "libpspp/hash-functions.h"
+#include "libpspp/hmap.h"
+#include "libpspp/intern.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 /* Creates and returns a new, empty set of value labels with the
    given WIDTH. */

diff --git a/src/data/value-labels.h b/src/data/value-labels.h
index d6f65d43c334d3b8657993af922cc26673cfe4a6..6cb5259edb2fe22a28b53b49bba4a8e2e9fb1b1c 100644 (file)
--- a/src/data/value-labels.h
+++ b/src/data/value-labels.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -27,8 +27,8 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include <data/value.h>
-#include <libpspp/hmap.h>
+#include "data/value.h"
+#include "libpspp/hmap.h"
 
 /* One value label.
 

diff --git a/src/data/value.c b/src/data/value.c
index 65b250e085f40c1a791735bbb6273c2df7f664ff..144f39b5241d1fb7b8b36021e57c23cea65a22ae 100644 (file)
--- a/src/data/value.c
+++ b/src/data/value.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,17 +15,18 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include <data/value.h>
 
-#include <data/val-type.h>
-#include <data/variable.h>
-#include <libpspp/hash-functions.h>
-#include <libpspp/pool.h>
-#include <libpspp/str.h>
-#include <gl/unistr.h>
+#include "data/value.h"
 
-#include "minmax.h"
-#include "xalloc.h"
+#include "data/val-type.h"
+#include "data/variable.h"
+#include "libpspp/hash-functions.h"
+#include "libpspp/pool.h"
+#include "libpspp/str.h"
+#include "gl/unistr.h"
+
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 
 /* Copies the contents of string value SRC with width SRC_WIDTH
    to string value DST with width DST_WIDTH.  If SRC_WIDTH is

diff --git a/src/data/variable.c b/src/data/variable.c
index cd8d498d1fe226ac936b2dc71d0c0d2102c499b1..2ceeb0d0e9610a6396d58246db942ed8c0302ac1 100644 (file)
--- a/src/data/variable.c
+++ b/src/data/variable.c
@@ -15,28 +15,28 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include "variable.h"
+
+#include "data/variable.h"
 
 #include <stdlib.h>
 
-#include <data/attributes.h>
-#include <data/data-out.h>
-#include <data/format.h>
-#include <data/dictionary.h>
-#include <data/identifier.h>
-#include <data/missing-values.h>
-#include <data/value-labels.h>
-#include <data/vardict.h>
-
-#include <libpspp/misc.h>
-#include <libpspp/assertion.h>
-#include <libpspp/compiler.h>
-#include <libpspp/hash-functions.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
-
-#include "minmax.h"
-#include "xalloc.h"
+#include "data/attributes.h"
+#include "data/data-out.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/identifier.h"
+#include "data/missing-values.h"
+#include "data/value-labels.h"
+#include "data/vardict.h"
+#include "libpspp/assertion.h"
+#include "libpspp/compiler.h"
+#include "libpspp/hash-functions.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
+
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/data/variable.h b/src/data/variable.h
index 524a6be2be0d73c60b376aeb510079f0ad512ea3..03257502a9b28437f802b61d28e74f24cd23f360 100644 (file)
--- a/src/data/variable.h
+++ b/src/data/variable.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,9 +19,9 @@
 
 #include <stddef.h>
 #include <stdbool.h>
-#include <data/dict-class.h>
-#include <data/missing-values.h>
-#include <data/val-type.h>
+#include "data/dict-class.h"
+#include "data/missing-values.h"
+#include "data/val-type.h"
 
 union value;
 

diff --git a/src/data/vector.h b/src/data/vector.h
index b009fcb2922f3ac4c7a67422e2089cef1311c5bf..fc2bf9518d25bfb271095a2ba4935de4c9ccd1c3 100644 (file)
--- a/src/data/vector.h
+++ b/src/data/vector.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006  Free Software Foundation, Inc.
+   Copyright (C) 2006, 2011  Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 #define DATA_VECTOR_H 1
 
 #include <stddef.h>
-#include <data/variable.h>
+#include "data/variable.h"
 
 struct dictionary;
 

diff --git a/src/language/control/control-stack.c b/src/language/control/control-stack.c
index 8456f819f53eaa13e0d77bda090883527aad3d03..f806c7803a5e01c7962ea5e1706f85329182e37b 100644 (file)
--- a/src/language/control/control-stack.c
+++ b/src/language/control/control-stack.c
@@ -1,10 +1,14 @@
 #include <config.h>
-#include "control-stack.h"
+
+#include "language/control/control-stack.h"
+
 #include <assert.h>
 #include <stdlib.h>
-#include <libpspp/compiler.h>
-#include <libpspp/message.h>
-#include "xalloc.h"
+
+#include "libpspp/compiler.h"
+#include "libpspp/message.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/control/do-if.c b/src/language/control/do-if.c
index b3b6135f6ec4336e26a30e71da855d25c41d1e4f..a80dae31c9811936ea24908901c4518d5b9bebba 100644 (file)
--- a/src/language/control/do-if.c
+++ b/src/language/control/do-if.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,19 +18,19 @@
 
 #include <stdlib.h>
 
-#include "control-stack.h"
-#include <data/case.h>
-#include <data/procedure.h>
-#include <data/transformations.h>
-#include <data/value.h>
-#include <language/command.h>
-#include <language/expressions/public.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/compiler.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
-
-#include "xalloc.h"
+#include "data/case.h"
+#include "data/procedure.h"
+#include "data/transformations.h"
+#include "data/value.h"
+#include "language/command.h"
+#include "language/control/control-stack.h"
+#include "language/expressions/public.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/compiler.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/control/loop.c b/src/language/control/loop.c
index 5e99232fc751d4115565973bc40f06aef0156c75..362f199327e00c33826d90976dd746a33ee90c9e 100644 (file)
--- a/src/language/control/loop.c
+++ b/src/language/control/loop.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,24 +16,24 @@
 
 #include <config.h>
 
-#include "control-stack.h"
-
-#include <data/case.h>
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/settings.h>
-#include <data/transformations.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/expressions/public.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/compiler.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <libpspp/pool.h>
-#include <libpspp/str.h>
-
-#include "xalloc.h"
+#include "language/control/control-stack.h"
+
+#include "data/case.h"
+#include "data/dictionary.h"
+#include "data/procedure.h"
+#include "data/settings.h"
+#include "data/transformations.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/expressions/public.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/compiler.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/pool.h"
+#include "libpspp/str.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/control/repeat.c b/src/language/control/repeat.c
index 7b5634c8b3cc19f1435a77815c4d50abf8193b6f..24e3272ac57cced49c6b321b471c3ce6b9684b39 100644 (file)
--- a/src/language/control/repeat.c
+++ b/src/language/control/repeat.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,29 +16,29 @@
 
 #include <config.h>
 
-#include "repeat.h"
+#include "language/control/repeat.h"
 
 #include <ctype.h>
 #include <math.h>
 #include <stdlib.h>
 
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/settings.h>
-#include <libpspp/getl.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/cast.h>
-#include <libpspp/ll.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <libpspp/pool.h>
-#include <libpspp/str.h>
-#include <data/variable.h>
-
-#include "intprops.h"
-#include "xalloc.h"
+#include "data/dictionary.h"
+#include "data/procedure.h"
+#include "data/settings.h"
+#include "libpspp/getl.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/cast.h"
+#include "libpspp/ll.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/pool.h"
+#include "libpspp/str.h"
+#include "data/variable.h"
+
+#include "gl/intprops.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/control/temporary.c b/src/language/control/temporary.c
index bc3c767cdb416a587d154405f941641bfd3e6e54..eda939bba3ed95d6261619b26adc8927fe3e324e 100644 (file)
--- a/src/language/control/temporary.c
+++ b/src/language/control/temporary.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,18 +19,18 @@
 #include <stddef.h>
 #include <stdlib.h>
 
-#include "control-stack.h"
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/transformations.h>
-#include <data/value-labels.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
-
-#include "xalloc.h"
+#include "data/dictionary.h"
+#include "data/procedure.h"
+#include "data/transformations.h"
+#include "data/value-labels.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/control/control-stack.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/data-io/combine-files.c b/src/language/data-io/combine-files.c
index 0f9518890984fc7971c393119782d5acf1f890ea..82c36945a2fd803de74a0ea3239c3918440c4ed3 100644 (file)
--- a/src/language/data-io/combine-files.c
+++ b/src/language/data-io/combine-files.c
@@ -18,28 +18,28 @@
 
 #include <stdlib.h>
 
-#include <data/any-reader.h>
-#include <data/case-matcher.h>
-#include <data/case.h>
-#include <data/casereader.h>
-#include <data/casewriter.h>
-#include <data/dictionary.h>
-#include <data/format.h>
-#include <data/procedure.h>
-#include <data/subcase.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/data-io/file-handle.h>
-#include <language/data-io/trim.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <language/stats/sort-criteria.h>
-#include <libpspp/assertion.h>
-#include <libpspp/message.h>
-#include <libpspp/taint.h>
-#include <math/sort.h>
-
-#include "xalloc.h"
+#include "data/any-reader.h"
+#include "data/case-matcher.h"
+#include "data/case.h"
+#include "data/casereader.h"
+#include "data/casewriter.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/procedure.h"
+#include "data/subcase.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/data-io/file-handle.h"
+#include "language/data-io/trim.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "language/stats/sort-criteria.h"
+#include "libpspp/assertion.h"
+#include "libpspp/message.h"
+#include "libpspp/taint.h"
+#include "math/sort.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/data-io/data-list.c b/src/language/data-io/data-list.c
index 046c7b0e0cc165001f35dc0c04d2b572bdf8f7b6..043b424db77a6e3303fd845438ef8ff2911f164c 100644 (file)
--- a/src/language/data-io/data-list.c
+++ b/src/language/data-io/data-list.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,33 +22,33 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <data/case.h>
-#include <data/data-in.h>
-#include <data/casereader.h>
-#include <data/dictionary.h>
-#include <data/format.h>
-#include <data/procedure.h>
-#include <data/settings.h>
-#include <data/transformations.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/data-io/data-parser.h>
-#include <language/data-io/data-reader.h>
-#include <language/data-io/file-handle.h>
-#include <language/data-io/inpt-pgm.h>
-#include <language/data-io/placement-parser.h>
-#include <language/lexer/format-parser.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/assertion.h>
-#include <libpspp/compiler.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <libpspp/pool.h>
-#include <libpspp/str.h>
-
-#include "xsize.h"
-#include "xalloc.h"
+#include "data/case.h"
+#include "data/casereader.h"
+#include "data/data-in.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/procedure.h"
+#include "data/settings.h"
+#include "data/transformations.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/data-io/data-parser.h"
+#include "language/data-io/data-reader.h"
+#include "language/data-io/file-handle.h"
+#include "language/data-io/inpt-pgm.h"
+#include "language/data-io/placement-parser.h"
+#include "language/lexer/format-parser.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/assertion.h"
+#include "libpspp/compiler.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/pool.h"
+#include "libpspp/str.h"
+
+#include "gl/xsize.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/data-io/data-parser.c b/src/language/data-io/data-parser.c
index 1e67c71345ad5c836092323a670801023af3c927..630363af53f6ce2a077028474dd1d0386bde0fd6 100644 (file)
--- a/src/language/data-io/data-parser.c
+++ b/src/language/data-io/data-parser.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,24 +16,24 @@
 
 #include <config.h>
 
-#include <language/data-io/data-parser.h>
+#include "language/data-io/data-parser.h"
 
 #include <stdint.h>
 #include <stdlib.h>
 
-#include <data/casereader-provider.h>
-#include <data/data-in.h>
-#include <data/dictionary.h>
-#include <data/format.h>
-#include <data/file-handle-def.h>
-#include <data/procedure.h>
-#include <data/settings.h>
-#include <language/data-io/data-reader.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
-#include <output/tab.h>
-
-#include "xalloc.h"
+#include "data/casereader-provider.h"
+#include "data/data-in.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/file-handle-def.h"
+#include "data/procedure.h"
+#include "data/settings.h"
+#include "language/data-io/data-reader.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+#include "output/tab.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/data-io/data-parser.h b/src/language/data-io/data-parser.h
index 5a53a2f64ddcc3ab5c30286f438df15158014e4a..013e707858e5a9ee60bf6c7692654d95270512ac 100644 (file)
--- a/src/language/data-io/data-parser.h
+++ b/src/language/data-io/data-parser.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,8 +20,8 @@
 /* Abstraction of a DATA LIST or GET DATA TYPE=TXT data parser. */
 
 #include <stdbool.h>
-#include <data/case.h>
-#include <libpspp/str.h>
+#include "data/case.h"
+#include "libpspp/str.h"
 
 struct dataset;
 struct dfm_reader;

diff --git a/src/language/data-io/data-reader.c b/src/language/data-io/data-reader.c
index 5ff1693351dd576b936cf3a843e0d458c74af44e..2cec413b759e24fdf9aa8554b4e02f0f323168de 100644 (file)
--- a/src/language/data-io/data-reader.c
+++ b/src/language/data-io/data-reader.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-2004, 2006, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-2004, 2006, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 #include <config.h>
 
-#include <language/data-io/data-reader.h>
+#include "language/data-io/data-reader.h"
 
 #include <ctype.h>
 #include <errno.h>
@@ -25,22 +25,22 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 
-#include <data/casereader.h>
-#include <data/file-handle-def.h>
-#include <data/file-name.h>
-#include <data/procedure.h>
-#include <language/command.h>
-#include <language/data-io/file-handle.h>
-#include <language/lexer/lexer.h>
-#include <language/prompt.h>
-#include <libpspp/assertion.h>
-#include <libpspp/cast.h>
-#include <libpspp/integer-format.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
-
-#include "minmax.h"
-#include "xalloc.h"
+#include "data/casereader.h"
+#include "data/file-handle-def.h"
+#include "data/file-name.h"
+#include "data/procedure.h"
+#include "language/command.h"
+#include "language/data-io/file-handle.h"
+#include "language/lexer/lexer.h"
+#include "language/prompt.h"
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "libpspp/integer-format.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/data-io/data-writer.c b/src/language/data-io/data-writer.c
index fd77d504f8f995c3e6cb5894358f1c90f3b44bf8..113be58805f979c63bd736a85f5c473e5595b006 100644 (file)
--- a/src/language/data-io/data-writer.c
+++ b/src/language/data-io/data-writer.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-2004, 2006, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-2004, 2006, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 #include <config.h>
 
-#include <language/data-io/data-writer.h>
+#include "language/data-io/data-writer.h"
 
 #include <assert.h>
 #include <errno.h>
@@ -24,16 +24,16 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 
-#include <data/file-name.h>
-#include <data/make-file.h>
-#include <language/data-io/file-handle.h>
-#include <libpspp/assertion.h>
-#include <libpspp/integer-format.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
+#include "data/file-name.h"
+#include "data/make-file.h"
+#include "language/data-io/file-handle.h"
+#include "libpspp/assertion.h"
+#include "libpspp/integer-format.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
 
-#include "minmax.h"
-#include "xalloc.h"
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/data-io/file-handle.h b/src/language/data-io/file-handle.h
index 86518f7327f8a025b3b4ef50b320d1dd2ce89995..2dfb5e16ff18b845b3b45f15670fe909fd23b503 100644 (file)
--- a/src/language/data-io/file-handle.h
+++ b/src/language/data-io/file-handle.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include <data/file-handle-def.h>
+#include "data/file-handle-def.h"
 
 struct lexer ;
 struct file_handle *fh_parse (struct lexer *, enum fh_referent);

diff --git a/src/language/data-io/file-handle.q b/src/language/data-io/file-handle.q
index a3ff4102360616d89cc89cdc13174ce8bfba881b..e847e00f40367fdea283bd482ebeb73441677e7e 100644 (file)
--- a/src/language/data-io/file-handle.q
+++ b/src/language/data-io/file-handle.q
@@ -19,17 +19,18 @@
 #include <limits.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <data/file-name.h>
-#include <language/command.h>
-#include <language/data-io/file-handle.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/assertion.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
-#include <data/variable.h>
-#include <data/file-handle-def.h>
-
-#include "xalloc.h"
+
+#include "data/file-name.h"
+#include "language/command.h"
+#include "language/data-io/file-handle.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/assertion.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+#include "data/variable.h"
+#include "data/file-handle-def.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/data-io/get-data.c b/src/language/data-io/get-data.c
index f055af2d06ea43d1e5594e32e27513f4e37f74bb..7e75b413ea49cf82fcb87a81daea8ba570e4b905 100644 (file)
--- a/src/language/data-io/get-data.c
+++ b/src/language/data-io/get-data.c
@@ -18,23 +18,22 @@
 
 #include <stdlib.h>
 
-#include <data/gnumeric-reader.h>
-#include <data/psql-reader.h>
-
-#include <data/dictionary.h>
-#include <data/format.h>
-#include <data/procedure.h>
-#include <data/settings.h>
-#include <language/command.h>
-#include <language/data-io/data-parser.h>
-#include <language/data-io/data-reader.h>
-#include <language/data-io/file-handle.h>
-#include <language/data-io/placement-parser.h>
-#include <language/lexer/format-parser.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/message.h>
-
-#include "xalloc.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/gnumeric-reader.h"
+#include "data/procedure.h"
+#include "data/psql-reader.h"
+#include "data/settings.h"
+#include "language/command.h"
+#include "language/data-io/data-parser.h"
+#include "language/data-io/data-reader.h"
+#include "language/data-io/file-handle.h"
+#include "language/data-io/placement-parser.h"
+#include "language/lexer/format-parser.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/message.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/data-io/get.c b/src/language/data-io/get.c
index fea38812f79cc70bda3a1dbe5c1896fdb6718964..aa2b91fe6a92d3a8259c6475c597869c007ca12b 100644 (file)
--- a/src/language/data-io/get.c
+++ b/src/language/data-io/get.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2007, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2007, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,22 +18,22 @@
 
 #include <stdlib.h>
 
-#include <data/any-reader.h>
-#include <data/case.h>
-#include <data/case-map.h>
-#include <data/casereader.h>
-#include <data/dictionary.h>
-#include <data/por-file-writer.h>
-#include <data/procedure.h>
-#include <language/command.h>
-#include <language/data-io/file-handle.h>
-#include <language/data-io/trim.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/compiler.h>
-#include <libpspp/misc.h>
-#include <libpspp/str.h>
-
-#include "xalloc.h"
+#include "data/any-reader.h"
+#include "data/case-map.h"
+#include "data/case.h"
+#include "data/casereader.h"
+#include "data/dictionary.h"
+#include "data/por-file-writer.h"
+#include "data/procedure.h"
+#include "language/command.h"
+#include "language/data-io/file-handle.h"
+#include "language/data-io/trim.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/compiler.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/data-io/inpt-pgm.c b/src/language/data-io/inpt-pgm.c
index 405f605a807a76267bb050c1469d5828feb352f3..415c48c7be46ad2e0918f69bbee781d55fc80d57 100644 (file)
--- a/src/language/data-io/inpt-pgm.c
+++ b/src/language/data-io/inpt-pgm.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,26 +20,26 @@
 #include <float.h>
 #include <stdlib.h>
 
-#include <data/case.h>
-#include <data/caseinit.h>
-#include <data/casereader-provider.h>
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/transformations.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/data-io/data-reader.h>
-#include <language/data-io/file-handle.h>
-#include <language/data-io/inpt-pgm.h>
-#include <language/expressions/public.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/assertion.h>
-#include <libpspp/compiler.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <libpspp/str.h>
-
-#include "xalloc.h"
+#include "data/case.h"
+#include "data/caseinit.h"
+#include "data/casereader-provider.h"
+#include "data/dictionary.h"
+#include "data/procedure.h"
+#include "data/transformations.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/data-io/data-reader.h"
+#include "language/data-io/file-handle.h"
+#include "language/data-io/inpt-pgm.h"
+#include "language/expressions/public.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/assertion.h"
+#include "libpspp/compiler.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/data-io/list.q b/src/language/data-io/list.q
index 738b667183523a210d6530b74ef4f15ea2b598e8..33b828302fe46c3a5319a36c1afa081db807d6e2 100644 (file)
--- a/src/language/data-io/list.q
+++ b/src/language/data-io/list.q
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,29 +20,28 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "intprops.h"
-#include "xmalloca.h"
-
-#include <data/casegrouper.h>
-#include <data/casereader.h>
-#include <data/dictionary.h>
-#include <data/data-out.h>
-#include <data/format.h>
-#include <data/procedure.h>
-#include <data/subcase.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/dictionary/split-file.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/compiler.h>
-#include <libpspp/ll.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <output/tab.h>
-#include <output/table-item.h>
-
-#include "minmax.h"
-#include "xalloc.h"
+#include "data/casegrouper.h"
+#include "data/casereader.h"
+#include "data/dictionary.h"
+#include "data/data-out.h"
+#include "data/format.h"
+#include "data/procedure.h"
+#include "data/subcase.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/dictionary/split-file.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/compiler.h"
+#include "libpspp/ll.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "output/tab.h"
+#include "output/table-item.h"
+
+#include "gl/intprops.h"
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
+#include "gl/xmalloca.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/data-io/placement-parser.c b/src/language/data-io/placement-parser.c
index 820560df187d347e16d32d51a69b24cf307b1b4c..4d0a0b4c3b17d180e4465a00bda54bc4aed8e359 100644 (file)
--- a/src/language/data-io/placement-parser.c
+++ b/src/language/data-io/placement-parser.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,20 +16,19 @@
 
 #include <config.h>
 
-#include <language/data-io/placement-parser.h>
+#include "language/data-io/placement-parser.h"
 
 #include <assert.h>
 
-#include <language/lexer/format-parser.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/message.h>
-#include <libpspp/pool.h>
-#include <libpspp/str.h>
+#include "data/format.h"
+#include "language/lexer/format-parser.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/message.h"
+#include "libpspp/pool.h"
+#include "libpspp/str.h"
 
-#include <data/format.h>
-
-#include "xalloc.h"
-#include "xsize.h"
+#include "gl/xalloc.h"
+#include "gl/xsize.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/data-io/print-space.c b/src/language/data-io/print-space.c
index 73712c0d322db368ca5d7dc0f831bc4b122b437f..b7683670f5076353ac114e994aa3d0c584b54f7c 100644 (file)
--- a/src/language/data-io/print-space.c
+++ b/src/language/data-io/print-space.c
@@ -19,17 +19,17 @@
 #include <limits.h>
 #include <stdlib.h>
 
-#include <data/procedure.h>
-#include <data/value.h>
-#include <language/command.h>
-#include <language/data-io/data-writer.h>
-#include <language/data-io/file-handle.h>
-#include <language/expressions/public.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/message.h>
-#include <output/text-item.h>
-
-#include "xalloc.h"
+#include "data/procedure.h"
+#include "data/value.h"
+#include "language/command.h"
+#include "language/data-io/data-writer.h"
+#include "language/data-io/file-handle.h"
+#include "language/expressions/public.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/message.h"
+#include "output/text-item.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/data-io/print.c b/src/language/data-io/print.c
index 62798272d1da4904a264c28533428bca726c1f84..c52a59cf521fb1cdacef984392bf8be90f2e11a3 100644 (file)
--- a/src/language/data-io/print.c
+++ b/src/language/data-io/print.c
@@ -18,30 +18,30 @@
 
 #include <stdlib.h>
 
-#include <data/case.h>
-#include <data/data-out.h>
-#include <data/procedure.h>
-#include <data/transformations.h>
-#include <data/variable.h>
-#include <data/format.h>
-#include <language/command.h>
-#include <language/data-io/data-writer.h>
-#include <language/data-io/file-handle.h>
-#include <language/data-io/placement-parser.h>
-#include <language/lexer/format-parser.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/assertion.h>
-#include <libpspp/i18n.h>
-#include <libpspp/compiler.h>
-#include <libpspp/ll.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <libpspp/pool.h>
-#include <output/text-item.h>
-#include <output/tab.h>
-
-#include "xalloc.h"
+#include "data/case.h"
+#include "data/data-out.h"
+#include "data/format.h"
+#include "data/procedure.h"
+#include "data/transformations.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/data-io/data-writer.h"
+#include "language/data-io/file-handle.h"
+#include "language/data-io/placement-parser.h"
+#include "language/lexer/format-parser.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/assertion.h"
+#include "libpspp/compiler.h"
+#include "libpspp/i18n.h"
+#include "libpspp/ll.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/pool.h"
+#include "output/tab.h"
+#include "output/text-item.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/data-io/save.c b/src/language/data-io/save.c
index 5b51309b1946240e36afa7122b55d209f0708470..b06a850add59d8d8def01e9a085c60c70c8b997b 100644 (file)
--- a/src/language/data-io/save.c
+++ b/src/language/data-io/save.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,25 +18,25 @@
 
 #include <stdlib.h>
 
-#include <data/any-writer.h>
-#include <data/case-map.h>
-#include <data/case.h>
-#include <data/casereader.h>
-#include <data/casewriter.h>
-#include <data/dictionary.h>
-#include <data/por-file-writer.h>
-#include <data/procedure.h>
-#include <data/sys-file-writer.h>
-#include <data/transformations.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/data-io/file-handle.h>
-#include <language/data-io/trim.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/assertion.h>
-#include <libpspp/compiler.h>
-
-#include "xalloc.h"
+#include "data/any-writer.h"
+#include "data/case-map.h"
+#include "data/case.h"
+#include "data/casereader.h"
+#include "data/casewriter.h"
+#include "data/dictionary.h"
+#include "data/por-file-writer.h"
+#include "data/procedure.h"
+#include "data/sys-file-writer.h"
+#include "data/transformations.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/data-io/file-handle.h"
+#include "language/data-io/trim.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/assertion.h"
+#include "libpspp/compiler.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/data-io/trim.c b/src/language/data-io/trim.c
index 9f76b10516b1b8d88dc2eba668b919020c784d58..ac8bf272f8528f2ebc5878e0ce0c64d8e4a1c9e3 100644 (file)
--- a/src/language/data-io/trim.c
+++ b/src/language/data-io/trim.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2007, 2008, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2007, 2008, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,17 +16,17 @@
 
 #include <config.h>
 
-#include <language/data-io/trim.h>
+#include "language/data-io/trim.h"
 
 #include <stdlib.h>
 
-#include <data/dictionary.h>
-#include <data/variable.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/message.h>
+#include "data/dictionary.h"
+#include "data/variable.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/message.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/dictionary/apply-dictionary.c b/src/language/dictionary/apply-dictionary.c
index 3eb29e7e35c93c8dbcf43026f4621185a88e3bd1..7fdbdd472f8e463b7f5677ef23d15ba38b410360 100644 (file)
--- a/src/language/dictionary/apply-dictionary.c
+++ b/src/language/dictionary/apply-dictionary.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,19 +18,19 @@
 
 #include <stdlib.h>
 
-#include <data/any-reader.h>
-#include <data/casereader.h>
-#include <data/dictionary.h>
-#include <data/file-handle-def.h>
-#include <data/missing-values.h>
-#include <data/procedure.h>
-#include <data/value-labels.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/data-io/file-handle.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
+#include "data/any-reader.h"
+#include "data/casereader.h"
+#include "data/dictionary.h"
+#include "data/file-handle-def.h"
+#include "data/missing-values.h"
+#include "data/procedure.h"
+#include "data/value-labels.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/data-io/file-handle.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/dictionary/attributes.c b/src/language/dictionary/attributes.c
index 1f9e984950bf6dbb3231430e9b9e46bde413a057..b0c9ddfd47361e38640432fa9c1a5a9e01069095 100644 (file)
--- a/src/language/dictionary/attributes.c
+++ b/src/language/dictionary/attributes.c
@@ -18,16 +18,16 @@
 
 #include <stdlib.h>
 
-#include <data/attributes.h>
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/message.h>
-
-#include "xalloc.h"
+#include "data/attributes.h"
+#include "data/dictionary.h"
+#include "data/procedure.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/message.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/dictionary/delete-variables.c b/src/language/dictionary/delete-variables.c
index 97c54a81b6e13ac1052011b6673dbb52f75cd16b..526fa1cd41f5e755ca86d55322670c57facbf521 100644 (file)
--- a/src/language/dictionary/delete-variables.c
+++ b/src/language/dictionary/delete-variables.c
@@ -18,12 +18,12 @@
 
 #include <stdlib.h>
 
-#include <data/casereader.h>
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <language/command.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/message.h>
+#include "data/casereader.h"
+#include "data/dictionary.h"
+#include "data/procedure.h"
+#include "language/command.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/message.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/dictionary/formats.c b/src/language/dictionary/formats.c
index de58615619f1548a772b3cdba64cb4e3143a25f9..b40f202cfa5febe7091d8b0329af970630ed8807 100644 (file)
--- a/src/language/dictionary/formats.c
+++ b/src/language/dictionary/formats.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,16 +20,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <data/procedure.h>
-#include <data/variable.h>
-#include <data/format.h>
-#include <language/command.h>
-#include <language/lexer/format-parser.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <libpspp/str.h>
+#include "data/format.h"
+#include "data/procedure.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/format-parser.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/dictionary/missing-values.c b/src/language/dictionary/missing-values.c
index 4a14ee195b8c91f26cf0e589497f2d607bfb325c..ace9948412f6fdf3a232fae8ee15cf31bf669afb 100644 (file)
--- a/src/language/dictionary/missing-values.c
+++ b/src/language/dictionary/missing-values.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,18 +18,18 @@
 
 #include <stdlib.h>
 
-#include <data/data-in.h>
-#include <data/missing-values.h>
-#include <data/procedure.h>
-#include <data/value.h>
-#include <data/variable.h>
-#include <data/format.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/value-parser.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
+#include "data/data-in.h"
+#include "data/format.h"
+#include "data/missing-values.h"
+#include "data/procedure.h"
+#include "data/value.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/value-parser.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/dictionary/modify-variables.c b/src/language/dictionary/modify-variables.c
index aae81222c5d8d475ccc7873a857933b457f35515..afb9089986b95b23babeb63e1e4947a1caed4205 100644 (file)
--- a/src/language/dictionary/modify-variables.c
+++ b/src/language/dictionary/modify-variables.c
@@ -18,21 +18,21 @@
 
 #include <stdlib.h>
 
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/assertion.h>
-#include <libpspp/array.h>
-#include <libpspp/bit-vector.h>
-#include <libpspp/compiler.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <libpspp/str.h>
-
-#include "xalloc.h"
+#include "data/dictionary.h"
+#include "data/procedure.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/array.h"
+#include "libpspp/assertion.h"
+#include "libpspp/bit-vector.h"
+#include "libpspp/compiler.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/dictionary/numeric.c b/src/language/dictionary/numeric.c
index 946c35c167cd7f7f51834575d1b9e574a83fe617..25b2ecf8f06719fb43cceb3ba0467448fc17049e 100644 (file)
--- a/src/language/dictionary/numeric.c
+++ b/src/language/dictionary/numeric.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,17 +18,17 @@
 
 #include <stdlib.h>
 
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/variable.h>
-#include <data/format.h>
-#include <language/command.h>
-#include <language/lexer/format-parser.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/assertion.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
+#include "data/dictionary.h"
+#include "data/procedure.h"
+#include "data/variable.h"
+#include "data/format.h"
+#include "language/command.h"
+#include "language/lexer/format-parser.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/assertion.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/dictionary/rename-variables.c b/src/language/dictionary/rename-variables.c
index 79ab997cfd27ed5f7bf12dab050336c9f2475bd0..437450451075797d0dc022ef808231c726243691 100644 (file)
--- a/src/language/dictionary/rename-variables.c
+++ b/src/language/dictionary/rename-variables.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,16 +18,16 @@
 
 #include <stdlib.h>
 
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
+#include "data/dictionary.h"
+#include "data/procedure.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/dictionary/split-file.c b/src/language/dictionary/split-file.c
index d27ab3a65b3ab1b34c6c74b9a8cb1b011287a7a2..02e7696b4b1f339d2543242b862cf0c59db0af51 100644 (file)
--- a/src/language/dictionary/split-file.c
+++ b/src/language/dictionary/split-file.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,22 +18,22 @@
 
 #include <stdlib.h>
 
-#include <data/case.h>
-#include <data/data-out.h>
-#include <data/dictionary.h>
-#include <data/format.h>
-#include <data/procedure.h>
-#include <data/value-labels.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/dictionary/split-file.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
-#include <output/tab.h>
-
-#include "xalloc.h"
+#include "data/case.h"
+#include "data/data-out.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/procedure.h"
+#include "data/value-labels.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/dictionary/split-file.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+#include "output/tab.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/dictionary/sys-file-info.c b/src/language/dictionary/sys-file-info.c
index 30402422e9e2ac2252e14c656165be5fc798a36b..952930b5bad39332d0b1f70d5e76e706568ba930 100644 (file)
--- a/src/language/dictionary/sys-file-info.c
+++ b/src/language/dictionary/sys-file-info.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,28 +19,28 @@
 #include <ctype.h>
 #include <stdlib.h>
 
-#include <data/attributes.h>
-#include <data/casereader.h>
-#include <data/dictionary.h>
-#include <data/file-handle-def.h>
-#include <data/format.h>
-#include <data/missing-values.h>
-#include <data/procedure.h>
-#include <data/sys-file-reader.h>
-#include <data/value-labels.h>
-#include <data/variable.h>
-#include <data/vector.h>
-#include <language/command.h>
-#include <language/data-io/file-handle.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/array.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <output/tab.h>
-
-#include "minmax.h"
-#include "xalloc.h"
+#include "data/attributes.h"
+#include "data/casereader.h"
+#include "data/dictionary.h"
+#include "data/file-handle-def.h"
+#include "data/format.h"
+#include "data/missing-values.h"
+#include "data/procedure.h"
+#include "data/sys-file-reader.h"
+#include "data/value-labels.h"
+#include "data/variable.h"
+#include "data/vector.h"
+#include "language/command.h"
+#include "language/data-io/file-handle.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/array.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "output/tab.h"
+
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/dictionary/value-labels.c b/src/language/dictionary/value-labels.c
index 8c312ab8cee23ebec567ac3e1a8189285aa80e47..9068290b7dda666495f24c1fe4499e7f7f28d9cf 100644 (file)
--- a/src/language/dictionary/value-labels.c
+++ b/src/language/dictionary/value-labels.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,17 +19,17 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <data/procedure.h>
-#include <data/value-labels.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/value-parser.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
-
-#include "xalloc.h"
+#include "data/procedure.h"
+#include "data/value-labels.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/value-parser.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/dictionary/variable-display.c b/src/language/dictionary/variable-display.c
index 8351ff613d69155a05fe816028d983260a7c48d2..4b68f902b0535462c2566748ec2e116d7ca02391 100644 (file)
--- a/src/language/dictionary/variable-display.c
+++ b/src/language/dictionary/variable-display.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,16 +19,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <data/procedure.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
+#include "data/procedure.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
 
-#include "minmax.h"
-#include "xalloc.h"
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/dictionary/variable-label.c b/src/language/dictionary/variable-label.c
index 804a4213d1c4ac8967c8ec1f18b4e8e6322c6e66..4735047c1e6d20b7f28f2f01d37340cb8af209e8 100644 (file)
--- a/src/language/dictionary/variable-label.c
+++ b/src/language/dictionary/variable-label.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,15 +19,15 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <data/procedure.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
+#include "data/procedure.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/dictionary/vector.c b/src/language/dictionary/vector.c
index 8eb7ef16f17bce3ca77f119d85d342fc4fa22afe..bf257194613f9a1840e6f1660e224a2249ef0aaf 100644 (file)
--- a/src/language/dictionary/vector.c
+++ b/src/language/dictionary/vector.c
@@ -18,22 +18,22 @@
 
 #include <stdlib.h>
 
-#include <data/format.h>
-#include <data/procedure.h>
-#include <data/dictionary.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/lexer/format-parser.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/assertion.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <libpspp/pool.h>
-#include <libpspp/str.h>
-
-#include "intprops.h"
-#include "xalloc.h"
+#include "data/format.h"
+#include "data/procedure.h"
+#include "data/dictionary.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/format-parser.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/assertion.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/pool.h"
+#include "libpspp/str.h"
+
+#include "gl/intprops.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/dictionary/weight.c b/src/language/dictionary/weight.c
index 7e25a64602511bba21b7e605767f30f7cfe7e139..cca9aebe49844ab0290a299358b93bc12893fc18 100644 (file)
--- a/src/language/dictionary/weight.c
+++ b/src/language/dictionary/weight.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,14 +18,14 @@
 
 #include <stdio.h>
 
-#include <data/procedure.h>
-#include <data/dictionary.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
+#include "data/procedure.h"
+#include "data/dictionary.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/expressions/evaluate.c b/src/language/expressions/evaluate.c
index 6ac0572185619dc83977cb81655957cf437f6581..fea0e56b933b2838f5cf2deaad469969f0fd17a1 100644 (file)
--- a/src/language/expressions/evaluate.c
+++ b/src/language/expressions/evaluate.c
@@ -15,15 +15,17 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include "evaluate.h"
+
+#include "language/expressions/evaluate.h"
 
 #include <ctype.h>
-#include <libpspp/assertion.h>
-#include <libpspp/message.h>
-#include <language/expressions/helpers.h>
-#include <language/expressions/private.h>
-#include <language/lexer/value-parser.h>
-#include <libpspp/pool.h>
+
+#include "libpspp/assertion.h"
+#include "libpspp/message.h"
+#include "language/expressions/helpers.h"
+#include "language/expressions/private.h"
+#include "language/lexer/value-parser.h"
+#include "libpspp/pool.h"
 
 #include "xalloc.h"
 
@@ -102,8 +104,8 @@ expr_evaluate_str (struct expression *e, const struct ccase *c, int case_idx,
   buf_copy_rpad (dst, dst_size, s.string, s.length, ' ');
 }
 \f
-#include <language/lexer/lexer.h>
-#include <language/command.h>
+#include "language/lexer/lexer.h"
+#include "language/command.h"
 
 int
 cmd_debug_evaluate (struct lexer *lexer, struct dataset *dsother UNUSED)

diff --git a/src/language/expressions/helpers.c b/src/language/expressions/helpers.c
index ac17c1cece19ce842bde63ae9495daac3d6e0109..7c3371f5db97eb9daf3455c943014a035d178408 100644 (file)
--- a/src/language/expressions/helpers.c
+++ b/src/language/expressions/helpers.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2008, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,12 +15,15 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include "helpers.h"
+
+#include "language/expressions/helpers.h"
+
 #include <gsl/gsl_roots.h>
 #include <gsl/gsl_sf.h>
-#include <libpspp/assertion.h>
-#include <libpspp/pool.h>
-#include "private.h"
+
+#include "language/expressions/private.h"
+#include "libpspp/assertion.h"
+#include "libpspp/pool.h"
 
 const struct substring empty_string = {NULL, 0};
 

diff --git a/src/language/expressions/helpers.h b/src/language/expressions/helpers.h
index 59be40056dcf7cc3f50317e280e42d42ae3858ff..570cf132341e2aa748a8a9deecb7ec2bbe98ef40 100644 (file)
--- a/src/language/expressions/helpers.h
+++ b/src/language/expressions/helpers.h
@@ -10,24 +10,24 @@
 #include <math.h>
 #include <stdbool.h>
 
-#include <data/calendar.h>
-#include <data/case.h>
-#include <data/data-in.h>
-#include <data/data-out.h>
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/settings.h>
-#include <data/value.h>
-#include <data/variable.h>
-#include <data/vector.h>
-#include <language/expressions/public.h>
-#include <libpspp/compiler.h>
-#include <libpspp/i18n.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <libpspp/str.h>
-#include <math/moments.h>
-#include <math/random.h>
+#include "data/calendar.h"
+#include "data/case.h"
+#include "data/data-in.h"
+#include "data/data-out.h"
+#include "data/dictionary.h"
+#include "data/procedure.h"
+#include "data/settings.h"
+#include "data/value.h"
+#include "data/variable.h"
+#include "data/vector.h"
+#include "language/expressions/public.h"
+#include "libpspp/compiler.h"
+#include "libpspp/i18n.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
+#include "math/moments.h"
+#include "math/random.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/expressions/optimize.c b/src/language/expressions/optimize.c
index b0abd946c57b9868b6346f77d45d68cf5a45ccc3..8f090778ab9c80a20fc6f44a24e7a7ba5b5d21aa 100644 (file)
--- a/src/language/expressions/optimize.c
+++ b/src/language/expressions/optimize.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,24 +15,27 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include "private.h"
+
+#include "language/expressions/private.h"
+
 #include <math.h>
 #include <ctype.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <libpspp/assertion.h>
-#include <data/calendar.h>
-#include <data/data-in.h>
-#include <libpspp/message.h>
-#include "evaluate.h"
-#include "helpers.h"
-#include <libpspp/misc.h>
-#include <libpspp/pool.h>
-#include "public.h"
-#include <libpspp/str.h>
-#include <data/variable.h>
-
-#include "xalloc.h"
+
+#include "data/calendar.h"
+#include "data/data-in.h"
+#include "data/variable.h"
+#include "language/expressions/evaluate.h"
+#include "language/expressions/helpers.h"
+#include "language/expressions/public.h"
+#include "libpspp/assertion.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/pool.h"
+#include "libpspp/str.h"
+
+#include "gl/xalloc.h"
 
 static union any_node *evaluate_tree (struct composite_node *,
                                       struct expression *);

diff --git a/src/language/expressions/parse.c b/src/language/expressions/parse.c
index b311c4865a4e1e0c7788a0257a709af0ddc23835..a9c324bcb55e4b944f32efe0cd7caa7dde8f2620 100644 (file)
--- a/src/language/expressions/parse.c
+++ b/src/language/expressions/parse.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,22 +23,22 @@
 #include <limits.h>
 #include <stdlib.h>
 
-#include "helpers.h"
-#include <data/case.h>
-#include <data/dictionary.h>
-#include <data/settings.h>
-#include <data/variable.h>
-#include <language/lexer/format-parser.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/array.h>
-#include <libpspp/assertion.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <libpspp/pool.h>
-#include <libpspp/str.h>
-
-#include "xalloc.h"
+#include "data/case.h"
+#include "data/dictionary.h"
+#include "data/settings.h"
+#include "data/variable.h"
+#include "language/expressions/helpers.h"
+#include "language/lexer/format-parser.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/array.h"
+#include "libpspp/assertion.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/pool.h"
+#include "libpspp/str.h"
+
+#include "gl/xalloc.h"
 \f
 /* Declarations. */
 

diff --git a/src/language/expressions/private.h b/src/language/expressions/private.h
index 4283b4ae694236d6118eb48c9890cfc26b70fd5c..1a485bb4f7f0801b234a4c41cdde1f777fa06fd0 100644 (file)
--- a/src/language/expressions/private.h
+++ b/src/language/expressions/private.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,12 +19,11 @@
 
 #include <assert.h>
 #include <stddef.h>
-#include <libpspp/str.h>
 
-#include "public.h"
-#include "operations.h"
-
-#include <data/format.h>
+#include "data/format.h"
+#include "language/expressions/operations.h"
+#include "language/expressions/public.h"
+#include "libpspp/str.h"
 
 enum operation_flags
   {

diff --git a/src/language/lexer/format-parser.c b/src/language/lexer/format-parser.c
index 4b25020ed4afdc6630c8e08ac014e40ae6003a8b..e3ca9ccad0d03ca9c98eee07913257fd1a225308 100644 (file)
--- a/src/language/lexer/format-parser.c
+++ b/src/language/lexer/format-parser.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,19 +16,19 @@
 
 #include <config.h>
 
-#include "format-parser.h"
+#include "language/lexer/format-parser.h"
 
 #include <ctype.h>
 #include <stdint.h>
 #include <stdlib.h>
 
-#include "lexer.h"
-#include <data/format.h>
-#include <data/variable.h>
-#include <language/lexer/format-parser.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <libpspp/str.h>
+#include "data/format.h"
+#include "data/variable.h"
+#include "language/lexer/format-parser.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/lexer/lexer.c b/src/language/lexer/lexer.c
index a409a83ee957647a7b5d9b5f8195732ac8e0a61c..eee15d6466bfe834d120d6019d804837b60ed840 100644 (file)
--- a/src/language/lexer/lexer.c
+++ b/src/language/lexer/lexer.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,7 +16,8 @@
 
 #include <config.h>
 
-#include "lexer.h"
+#include "language/lexer/lexer.h"
+
 #include <c-ctype.h>
 #include <c-strtod.h>
 #include <errno.h>
@@ -25,16 +26,17 @@
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdlib.h>
-#include <language/command.h>
-#include <data/settings.h>
-#include <libpspp/assertion.h>
-#include <libpspp/getl.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
-#include <output/journal.h>
-#include <output/text-item.h>
-
-#include "xalloc.h"
+
+#include "data/settings.h"
+#include "language/command.h"
+#include "libpspp/assertion.h"
+#include "libpspp/getl.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+#include "output/journal.h"
+#include "output/text-item.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/lexer/lexer.h b/src/language/lexer/lexer.h
index 1abefb6b623fb30acc42ca4c05a6da27227bd8ce..f00ca77d2f52deeaa43d4601a6626538b7d3dcfb 100644 (file)
--- a/src/language/lexer/lexer.h
+++ b/src/language/lexer/lexer.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,9 +20,10 @@
 #include <ctype.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include <data/identifier.h>
-#include <data/variable.h>
-#include <libpspp/getl.h>
+
+#include "data/identifier.h"
+#include "data/variable.h"
+#include "libpspp/getl.h"
 
 struct lexer;
 

diff --git a/src/language/lexer/q2c.c b/src/language/lexer/q2c.c
index 4858a25706133a5303b48b8b5184ca2dc2b1804a..d578dbc2919fee8bcc81264bac22c9ed512ddfed 100644 (file)
--- a/src/language/lexer/q2c.c
+++ b/src/language/lexer/q2c.c
@@ -2128,17 +2128,19 @@ main (int argc, char *argv[])
          indent = 0;
 
          dump (0, "#include <stdlib.h>");
-         dump (0, "#include <libpspp/assertion.h>");
-         dump (0, "#include <libpspp/message.h>");
-         dump (0, "#include <language/lexer/lexer.h>");
-         dump (0, "#include <language/lexer/variable-parser.h>");
-          dump (0, "#include <data/settings.h>");
-         dump (0, "#include <libpspp/str.h>");
-          dump (0, "#include <language/lexer/subcommand-list.h>");
-         dump (0, "#include <data/variable.h>");
+          dump_blank_line (0);
+
+          dump (0, "#include \"data/settings.h\"");
+         dump (0, "#include \"data/variable.h\"");
+         dump (0, "#include \"language/lexer/lexer.h\"");
+          dump (0, "#include \"language/lexer/subcommand-list.h\"");
+         dump (0, "#include \"language/lexer/variable-parser.h\"");
+         dump (0, "#include \"libpspp/assertion.h\"");
+         dump (0, "#include \"libpspp/message.h\"");
+         dump (0, "#include \"libpspp/str.h\"");
          dump_blank_line (0);
 
-          dump (0, "#include \"xalloc.h\"");
+          dump (0, "#include \"gl/xalloc.h\"");
          dump_blank_line (0);
 
           dump (0, "#include \"gettext.h\"");

diff --git a/src/language/prompt.c b/src/language/prompt.c
index 8701f6c9b5ccce54d4a2e6e7c9e2948dd27557a5..614796e18e3dd3e79c2082d8966720bfe6a2376d 100644 (file)
--- a/src/language/prompt.c
+++ b/src/language/prompt.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,20 +20,20 @@
 #include <errno.h>
 #include <stdlib.h>
 
-#include "prompt.h"
+#include "language/prompt.h"
 
-#include <data/file-name.h>
-#include <data/settings.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/assertion.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
-#include <libpspp/version.h>
-#include <output/tab.h>
+#include "data/file-name.h"
+#include "data/settings.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/assertion.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+#include "libpspp/version.h"
+#include "output/tab.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 /* Current prompting style. */
 static enum prompt_style current_style;

diff --git a/src/language/stats/aggregate.c b/src/language/stats/aggregate.c
index dcadff965cf76ebd2ad73c99f16d1c3c25fd0f14..319e19a3e83bf9931ddf864ede45b0a29f1417eb 100644 (file)
--- a/src/language/stats/aggregate.c
+++ b/src/language/stats/aggregate.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,40 +16,40 @@
 
 #include <config.h>
 
+#include "language/stats/aggregate.h"
+
 #include <stdlib.h>
 
-#include <data/any-writer.h>
-#include <data/case.h>
-#include <data/casegrouper.h>
-#include <data/casereader.h>
-#include <data/casewriter.h>
-#include <data/dictionary.h>
-#include <data/file-handle-def.h>
-#include <data/format.h>
-#include <data/procedure.h>
-#include <data/settings.h>
-#include <data/subcase.h>
-#include <data/sys-file-writer.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/data-io/file-handle.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <language/stats/sort-criteria.h>
-#include <libpspp/assertion.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <libpspp/pool.h>
-#include <libpspp/str.h>
-#include <math/moments.h>
-#include <math/sort.h>
-#include <math/statistic.h>
-#include <math/percentiles.h>
-
-#include "aggregate.h"
-
-#include "minmax.h"
-#include "xalloc.h"
+#include "data/any-writer.h"
+#include "data/case.h"
+#include "data/casegrouper.h"
+#include "data/casereader.h"
+#include "data/casewriter.h"
+#include "data/dictionary.h"
+#include "data/file-handle-def.h"
+#include "data/format.h"
+#include "data/procedure.h"
+#include "data/settings.h"
+#include "data/subcase.h"
+#include "data/sys-file-writer.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/data-io/file-handle.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "language/stats/sort-criteria.h"
+#include "libpspp/assertion.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/pool.h"
+#include "libpspp/str.h"
+#include "math/moments.h"
+#include "math/sort.h"
+#include "math/statistic.h"
+#include "math/percentiles.h"
+
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/stats/aggregate.h b/src/language/stats/aggregate.h
index 1a50bbe4caea0a167b75e99a1b06bf8d790f14d3..8cddbcfa574120a20d326732079f3f849f070e34 100644 (file)
--- a/src/language/stats/aggregate.h
+++ b/src/language/stats/aggregate.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,11 +18,11 @@
 #ifndef AGGREGATE_H
 #define AGGREGATE_H
 
-#include <data/format.h>
-#include <data/val-type.h>
-
 #include <stddef.h>
 
+#include "data/format.h"
+#include "data/val-type.h"
+
 enum agr_src_vars
   {
     AGR_SV_NO,

diff --git a/src/language/stats/binomial.c b/src/language/stats/binomial.c
index 8126daf36c725d80652a6add4db7098c35dcdd72..c83e4570a0dab3a1a19cd58285553c2a152acaf3 100644 (file)
--- a/src/language/stats/binomial.c
+++ b/src/language/stats/binomial.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,36 +15,33 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include <libpspp/compiler.h>
-#include <output/tab.h>
 
-#include <data/format.h>
-#include <data/case.h>
-#include <data/casereader.h>
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/variable.h>
-#include <data/value.h>
-#include <data/value-labels.h>
+#include "language/stats/binomial.h"
 
-#include <libpspp/message.h>
-#include <libpspp/assertion.h>
-
-#include "binomial.h"
-#include "freq.h"
+#include <gsl/gsl_cdf.h>
+#include <gsl/gsl_randist.h>
 
-#include "xalloc.h"
+#include "data/case.h"
+#include "data/casereader.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/procedure.h"
+#include "data/value-labels.h"
+#include "data/value.h"
+#include "data/variable.h"
+#include "language/stats/freq.h"
+#include "libpspp/assertion.h"
+#include "libpspp/compiler.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "output/tab.h"
+
+#include "gl/xalloc.h"
+#include "gl/minmax.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/misc.h>
-
-#include <gsl/gsl_cdf.h>
-#include <gsl/gsl_randist.h>
-
-#include <minmax.h>
-
 static double calculate_binomial_internal (double n1, double n2,
                                           double p);
 

diff --git a/src/language/stats/chisquare.c b/src/language/stats/chisquare.c
index 6218228690526da661921ec38b82d33c63b13a78..ed91013e54d29076db3c4a4866a6c1f60afdf737 100644 (file)
--- a/src/language/stats/chisquare.c
+++ b/src/language/stats/chisquare.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 #include <config.h>
 
-#include <language/stats/chisquare.h>
+#include "language/stats/chisquare.h"
 
 #include <gsl/gsl_cdf.h>
 #include <math.h>

diff --git a/src/language/stats/chisquare.h b/src/language/stats/chisquare.h
index 182e092e14c7a52079f50fc4829ae0657c8e0e1b..da9329c0016e9a7730abe3dc3a317a05b6336a4b 100644 (file)
--- a/src/language/stats/chisquare.h
+++ b/src/language/stats/chisquare.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 
 #include <stddef.h>
 #include <stdbool.h>
-#include <language/stats/npar.h>
+#include "language/stats/npar.h"
 
 struct chisquare_test
 {

diff --git a/src/language/stats/cochran.c b/src/language/stats/cochran.c
index 3b6af22d6d512bc14fd6285fb9ac08ce878f643c..8576f985e215e8030512fc61998593b5bed91167 100644 (file)
--- a/src/language/stats/cochran.c
+++ b/src/language/stats/cochran.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,27 +16,26 @@
 
 #include <config.h>
 
-#include "cochran.h"
-#include "npar.h"
-#include <stdbool.h>
-#include <libpspp/cast.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-
-#include <data/procedure.h>
-#include <data/dictionary.h>
-#include <data/variable.h>
-#include <data/val-type.h>
-#include <data/casereader.h>
+#include "language/stats/cochran.h"
 
 #include <gsl/gsl_cdf.h>
+#include <stdbool.h>
+
+#include "data/casereader.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/procedure.h"
+#include "data/val-type.h"
+#include "data/variable.h"
+#include "language/stats/npar.h"
+#include "libpspp/cast.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "output/tab.h"
 
-#include <data/format.h>
-#include <output/tab.h>
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-
 struct cochran
 {
   double success;

diff --git a/src/language/stats/cochran.h b/src/language/stats/cochran.h
index 1ea75053b5b2119080f48487d1cbfcfb2da145e7..db42cc3c0b31c52fdad4873ef94bd8ba5779b295 100644 (file)
--- a/src/language/stats/cochran.h
+++ b/src/language/stats/cochran.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 
 #include <stddef.h>
 #include <stdbool.h>
-#include <language/stats/npar.h>
+#include "language/stats/npar.h"
 
 
 

diff --git a/src/language/stats/correlations.c b/src/language/stats/correlations.c
index 4f476433b3f73c3612261a51fb987a06bc0255ea..aa7841e7a8be618d0131fab60557e2e20b7529c0 100644 (file)
--- a/src/language/stats/correlations.c
+++ b/src/language/stats/correlations.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,29 +16,30 @@
 
 #include <config.h>
 
-#include <libpspp/assertion.h>
-#include <math/covariance.h>
-#include <math/correlation.h>
+#include <gsl/gsl_cdf.h>
 #include <gsl/gsl_matrix.h>
-#include <data/casegrouper.h>
-#include <data/casereader.h>
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/dictionary/split-file.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <output/tab.h>
-#include <libpspp/message.h>
-#include <data/format.h>
-#include <math/moments.h>
-
 #include <math.h>
-#include "xalloc.h"
-#include "minmax.h"
-#include <libpspp/misc.h>
-#include <gsl/gsl_cdf.h>
+
+#include "data/casegrouper.h"
+#include "data/casereader.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/procedure.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/dictionary/split-file.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/assertion.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "math/correlation.h"
+#include "math/covariance.h"
+#include "math/moments.h"
+#include "output/tab.h"
+
+#include "gl/xalloc.h"
+#include "gl/minmax.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/stats/crosstabs.q b/src/language/stats/crosstabs.q
index e3d07942d21e4ff06440f0e5231ad5f625316129..b12bf6cfe60915dd91afa4f249b6a3f4b6fc3300 100644 (file)
--- a/src/language/stats/crosstabs.q
+++ b/src/language/stats/crosstabs.q
@@ -33,34 +33,34 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <data/case.h>
-#include <data/casegrouper.h>
-#include <data/casereader.h>
-#include <data/data-out.h>
-#include <data/dictionary.h>
-#include <data/format.h>
-#include <data/procedure.h>
-#include <data/value-labels.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/dictionary/split-file.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/array.h>
-#include <libpspp/assertion.h>
-#include <libpspp/compiler.h>
-#include <libpspp/hash-functions.h>
-#include <libpspp/hmap.h>
-#include <libpspp/hmapx.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <libpspp/pool.h>
-#include <libpspp/str.h>
-#include <output/tab.h>
-
-#include "minmax.h"
-#include "xalloc.h"
-#include "xsize.h"
+#include "data/case.h"
+#include "data/casegrouper.h"
+#include "data/casereader.h"
+#include "data/data-out.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/procedure.h"
+#include "data/value-labels.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/dictionary/split-file.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/array.h"
+#include "libpspp/assertion.h"
+#include "libpspp/compiler.h"
+#include "libpspp/hash-functions.h"
+#include "libpspp/hmap.h"
+#include "libpspp/hmapx.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/pool.h"
+#include "libpspp/str.h"
+#include "output/tab.h"
+
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
+#include "gl/xsize.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/stats/descriptives.c b/src/language/stats/descriptives.c
index a21ccc5f9028d699ac8172cf7f84f9a48574dc7e..50d52d3cff03f68d2bac2d9d0a84097b961ae032 100644 (file)
--- a/src/language/stats/descriptives.c
+++ b/src/language/stats/descriptives.c
@@ -20,24 +20,24 @@
 #include <math.h>
 #include <stdlib.h>
 
-#include <data/casegrouper.h>
-#include <data/casereader.h>
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/transformations.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/dictionary/split-file.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/array.h>
-#include <libpspp/compiler.h>
-#include <libpspp/message.h>
-#include <libpspp/assertion.h>
-#include <math/moments.h>
-#include <output/tab.h>
-
-#include "xalloc.h"
+#include "data/casegrouper.h"
+#include "data/casereader.h"
+#include "data/dictionary.h"
+#include "data/procedure.h"
+#include "data/transformations.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/dictionary/split-file.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/array.h"
+#include "libpspp/compiler.h"
+#include "libpspp/message.h"
+#include "libpspp/assertion.h"
+#include "math/moments.h"
+#include "output/tab.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/stats/examine.q b/src/language/stats/examine.q
index aa578e1e2d6907be4bbe1044fc61b7ebb76ac4e4..50d9525b255d16f1eae307f95d4915a9235425e6 100644 (file)
--- a/src/language/stats/examine.q
+++ b/src/language/stats/examine.q
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,46 +21,46 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <math/sort.h>
-#include <math/order-stats.h>
-#include <math/percentiles.h>
-#include <math/tukey-hinges.h>
-#include <math/box-whisker.h>
-#include <math/trimmed-mean.h>
-#include <math/extrema.h>
-#include <math/np.h>
-#include <data/case.h>
-#include <data/casegrouper.h>
-#include <data/casereader.h>
-#include <data/casewriter.h>
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/subcase.h>
-#include <data/value-labels.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/dictionary/split-file.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/compiler.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <libpspp/str.h>
-#include <math/moments.h>
-#include <output/chart-item.h>
-#include <output/charts/boxplot.h>
-#include <output/charts/np-plot.h>
-#include <output/tab.h>
-
-#include "minmax.h"
-#include "xalloc.h"
+#include "data/case.h"
+#include "data/casegrouper.h"
+#include "data/casereader.h"
+#include "data/casewriter.h"
+#include "data/dictionary.h"
+#include "data/procedure.h"
+#include "data/subcase.h"
+#include "data/value-labels.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/dictionary/split-file.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/compiler.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
+#include "math/box-whisker.h"
+#include "math/extrema.h"
+#include "math/histogram.h"
+#include "math/moments.h"
+#include "math/np.h"
+#include "math/order-stats.h"
+#include "math/percentiles.h"
+#include "math/sort.h"
+#include "math/trimmed-mean.h"
+#include "math/tukey-hinges.h"
+#include "output/chart-item.h"
+#include "output/charts/boxplot.h"
+#include "output/charts/np-plot.h"
+#include "output/charts/plot-hist.h"
+#include "output/tab.h"
+
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
 /* (headers) */
-#include <output/charts/plot-hist.h>
-#include <math/histogram.h>
 
 /* (specification)
    "EXAMINE" (xmn_):

diff --git a/src/language/stats/factor.c b/src/language/stats/factor.c
index eae6840f3b2f66716a61582e8863ee9746c673bb..a19cf69e16e9e3f133fc74495fae07f599903e38 100644 (file)
--- a/src/language/stats/factor.c
+++ b/src/language/stats/factor.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,7 +16,6 @@
 
 #include <config.h>
 
-
 #include <gsl/gsl_vector.h>
 #include <gsl/gsl_linalg.h>
 #include <gsl/gsl_matrix.h>
@@ -24,30 +23,25 @@
 #include <gsl/gsl_blas.h> 
 #include <gsl/gsl_sort_vector.h>
 
-#include <math/covariance.h>
-
-#include <math/correlation.h>
-#include <math/moments.h>
-#include <data/procedure.h>
-#include <language/lexer/variable-parser.h>
-#include <language/lexer/value-parser.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-
-#include <data/casegrouper.h>
-#include <data/casereader.h>
-#include <data/casewriter.h>
-#include <data/dictionary.h>
-#include <data/format.h>
-#include <data/subcase.h>
-
-#include <libpspp/misc.h>
-#include <libpspp/message.h>
-
-#include <output/tab.h>
-
-#include <output/charts/scree.h>
-#include <output/chart-item.h>
+#include "data/casegrouper.h"
+#include "data/casereader.h"
+#include "data/casewriter.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/procedure.h"
+#include "data/subcase.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/value-parser.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "math/correlation.h"
+#include "math/covariance.h"
+#include "math/moments.h"
+#include "output/chart-item.h"
+#include "output/charts/scree.h"
+#include "output/tab.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/stats/flip.c b/src/language/stats/flip.c
index 487417bab149c682fb16c2047d3d416da50e9ffd..534efb4919c05c64bbb31d1c0f9d50cd3f3f7635 100644 (file)
--- a/src/language/stats/flip.c
+++ b/src/language/stats/flip.c
@@ -22,29 +22,30 @@
 #include <limits.h>
 #include <stdlib.h>
 
-#include <data/case.h>
-#include <data/casereader.h>
-#include <data/casereader-provider.h>
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/settings.h>
-#include <data/short-names.h>
-#include <data/value.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/array.h>
-#include <libpspp/assertion.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <libpspp/pool.h>
-#include <libpspp/str.h>
-#include <data/data-in.h>
-#include <data/data-out.h>
-#include "intprops.h"
-#include "minmax.h"
-#include "xalloc.h"
+#include "data/case.h"
+#include "data/casereader.h"
+#include "data/casereader-provider.h"
+#include "data/dictionary.h"
+#include "data/procedure.h"
+#include "data/settings.h"
+#include "data/short-names.h"
+#include "data/value.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/array.h"
+#include "libpspp/assertion.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/pool.h"
+#include "libpspp/str.h"
+#include "data/data-in.h"
+#include "data/data-out.h"
+
+#include "gl/intprops.h"
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/stats/friedman.c b/src/language/stats/friedman.c
index 9950543f706c3c3ef16fedc179881b0767d87670..d853bd3907f299aa13829825364ab1384c1bcc6b 100644 (file)
--- a/src/language/stats/friedman.c
+++ b/src/language/stats/friedman.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis. -*-c-*-
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,20 +17,19 @@
 
 #include <config.h>
 
-#include "friedman.h"
+#include "language/stats/friedman.h"
 
 #include <gsl/gsl_cdf.h>
 #include <math.h>
 
-#include <data/format.h>
-
-#include <libpspp/misc.h>
-#include <libpspp/message.h>
-#include <data/procedure.h>
-#include <data/casereader.h>
-#include <data/dictionary.h>
-#include <data/variable.h>
-
+#include "data/casereader.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/procedure.h"
+#include "data/variable.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "output/tab.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -213,7 +212,6 @@ friedman_execute (const struct dataset *ds,
 
 \f
 
-#include <output/tab.h>
 
 static void
 show_ranks_box (const struct one_sample_test *ost, const struct friedman *fr)

diff --git a/src/language/stats/friedman.h b/src/language/stats/friedman.h
index 22154c9cf5d52a1f39cb0ca137d204dddb4fd93a..d6cf0036cf8341886108ef55f39affb8b686586b 100644 (file)
--- a/src/language/stats/friedman.h
+++ b/src/language/stats/friedman.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,9 +19,7 @@
 
 #include <stddef.h>
 #include <stdbool.h>
-#include <language/stats/npar.h>
-
-
+#include "language/stats/npar.h"
 
 struct friedman_test
 {

diff --git a/src/language/stats/glm.c b/src/language/stats/glm.c
index 862f49cea24300a7f4f158e72933cf8e613b0165..ba75a8e4f4ff4c844a56afbbb0511b2ad1025bec 100644 (file)
--- a/src/language/stats/glm.c
+++ b/src/language/stats/glm.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,38 +16,31 @@
 
 #include <config.h>
 
-#include <data/case.h>
-#include <data/casegrouper.h>
-#include <data/casereader.h>
-
-#include <math/covariance.h>
-#include <math/categoricals.h>
-#include <math/moments.h>
-#include <gsl/gsl_matrix.h>
-#include <linreg/sweep.h>
-
-#include <libpspp/ll.h>
-
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <language/lexer/value-parser.h>
-#include <language/command.h>
-
-#include <data/procedure.h>
-#include <data/value.h>
-#include <data/dictionary.h>
-
-#include <language/dictionary/split-file.h>
-#include <libpspp/taint.h>
-#include <libpspp/misc.h>
-
 #include <gsl/gsl_cdf.h>
+#include <gsl/gsl_matrix.h>
 #include <math.h>
-#include <data/format.h>
-
-#include <libpspp/message.h>
 
-#include <output/tab.h>
+#include "data/case.h"
+#include "data/casegrouper.h"
+#include "data/casereader.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/procedure.h"
+#include "data/value.h"
+#include "language/command.h"
+#include "language/dictionary/split-file.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/value-parser.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/ll.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/taint.h"
+#include "linreg/sweep.h"
+#include "math/categoricals.h"
+#include "math/covariance.h"
+#include "math/moments.h"
+#include "output/tab.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/stats/kruskal-wallis.c b/src/language/stats/kruskal-wallis.c
index ea8fe8ceebdf5c01c8de67a94dc7a1eb7fba5a3b..ae388068cf9877c055219bc7d51505781c2b2955 100644 (file)
--- a/src/language/stats/kruskal-wallis.c
+++ b/src/language/stats/kruskal-wallis.c
@@ -1,5 +1,5 @@
 /* Pspp - a program for statistical analysis.
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,23 +22,22 @@
 #include <gsl/gsl_cdf.h>
 #include <math.h>
 
-#include <data/casereader.h>
-#include <data/casewriter.h>
-#include <data/dictionary.h>
-#include <data/format.h>
-#include <data/procedure.h>
-#include <data/subcase.h>
-#include <data/variable.h>
+#include "data/casereader.h"
+#include "data/casewriter.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/procedure.h"
+#include "data/subcase.h"
+#include "data/variable.h"
+#include "libpspp/assertion.h"
+#include "libpspp/hmap.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "math/sort.h"
+#include "output/tab.h"
 
-#include <libpspp/assertion.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <libpspp/hmap.h>
-#include <math/sort.h>
-
-
-#include "minmax.h"
-#include "xalloc.h"
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 
 
 /* Returns true iff the independent variable lies in the range [nst->val1, nst->val2] */
@@ -224,7 +223,6 @@ kruskal_wallis_execute (const struct dataset *ds,
 }
 
 \f
-#include <output/tab.h>
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/stats/kruskal-wallis.h b/src/language/stats/kruskal-wallis.h
index 6194759dd4a84757c5727c47df63ad96699f897a..b067d3fdb258a7225b2680655a67a7a24cee2aa3 100644 (file)
--- a/src/language/stats/kruskal-wallis.h
+++ b/src/language/stats/kruskal-wallis.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,9 +19,8 @@
 
 #include <stddef.h>
 #include <stdbool.h>
-#include <language/stats/npar.h>
-#include <data/case.h>
-
+#include "data/case.h"
+#include "language/stats/npar.h"
 
 struct kruskal_wallis_test
 {

diff --git a/src/language/stats/mann-whitney.c b/src/language/stats/mann-whitney.c
index eafafdd9503147ea22e9f0c542ca058da43b98c1..4db82f8e904be5d7bf2a18460b319bc1b37717a1 100644 (file)
--- a/src/language/stats/mann-whitney.c
+++ b/src/language/stats/mann-whitney.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,20 +16,20 @@
 
 #include <config.h>
 
-#include "mann-whitney.h"
+#include "language/stats/mann-whitney.h"
 
 #include <gsl/gsl_cdf.h>
 
-#include <libpspp/cast.h>
-#include <libpspp/misc.h>
-
-#include <math/sort.h>
-#include <data/case.h>
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/casereader.h>
-#include <data/format.h>
-#include <data/variable.h>
+#include "data/case.h"
+#include "data/casereader.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/procedure.h"
+#include "data/variable.h"
+#include "libpspp/cast.h"
+#include "libpspp/misc.h"
+#include "math/sort.h"
+#include "output/tab.h"
 
 /* Calculates the adjustment necessary for tie compensation */
 static void
@@ -147,7 +147,6 @@ mann_whitney_execute (const struct dataset *ds,
 
 \f
 
-#include <output/tab.h>
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/stats/mann-whitney.h b/src/language/stats/mann-whitney.h
index 00da9f870ded6496efbbc587788689a683e8625c..aad691c60dae095ec49caad5e2e30d0c30ec81df 100644 (file)
--- a/src/language/stats/mann-whitney.h
+++ b/src/language/stats/mann-whitney.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 
 #include <stddef.h>
 #include <stdbool.h>
-#include <language/stats/npar.h>
+#include "language/stats/npar.h"
 
 
 struct mann_whitney_test

diff --git a/src/language/stats/npar-summary.c b/src/language/stats/npar-summary.c
index 2341761fd7df3e7e144da7c14b2311bd76a55440..e1870f62fd28f962979f79aff4498633feb13606 100644 (file)
--- a/src/language/stats/npar-summary.c
+++ b/src/language/stats/npar-summary.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,16 +16,19 @@
 
 #include <config.h>
 
-#include <data/format.h>
-#include <output/tab.h>
-#include <data/casereader.h>
-#include <data/variable.h>
-#include "npar-summary.h"
-#include <math/moments.h>
-#include <data/case.h>
-#include <data/dictionary.h>
+#include "language/stats/npar-summary.h"
+
 #include <math.h>
-#include <minmax.h>
+
+#include "data/case.h"
+#include "data/casereader.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/variable.h"
+#include "math/moments.h"
+#include "output/tab.h"
+
+#include "gl/minmax.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/stats/npar-summary.h b/src/language/stats/npar-summary.h
index a8b12797c1c8b6667de481a41c5f05644a6a08d7..a78d1b7e2a22c7241f84b37d74b4fe85100b401d 100644 (file)
--- a/src/language/stats/npar-summary.h
+++ b/src/language/stats/npar-summary.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,6 +17,8 @@
 #if !n_par_summary_h
 #define n_par_summary_h 1
 
+#include "data/missing-values.h"
+
 struct variable ;
 struct casereader ;
 struct dictionary;

diff --git a/src/language/stats/npar.c b/src/language/stats/npar.c
index 3f2bae298ef45669cd6331f896c160d0988ff465..3a178b233dddbcfae06d8559d01587c4a589231b 100644 (file)
--- a/src/language/stats/npar.c
+++ b/src/language/stats/npar.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis. -*-c-*-
-   Copyright (C) 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,44 +16,44 @@
 
 #include <config.h>
 
-#include <language/stats/npar.h>
-#include "npar-summary.h"
+#include "language/stats/npar.h"
 
 #include <stdlib.h>
 #include <math.h>
 
-#include "xalloc.h"
-
-#include <data/case.h>
-#include <data/casegrouper.h>
-#include <data/casereader.h>
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/settings.h>
-#include <data/variable.h>
-#include <libpspp/array.h>
-#include <libpspp/assertion.h>
-#include <libpspp/cast.h>
-#include <libpspp/hmapx.h>
-#include <libpspp/hash-functions.h>
-#include <libpspp/message.h>
-#include <libpspp/pool.h>
-#include <libpspp/str.h>
-#include <libpspp/taint.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <language/lexer/value-parser.h>
-#include <language/stats/binomial.h>
-#include <language/stats/chisquare.h>
-#include <language/stats/cochran.h>
-#include <language/stats/runs.h>
-#include <language/stats/friedman.h>
-#include <language/stats/kruskal-wallis.h>
-#include <language/stats/mann-whitney.h>
-#include <language/stats/wilcoxon.h>
-#include <language/stats/sign.h>
-#include <math/moments.h>
+#include "data/case.h"
+#include "data/casegrouper.h"
+#include "data/casereader.h"
+#include "data/dictionary.h"
+#include "data/procedure.h"
+#include "data/settings.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/value-parser.h"
+#include "language/lexer/variable-parser.h"
+#include "language/stats/binomial.h"
+#include "language/stats/chisquare.h"
+#include "language/stats/cochran.h"
+#include "language/stats/friedman.h"
+#include "language/stats/kruskal-wallis.h"
+#include "language/stats/mann-whitney.h"
+#include "language/stats/npar-summary.h"
+#include "language/stats/runs.h"
+#include "language/stats/sign.h"
+#include "language/stats/wilcoxon.h"
+#include "libpspp/array.h"
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "libpspp/hash-functions.h"
+#include "libpspp/hmapx.h"
+#include "libpspp/message.h"
+#include "libpspp/pool.h"
+#include "libpspp/str.h"
+#include "libpspp/taint.h"
+#include "math/moments.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/stats/npar.h b/src/language/stats/npar.h
index af093ffb9993d4711387bc5542ac5a72c5b87d00..367cf65d3bb2a07ac6a97f3e9646120d11ed7171 100644 (file)
--- a/src/language/stats/npar.h
+++ b/src/language/stats/npar.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,8 +19,8 @@
 
 #include <stddef.h>
 #include <stdbool.h>
-#include <data/missing-values.h>
-#include <data/value.h>
+#include "data/missing-values.h"
+#include "data/value.h"
 
 typedef const struct variable *variable_pair[2];
 

diff --git a/src/language/stats/oneway.c b/src/language/stats/oneway.c
index 0a2b8e719d03064d83bcc16cf47b72f5cf63de83..e2d39910558291d3cb505aab9b3dd4bf78b01e08 100644 (file)
--- a/src/language/stats/oneway.c
+++ b/src/language/stats/oneway.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,40 +16,32 @@
 
 #include <config.h>
 
-#include <data/case.h>
-#include <data/casegrouper.h>
-#include <data/casereader.h>
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/value.h>
-
-
-#include <math/covariance.h>
-#include <math/categoricals.h>
-#include <math/levene.h>
-#include <math/moments.h>
-#include <gsl/gsl_matrix.h>
-#include <linreg/sweep.h>
-
-#include <libpspp/ll.h>
-
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <language/lexer/value-parser.h>
-#include <language/command.h>
-
-
-#include <language/dictionary/split-file.h>
-#include <libpspp/taint.h>
-#include <libpspp/misc.h>
-
-#include <output/tab.h>
-
 #include <gsl/gsl_cdf.h>
+#include <gsl/gsl_matrix.h>
 #include <math.h>
-#include <data/format.h>
 
-#include <libpspp/message.h>
+#include "data/case.h"
+#include "data/casegrouper.h"
+#include "data/casereader.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/procedure.h"
+#include "data/value.h"
+#include "language/command.h"
+#include "language/dictionary/split-file.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/value-parser.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/ll.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/taint.h"
+#include "linreg/sweep.h"
+#include "math/categoricals.h"
+#include "math/covariance.h"
+#include "math/levene.h"
+#include "math/moments.h"
+#include "output/tab.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/stats/rank.q b/src/language/stats/rank.q
index f53ef2d01475a8c76040615898449e51f554f301..49a040e3ae0c7facbb87258cf21c8f108e4973b0 100644 (file)
--- a/src/language/stats/rank.q
+++ b/src/language/stats/rank.q
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2005, 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,28 +16,27 @@
 
 #include <config.h>
 
+#include <gsl/gsl_cdf.h>
 #include <limits.h>
 #include <math.h>
 
-#include <data/case.h>
-#include <data/casegrouper.h>
-#include <data/casereader.h>
-#include <data/casewriter.h>
-#include <data/dictionary.h>
-#include <data/format.h>
-#include <data/missing-values.h>
-#include <data/procedure.h>
-#include <data/short-names.h>
-#include <data/subcase.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/stats/sort-criteria.h>
-#include <libpspp/compiler.h>
-#include <libpspp/taint.h>
-#include <math/sort.h>
-#include <output/tab.h>
-
-#include <gsl/gsl_cdf.h>
+#include "data/case.h"
+#include "data/casegrouper.h"
+#include "data/casereader.h"
+#include "data/casewriter.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/missing-values.h"
+#include "data/procedure.h"
+#include "data/short-names.h"
+#include "data/subcase.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/stats/sort-criteria.h"
+#include "libpspp/compiler.h"
+#include "libpspp/taint.h"
+#include "math/sort.h"
+#include "output/tab.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/stats/regression.q b/src/language/stats/regression.q
index b879cae90871658313ac47b76b270474ec6119a3..5ca581d8e14c7301ed4ff79b5df5c15bf3105ab5 100644 (file)
--- a/src/language/stats/regression.q
+++ b/src/language/stats/regression.q
@@ -21,26 +21,27 @@
 #include <gsl/gsl_vector.h>
 #include <math.h>
 #include <stdlib.h>
-#include <data/case.h>
-#include <data/casegrouper.h>
-#include <data/casereader.h>
-#include <data/dictionary.h>
-#include <data/missing-values.h>
-#include <data/procedure.h>
-#include <data/transformations.h>
-#include <data/value-labels.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/dictionary/split-file.h>
-#include <language/data-io/file-handle.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/compiler.h>
-#include <libpspp/message.h>
-#include <libpspp/taint.h>
-#include <math/covariance.h>
-#include <math/linreg.h>
-#include <math/moments.h>
-#include <output/tab.h>
+
+#include "data/case.h"
+#include "data/casegrouper.h"
+#include "data/casereader.h"
+#include "data/dictionary.h"
+#include "data/missing-values.h"
+#include "data/procedure.h"
+#include "data/transformations.h"
+#include "data/value-labels.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/data-io/file-handle.h"
+#include "language/dictionary/split-file.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/compiler.h"
+#include "libpspp/message.h"
+#include "libpspp/taint.h"
+#include "math/covariance.h"
+#include "math/linreg.h"
+#include "math/moments.h"
+#include "output/tab.h"
 
 #include "gl/intprops.h"
 #include "gl/xalloc.h"

diff --git a/src/language/stats/reliability.c b/src/language/stats/reliability.c
index 3633b3dd8937e048e4062c3f1ae20df5d0c229b4..92f4ac1c22b8a8730a41e3f891a59603b2250527 100644 (file)
--- a/src/language/stats/reliability.c
+++ b/src/language/stats/reliability.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,26 +18,21 @@
 
 #include <math.h>
 
-#include <libpspp/misc.h>
-
-#include <libpspp/str.h>
-#include <libpspp/message.h>
-
-
-#include <data/procedure.h>
-#include <data/missing-values.h>
-#include <data/casereader.h>
-#include <data/casegrouper.h>
-#include <data/dictionary.h>
-#include <data/format.h>
-
-#include <language/lexer/variable-parser.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-
-#include <math/moments.h>
-#include <output/tab.h>
-#include <output/text-item.h>
+#include "data/casegrouper.h"
+#include "data/casereader.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/missing-values.h"
+#include "data/procedure.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
+#include "math/moments.h"
+#include "output/tab.h"
+#include "output/text-item.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/stats/roc.c b/src/language/stats/roc.c
index 22e4acb6fa161621ea2748eb5c33268a7b04e7b0..b07a58d118f6fdd876ddeec8b300300a3ff0b595 100644 (file)
--- a/src/language/stats/roc.c
+++ b/src/language/stats/roc.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,27 +16,27 @@
 
 #include <config.h>
 
-#include <language/stats/roc.h>
-
-#include <data/casegrouper.h>
-#include <data/casereader.h>
-#include <data/casewriter.h>
-#include <data/dictionary.h>
-#include <data/format.h>
-#include <data/procedure.h>
-#include <data/subcase.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/value-parser.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/misc.h>
-#include <math/sort.h>
-#include <output/chart-item.h>
-#include <output/charts/roc-chart.h>
-#include <output/tab.h>
+#include "language/stats/roc.h"
 
 #include <gsl/gsl_cdf.h>
 
+#include "data/casegrouper.h"
+#include "data/casereader.h"
+#include "data/casewriter.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/procedure.h"
+#include "data/subcase.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/value-parser.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/misc.h"
+#include "math/sort.h"
+#include "output/chart-item.h"
+#include "output/charts/roc-chart.h"
+#include "output/tab.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid

diff --git a/src/language/stats/runs.c b/src/language/stats/runs.c
index cbabcd24542eaef1e1f8b7028c1b473c01956d93..73fbb735df2f26eb5180cf626fbc6d17c9458b59 100644 (file)
--- a/src/language/stats/runs.c
+++ b/src/language/stats/runs.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis. -*-c-*-
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,25 +17,24 @@
 
 #include <config.h>
 
-#include "runs.h"
+#include "language/stats/runs.h"
 
 #include <gsl/gsl_cdf.h>
 #include <math.h>
 
-#include <data/format.h>
-
-#include <libpspp/misc.h>
-#include <libpspp/message.h>
-#include <data/procedure.h>
-#include <data/casereader.h>
-#include <data/casewriter.h>
-#include <data/casegrouper.h>
-#include <data/dictionary.h>
-#include <data/subcase.h>
-#include <data/variable.h>
-#include <math/percentiles.h>
-#include <math/sort.h>
-
+#include "data/format.h"
+#include "libpspp/misc.h"
+#include "libpspp/message.h"
+#include "data/procedure.h"
+#include "data/casereader.h"
+#include "data/casewriter.h"
+#include "data/casegrouper.h"
+#include "data/dictionary.h"
+#include "data/subcase.h"
+#include "data/variable.h"
+#include "math/percentiles.h"
+#include "math/sort.h"
+#include "output/tab.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
@@ -303,7 +302,6 @@ runs_execute (const struct dataset *ds,
 }
 
 \f
-#include <output/tab.h>
 
 static void
 show_runs_result (const struct runs_test *rt, const struct run_state *rs, const struct dictionary *dict)

diff --git a/src/language/stats/runs.h b/src/language/stats/runs.h
index b50afde3837f818e8f5a74acd37de948b4a28413..8dbce96cd5bbfc0debc5af11ccafdb3fd45ba0a5 100644 (file)
--- a/src/language/stats/runs.h
+++ b/src/language/stats/runs.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 
 #include <stddef.h>
 #include <stdbool.h>
-#include <language/stats/npar.h>
+#include "language/stats/npar.h"
 
 enum cp_mode
   {

diff --git a/src/language/stats/sign.c b/src/language/stats/sign.c
index 3848911313ed62721eff29b20d6fd9bdf14ca6e9..45973262d986cdf3eb28a0c2651dc532c864f317 100644 (file)
--- a/src/language/stats/sign.c
+++ b/src/language/stats/sign.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,22 +15,24 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include "sign.h"
 
-#include <data/variable.h>
-#include <libpspp/str.h>
-#include <output/tab.h>
+#include "language/stats/sign.h"
+
 #include <gsl/gsl_cdf.h>
 #include <gsl/gsl_randist.h>
-#include "npar.h"
-#include <data/procedure.h>
-#include <data/missing-values.h>
-#include <data/dictionary.h>
-#include <data/casereader.h>
-#include <data/format.h>
-
-#include "minmax.h"
-#include "xalloc.h"
+
+#include "data/casereader.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/missing-values.h"
+#include "data/procedure.h"
+#include "data/variable.h"
+#include "language/stats/npar.h"
+#include "libpspp/str.h"
+#include "output/tab.h"
+
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/stats/sign.h b/src/language/stats/sign.h
index 1404e00685da0e8acecb2ccf8818f1cd7cfa0879..d23b8351aef999885ea83e7138513a8153b1da9d 100644 (file)
--- a/src/language/stats/sign.h
+++ b/src/language/stats/sign.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 
 
 #include <stdbool.h>
-#include <data/missing-values.h>
+#include "data/missing-values.h"
 
 struct casereader;
 struct dataset;

diff --git a/src/language/stats/sort-cases.c b/src/language/stats/sort-cases.c
index 8998120addee90db4de6b6fcb2a038c2f262b30f..1134874da5b5034fc54b932cb153ef5818d4aeeb 100644 (file)
--- a/src/language/stats/sort-cases.c
+++ b/src/language/stats/sort-cases.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,21 +17,21 @@
 #include <config.h>
 
 #include <assert.h>
-#include <stdlib.h>
 #include <limits.h>
-
-#include "sort-criteria.h"
-#include <data/procedure.h>
-#include <data/settings.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/message.h>
-#include <data/subcase.h>
-#include <math/sort.h>
+#include <stdlib.h>
 #include <sys/types.h>
 
-#include "xalloc.h"
+#include "data/procedure.h"
+#include "data/settings.h"
+#include "data/subcase.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "language/stats/sort-criteria.h"
+#include "libpspp/message.h"
+#include "math/sort.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/stats/sort-criteria.c b/src/language/stats/sort-criteria.c
index 649760235432fc4222ed70fed7353d7e815a0027..b8bdbd06f85b658808e7cfd6126a9350b845ab00 100644 (file)
--- a/src/language/stats/sort-criteria.c
+++ b/src/language/stats/sort-criteria.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,16 +16,16 @@
 
 #include <config.h>
 
-#include <language/stats/sort-criteria.h>
+#include "language/stats/sort-criteria.h"
 
 #include <stdlib.h>
 
-#include <data/dictionary.h>
-#include <data/subcase.h>
-#include <data/variable.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/message.h>
+#include "data/dictionary.h"
+#include "data/subcase.h"
+#include "data/variable.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/message.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/stats/t-test.q b/src/language/stats/t-test.q
index 9bfa4f975d5c3ce399d511fdd26c47796d2b8dfc..3cd921ebff69b9a66d651df4c8b061d0413775a6 100644 (file)
--- a/src/language/stats/t-test.q
+++ b/src/language/stats/t-test.q
@@ -22,34 +22,34 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include <data/case.h>
-#include <data/casegrouper.h>
-#include <data/casereader.h>
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/value-labels.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/dictionary/split-file.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/value-parser.h>
-#include <libpspp/array.h>
-#include <libpspp/assertion.h>
-#include <libpspp/compiler.h>
-#include <libpspp/hash.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <libpspp/str.h>
-#include <libpspp/taint.h>
-#include <math/group-proc.h>
-#include <math/levene.h>
-#include <math/correlation.h>
-#include <output/tab.h>
-#include <data/format.h>
-
-#include "minmax.h"
-#include "xalloc.h"
-#include "xmemdup0.h"
+#include "data/case.h"
+#include "data/casegrouper.h"
+#include "data/casereader.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/procedure.h"
+#include "data/value-labels.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/dictionary/split-file.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/value-parser.h"
+#include "libpspp/array.h"
+#include "libpspp/assertion.h"
+#include "libpspp/compiler.h"
+#include "libpspp/hash.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
+#include "libpspp/taint.h"
+#include "math/correlation.h"
+#include "math/group-proc.h"
+#include "math/levene.h"
+#include "output/tab.h"
+
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
+#include "gl/xmemdup0.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/stats/wilcoxon.c b/src/language/stats/wilcoxon.c
index 268296d7e6ee404f2a6657d7970ec385628ff05e..19c3a403b74dd4c5f9b252aaaf96deff6f63dc4a 100644 (file)
--- a/src/language/stats/wilcoxon.c
+++ b/src/language/stats/wilcoxon.c
@@ -1,5 +1,5 @@
 /* Pspp - a program for statistical analysis.
-   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,27 +18,27 @@
 
 #include <config.h>
 
-#include "wilcoxon.h"
+#include "language/stats/wilcoxon.h"
 
 #include <gsl/gsl_cdf.h>
 #include <math.h>
 
-#include <data/casereader.h>
-#include <data/casewriter.h>
-#include <data/dictionary.h>
-#include <data/format.h>
-#include <data/procedure.h>
-#include <data/subcase.h>
-#include <data/variable.h>
-#include <libpspp/assertion.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <math/sort.h>
-#include <math/wilcoxon-sig.h>
-#include <output/tab.h>
-
-#include "minmax.h"
-#include "xalloc.h"
+#include "data/casereader.h"
+#include "data/casewriter.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/procedure.h"
+#include "data/subcase.h"
+#include "data/variable.h"
+#include "libpspp/assertion.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "math/sort.h"
+#include "math/wilcoxon-sig.h"
+#include "output/tab.h"
+
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 
 static double
 append_difference (const struct ccase *c, casenumber n UNUSED, void *aux)

diff --git a/src/language/stats/wilcoxon.h b/src/language/stats/wilcoxon.h
index b0f86a2c9062abe99bff257db2f74f36859ef33f..1650badd00aef45f97c513f6d3c9a5c2a99ceeec 100644 (file)
--- a/src/language/stats/wilcoxon.h
+++ b/src/language/stats/wilcoxon.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,9 +19,9 @@
 
 #include <stddef.h>
 #include <stdbool.h>
-#include <language/stats/npar.h>
-#include <data/case.h>
 
+#include "data/case.h"
+#include "language/stats/npar.h"
 
 struct rank_sum
 {

diff --git a/src/language/syntax-file.c b/src/language/syntax-file.c
index 97f73fd6fca44f344a163be35038d7d77aa55754..c5636088ce4c04d4f528b3bf27c4555bb1533d80 100644 (file)
--- a/src/language/syntax-file.c
+++ b/src/language/syntax-file.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,37 +16,33 @@
 
 #include <config.h>
 
-#include "syntax-file.h"
+#include "language/syntax-file.h"
 
 #include <stdio.h>
 #include <errno.h>
 #include <stdint.h>
 #include <stdlib.h>
 
-#include <data/file-name.h>
-#include <data/settings.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/assertion.h>
-#include <libpspp/cast.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
-#include <libpspp/version.h>
-#include <output/tab.h>
-
-#include <libpspp/ll.h>
-
-#include "prompt.h"
-
-#include "xalloc.h"
+#include "data/file-name.h"
+#include "data/settings.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "language/prompt.h"
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "libpspp/getl.h"
+#include "libpspp/ll.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+#include "libpspp/version.h"
+#include "output/tab.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <libpspp/getl.h>
-
-
 struct syntax_file_source
   {
     struct getl_interface parent ;

diff --git a/src/language/syntax-string-source.c b/src/language/syntax-string-source.c
index c40a221c3608db31e6f2f9e4e304693c9cb6c137..1d3d4d6b738c30b5c6df5c481dd0b8a912287304 100644 (file)
--- a/src/language/syntax-string-source.c
+++ b/src/language/syntax-string-source.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical interface for PSPP.
-   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,16 +17,16 @@
 
 #include <config.h>
 
-#include <libpspp/cast.h>
-#include <libpspp/getl.h>
-#include <libpspp/compiler.h>
-#include <libpspp/str.h>
+#include "language/syntax-string-source.h"
 
 #include <stdlib.h>
 
-#include "syntax-string-source.h"
+#include "libpspp/cast.h"
+#include "libpspp/getl.h"
+#include "libpspp/compiler.h"
+#include "libpspp/str.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 struct syntax_string_source
   {

diff --git a/src/language/tests/format-guesser-test.c b/src/language/tests/format-guesser-test.c
index c95ea35f00cf5db60b5c8917a9d35a04f838b03a..b5dbe6d623ade6860ee4df8248cc4801d2b8ef92 100644 (file)
--- a/src/language/tests/format-guesser-test.c
+++ b/src/language/tests/format-guesser-test.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2008, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,11 +18,11 @@
 
 #include <stdio.h>
 
-#include <data/format.h>
-#include <data/format-guesser.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/message.h>
+#include "data/format.h"
+#include "data/format-guesser.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/message.h"
 
 /* Executes the DEBUG FORMAT GUESSER command. */
 int

diff --git a/src/language/tests/moments-test.c b/src/language/tests/moments-test.c
index f5fc858dd4d2b130f0af647f14ad7483e92dc311..f6499cb81ccddd0c027000d50c0c9d7161e4eba1 100644 (file)
--- a/src/language/tests/moments-test.c
+++ b/src/language/tests/moments-test.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,16 +15,19 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include <stdio.h>
-#include "gettext.h"
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <math/moments.h>
+
 #include <math.h>
+#include <stdio.h>
 #include <stdlib.h>
-#include "xalloc.h"
-#include <libpspp/compiler.h>
 
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/compiler.h"
+#include "math/moments.h"
+
+#include "gl/xalloc.h"
+
+#include "gettext.h"
 #define _(msgid) gettext (msgid)
 
 static bool

diff --git a/src/language/tests/paper-size.c b/src/language/tests/paper-size.c
index 4dbd94600a454a437225d7c5aa96eb51bf90ab4c..660fe9c7a8c5e4e08373cd6b38518c9390664381 100644 (file)
--- a/src/language/tests/paper-size.c
+++ b/src/language/tests/paper-size.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,11 +18,11 @@
 
 #include <stdio.h>
 
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/assertion.h>
-#include <libpspp/string-map.h>
-#include <output/measure.h>
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/assertion.h"
+#include "libpspp/string-map.h"
+#include "output/measure.h"
 
 /* Executes the DEBUG PAPER SIZE command. */
 int

diff --git a/src/language/tests/pool-test.c b/src/language/tests/pool-test.c
index df91f1ae70aa19271239e97711e16cf658fcaf3a..9bfcad0001560c55f9aa5e8abaff448188722e96 100644 (file)
--- a/src/language/tests/pool-test.c
+++ b/src/language/tests/pool-test.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,14 +15,16 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include <libpspp/pool.h>
-#include <language/command.h>
+
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 
+#include "libpspp/pool.h"
+#include "language/command.h"
+
 #define N_ITERATIONS 8192
 #define N_FILES 16
 

diff --git a/src/language/utilities/cd.c b/src/language/utilities/cd.c
index 220164f0b420069480580ff481c4c467f692b610..90a1bcf8db6a8ca71ac63167a8d898207ec4cb70 100644 (file)
--- a/src/language/utilities/cd.c
+++ b/src/language/utilities/cd.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2008, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,12 +15,14 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include <language/command.h>
-#include <libpspp/message.h>
+
 #include <errno.h>
-#include <language/lexer/lexer.h>
 #include <unistd.h>
 
+#include "language/command.h"
+#include "libpspp/message.h"
+#include "language/lexer/lexer.h"
+
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 

diff --git a/src/language/utilities/date.c b/src/language/utilities/date.c
index f465eb37b5a4d8028ffa6e0abff62fa9926b4ee5..80a09c21f5b4d8aaf1e2437f8b1ea8c2a0ba5614 100644 (file)
--- a/src/language/utilities/date.c
+++ b/src/language/utilities/date.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,9 +15,10 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include <language/command.h>
-#include <libpspp/message.h>
-#include <language/lexer/lexer.h>
+
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/message.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/utilities/include.c b/src/language/utilities/include.c
index f152684d41f73c6ba2091262ab368f3da7526c50..e326134de01e3a11de7a154e4cff1f31c42eac10 100644 (file)
--- a/src/language/utilities/include.c
+++ b/src/language/utilities/include.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2007, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2007, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,16 +22,16 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <data/file-name.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <language/syntax-file.h>
-#include <libpspp/getl.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
+#include "data/file-name.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "language/syntax-file.h"
+#include "libpspp/getl.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
 
-#include "dirname.h"
-#include "xalloc.h"
+#include "gl/dirname.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/utilities/permissions.c b/src/language/utilities/permissions.c
index ad9ffe751732037db38dfc2297cdde2bc58a6886..83fa820c562d3be6473ef70afa49dd95a5b6ecc6 100644 (file)
--- a/src/language/utilities/permissions.c
+++ b/src/language/utilities/permissions.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,17 +16,18 @@
 
 #include <config.h>
 
+#include <errno.h>
 #include <stdlib.h>
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
-#include <errno.h>
-#include <data/settings.h>
-#include <language/command.h>
-#include <libpspp/message.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/misc.h>
-#include <libpspp/str.h>
+
+#include "data/settings.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/utilities/set.q b/src/language/utilities/set.q
index 552747066740c53f3111b5521e1a96dafa4a9202..9837d2cc6bbe7d4d57c701bcfc6121df5fba054d 100644 (file)
--- a/src/language/utilities/set.q
+++ b/src/language/utilities/set.q
@@ -21,26 +21,26 @@
 #include <stdlib.h>
 #include <time.h>
 
-#include <data/data-in.h>
-#include <data/data-out.h>
-#include <data/dictionary.h>
-#include <data/format.h>
-#include <data/procedure.h>
-#include <data/settings.h>
-#include <data/value.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/lexer/format-parser.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/compiler.h>
-#include <libpspp/copyleft.h>
-#include <libpspp/float-format.h>
-#include <libpspp/integer-format.h>
-#include <libpspp/message.h>
-#include <libpspp/i18n.h>
-#include <math/random.h>
-#include <output/driver.h>
-#include <output/journal.h>
+#include "data/data-in.h"
+#include "data/data-out.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/procedure.h"
+#include "data/settings.h"
+#include "data/value.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/format-parser.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/compiler.h"
+#include "libpspp/copyleft.h"
+#include "libpspp/float-format.h"
+#include "libpspp/i18n.h"
+#include "libpspp/integer-format.h"
+#include "libpspp/message.h"
+#include "math/random.h"
+#include "output/driver.h"
+#include "output/journal.h"
 
 #if HAVE_LIBTERMCAP
 #if HAVE_TERMCAP_H

diff --git a/src/language/utilities/title.c b/src/language/utilities/title.c
index 82f7be50f5341b5b8cdddf69d0aba116dbafd302..9d5b8261619c0a39c3d318bf8134933c4008422c 100644 (file)
--- a/src/language/utilities/title.c
+++ b/src/language/utilities/title.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2007, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2007, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,17 +19,17 @@
 #include <ctype.h>
 #include <stdlib.h>
 
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/message.h>
-#include <libpspp/start-date.h>
-#include <libpspp/version.h>
-#include <output/text-item.h>
-
-#include "xalloc.h"
+#include "data/dictionary.h"
+#include "data/procedure.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/message.h"
+#include "libpspp/start-date.h"
+#include "libpspp/version.h"
+#include "output/text-item.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/xforms/compute.c b/src/language/xforms/compute.c
index 442c15a4964d7118bf5d125bb6a640053c722d6d..5089d80ded1b13abd40b6e94041ae9d7f4a0873d 100644 (file)
--- a/src/language/xforms/compute.c
+++ b/src/language/xforms/compute.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,20 +19,20 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-#include <data/case.h>
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/transformations.h>
-#include <data/variable.h>
-#include <data/vector.h>
-#include <language/command.h>
-#include <language/expressions/public.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/message.h>
-#include <libpspp/misc.h>
-#include <libpspp/str.h>
-
-#include "xalloc.h"
+#include "data/case.h"
+#include "data/dictionary.h"
+#include "data/procedure.h"
+#include "data/transformations.h"
+#include "data/variable.h"
+#include "data/vector.h"
+#include "language/command.h"
+#include "language/expressions/public.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/message.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/xforms/count.c b/src/language/xforms/count.c
index 550db8a5315e454fde88f775b19002c2cee77a92..172a5e2c6d19238f692beb29c0d6388304a42eed 100644 (file)
--- a/src/language/xforms/count.c
+++ b/src/language/xforms/count.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,21 +18,21 @@
 
 #include <stdlib.h>
 
-#include <data/case.h>
-#include <data/dictionary.h>
-#include <data/procedure.h>
-#include <data/transformations.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/value-parser.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/compiler.h>
-#include <libpspp/message.h>
-#include <libpspp/pool.h>
-#include <libpspp/str.h>
-
-#include "xalloc.h"
+#include "data/case.h"
+#include "data/dictionary.h"
+#include "data/procedure.h"
+#include "data/transformations.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/value-parser.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/compiler.h"
+#include "libpspp/message.h"
+#include "libpspp/pool.h"
+#include "libpspp/str.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/xforms/sample.c b/src/language/xforms/sample.c
index 6fbc758c2e1329f41d57d626daa9eb8ca75b495a..693f84477e51476f41770299d4207cd1a8b5478a 100644 (file)
--- a/src/language/xforms/sample.c
+++ b/src/language/xforms/sample.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,16 +21,16 @@
 #include <stdio.h>
 #include <math.h>
 
-#include <data/procedure.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/lexer/lexer.h>
-#include <libpspp/compiler.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
-#include <math/random.h>
+#include "data/procedure.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/lexer/lexer.h"
+#include "libpspp/compiler.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+#include "math/random.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/language/xforms/select-if.c b/src/language/xforms/select-if.c
index 74edf2d0da0b78fa2896392fea1e26edd1bfadaf..4240f63b47b94e2f79a972c4954e2275c457ab38 100644 (file)
--- a/src/language/xforms/select-if.c
+++ b/src/language/xforms/select-if.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,18 +18,18 @@
 
 #include <stdlib.h>
 
-#include <data/dictionary.h>
-#include <data/transformations.h>
-#include <data/procedure.h>
-#include <data/variable.h>
-#include <language/command.h>
-#include <language/expressions/public.h>
-#include <language/lexer/lexer.h>
-#include <language/lexer/variable-parser.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
-
-#include "xalloc.h"
+#include "data/dictionary.h"
+#include "data/procedure.h"
+#include "data/transformations.h"
+#include "data/variable.h"
+#include "language/command.h"
+#include "language/expressions/public.h"
+#include "language/lexer/lexer.h"
+#include "language/lexer/variable-parser.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/libpspp/abt.c b/src/libpspp/abt.c
index b776612922f2579b290f3a3657f12adb8efee0fe..c06047b4abdbb8e128910a17049f972893abd295 100644 (file)
--- a/src/libpspp/abt.c
+++ b/src/libpspp/abt.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -28,12 +28,12 @@
 #include <config.h>
 #endif
 
-#include <libpspp/abt.h>
-#include <libpspp/cast.h>
+#include "libpspp/abt.h"
 
 #include <stdbool.h>
 
-#include <libpspp/assertion.h>
+#include "libpspp/cast.h"
+#include "libpspp/assertion.h"
 
 static struct abt_node **down_link (struct abt *, struct abt_node *);
 static struct abt_node *skew (struct abt *, struct abt_node *);

diff --git a/src/libpspp/abt.h b/src/libpspp/abt.h
index 24d7268a2d6543a383361c50914d796e52e7b6c1..fa9d0dc87d6b7112a856cbe6666046a6013a9077 100644 (file)
--- a/src/libpspp/abt.h
+++ b/src/libpspp/abt.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -150,7 +150,7 @@
    tree paper.  */
 
 #include <stddef.h>
-#include <libpspp/cast.h>
+#include "libpspp/cast.h"
 
 /* Returns the data structure corresponding to the given NODE,
    assuming that NODE is embedded as the given MEMBER name in

diff --git a/src/libpspp/argv-parser.c b/src/libpspp/argv-parser.c
index dfa86fad5b70d201671f6f5dcbf8192e12e6a722..c72c250394864091bb8bcd3458cb8bfae413c2c1 100644 (file)
--- a/src/libpspp/argv-parser.c
+++ b/src/libpspp/argv-parser.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,14 +16,14 @@
 
 #include <config.h>
 
-#include <libpspp/argv-parser.h>
+#include "libpspp/argv-parser.h"
 
 #include <limits.h>
 
-#include <libpspp/assertion.h>
-#include <libpspp/str.h>
+#include "libpspp/assertion.h"
+#include "libpspp/str.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 struct argv_option_plus
   {

diff --git a/src/libpspp/array.c b/src/libpspp/array.c
index f82bce913012bb3f7e30cb816713428021e4faa6..a0ac943af66bc8fceffce5ca8babcd7d3d5dbfe6 100644 (file)
--- a/src/libpspp/array.c
+++ b/src/libpspp/array.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -90,10 +90,10 @@
 #include <limits.h>
 #include <stdlib.h>
 #include <string.h>
-#include <libpspp/assertion.h>
+#include "libpspp/assertion.h"
 
-#include "xalloc.h"
-#include "minmax.h"
+#include "gl/xalloc.h"
+#include "gl/minmax.h"
 \f
 /* Finds an element in ARRAY, which contains COUNT elements of
    SIZE bytes each, using COMPARE for comparisons.  Returns the

diff --git a/src/libpspp/bt.c b/src/libpspp/bt.c
index 997083b1a08fb64271098f1342a126b9ebd0fe6b..4178d1475af769810a3f193d3af3d1afb5c48797 100644 (file)
--- a/src/libpspp/bt.c
+++ b/src/libpspp/bt.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -61,13 +61,13 @@
 #include <config.h>
 #endif
 
-#include <libpspp/bt.h>
+#include "libpspp/bt.h"
 
 #include <limits.h>
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <libpspp/cast.h>
+#include "libpspp/cast.h"
 
 static void rebalance_subtree (struct bt *, struct bt_node *, size_t);
 

diff --git a/src/libpspp/bt.h b/src/libpspp/bt.h
index 0ee29898e8263eeb434d8987192157c771fbb19a..41fc5d44b0a3bc27ee23277ea2fc5abb27764398 100644 (file)
--- a/src/libpspp/bt.h
+++ b/src/libpspp/bt.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include <libpspp/cast.h>
+#include "libpspp/cast.h"
 
 /* Returns the data structure corresponding to the given NODE,
    assuming that NODE is embedded as the given MEMBER name in

diff --git a/src/libpspp/deque.c b/src/libpspp/deque.c
index d34d6c625a8791bcbaf1213018c6215e3c847ff2..732f09da82d371735340580e79b39bf216793a2c 100644 (file)
--- a/src/libpspp/deque.c
+++ b/src/libpspp/deque.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,11 +16,12 @@
 
 #include <config.h>
 
-#include <libpspp/deque.h>
+#include "libpspp/deque.h"
+
 #include <string.h>
 
-#include "minmax.h"
-#include "xalloc.h"
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 
 /* Initializes DEQUE as an empty deque with an initial capacity
    of zero. */

diff --git a/src/libpspp/deque.h b/src/libpspp/deque.h
index cdb6abd32628b73f53781ad480485423c2e8044d..151308013cf560a72cd31f670f144d1a97f53297 100644 (file)
--- a/src/libpspp/deque.h
+++ b/src/libpspp/deque.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -66,7 +66,7 @@
 #include <stddef.h>
 #include <stdlib.h>
 
-#include <libpspp/assertion.h>
+#include "libpspp/assertion.h"
 
 /* A deque implemented as a circular buffer. */
 struct deque

diff --git a/src/libpspp/float-format.c b/src/libpspp/float-format.c
index 0450dbeacc1d2573f35230b611a93db12b6ea7bd..4ba4c9375b6efd410f5362b6e48209838e7688ab 100644 (file)
--- a/src/libpspp/float-format.c
+++ b/src/libpspp/float-format.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,18 +16,18 @@
 
 #include <config.h>
 
-#include <libpspp/float-format.h>
+#include "libpspp/float-format.h"
 
+#include <byteswap.h>
 #include <ctype.h>
 #include <inttypes.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <libpspp/assertion.h>
-#include <libpspp/integer-format.h>
+#include "libpspp/assertion.h"
+#include "libpspp/integer-format.h"
 
-#include "error.h"
-#include <byteswap.h>
+#include "gl/error.h"
 \f
 /* Neutral intermediate representation for binary floating-point numbers. */
 struct fp

diff --git a/src/libpspp/float-format.h b/src/libpspp/float-format.h
index b2af548f3986c0004b4ea34e7621639447e4bd40..9cabf9bf2e228c0db8be76526096bc3c1694e4ba 100644 (file)
--- a/src/libpspp/float-format.h
+++ b/src/libpspp/float-format.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include <libpspp/compiler.h>
+#include "libpspp/compiler.h"
 
 /* A floating-point format. */
 enum float_format

diff --git a/src/libpspp/getl.h b/src/libpspp/getl.h
index 47dea27e4285be8e1d13e85a934d3e2424427b2f..c7d0967f0feef57906a9d53845c4e087b7229832 100644 (file)
--- a/src/libpspp/getl.h
+++ b/src/libpspp/getl.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 #define GETL_H 1
 
 #include <stdbool.h>
-#include <libpspp/ll.h>
+#include "libpspp/ll.h"
 
 struct string;
 

diff --git a/src/libpspp/hash-functions.c b/src/libpspp/hash-functions.c
index af8b4c2c83a68f51423a2e934ed483f6fffa3f1f..96ff282c85d7fc9684672cd840a5ea1cca33afe8 100644 (file)
--- a/src/libpspp/hash-functions.c
+++ b/src/libpspp/hash-functions.c
@@ -15,7 +15,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include <libpspp/hash-functions.h>
+
+#include "libpspp/hash-functions.h"
+
 #include <assert.h>
 #include <ctype.h>
 #include <math.h>

diff --git a/src/libpspp/hash.h b/src/libpspp/hash.h
index e586bcc0c18d1ae79242dc5a6ba42068db5b1f63..3281c0e273b0eabac518f71ed66ca4ddc9d2578b 100644 (file)
--- a/src/libpspp/hash.h
+++ b/src/libpspp/hash.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 
 #include <stddef.h>
 #include <stdbool.h>
-#include <libpspp/hash-functions.h>
+#include "libpspp/hash-functions.h"
 
 typedef int hsh_compare_func (const void *, const void *, const void *aux);
 typedef unsigned hsh_hash_func (const void *, const void *aux);

diff --git a/src/libpspp/heap.c b/src/libpspp/heap.c
index 30abcdc46d7fe5e7f960f98a9d14f507d9394c44..ace8e4c1ce7565c24661e4bd3e9dfaf7bb3a7f82 100644 (file)
--- a/src/libpspp/heap.c
+++ b/src/libpspp/heap.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,11 +18,11 @@
 #include <config.h>
 #endif
 
-#include <libpspp/heap.h>
-#include <libpspp/pool.h>
-#include <libpspp/assertion.h>
+#include "libpspp/heap.h"
+#include "libpspp/pool.h"
+#include "libpspp/assertion.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 /* A heap. */
 struct heap

diff --git a/src/libpspp/heap.h b/src/libpspp/heap.h
index 3a3c516a03485ab7e4a5ecac923719c3425c4ee0..c24c763277d53fde92c03f3e8360fc90e509f61d 100644 (file)
--- a/src/libpspp/heap.h
+++ b/src/libpspp/heap.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -70,7 +70,7 @@
 #ifndef LIBPSPP_HEAP_H
 #define LIBPSPP_HEAP_H 1
 
-#include <libpspp/cast.h>
+#include "libpspp/cast.h"
 #include <stdbool.h>
 #include <stddef.h>
 

diff --git a/src/libpspp/hmap.c b/src/libpspp/hmap.c
index 9050cc08f5571a6f2e8908201444d834a96a6398..4436f8dfca1375f89ced27f907a2cdeeb2b52111 100644 (file)
--- a/src/libpspp/hmap.c
+++ b/src/libpspp/hmap.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,11 +18,12 @@
 #include <config.h>
 #endif
 
-#include <libpspp/hmap.h>
+#include "libpspp/hmap.h"
+
 #include <assert.h>
 #include <stdlib.h>
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 static size_t capacity_to_mask (size_t capacity);
 

diff --git a/src/libpspp/hmap.h b/src/libpspp/hmap.h
index 095edf104674ba0af56b2a2da7d0bb4687807c0d..2776c6c8b0c840f1649a5c7f891caff8bd8d334d 100644 (file)
--- a/src/libpspp/hmap.h
+++ b/src/libpspp/hmap.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -117,7 +117,7 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include <libpspp/cast.h>
+#include "libpspp/cast.h"
 
 /* Returns the data structure corresponding to the given NODE,
    assuming that NODE is embedded as the given MEMBER name in

diff --git a/src/libpspp/hmapx.h b/src/libpspp/hmapx.h
index 2fe7f9f770b21c7224182270dc87609ed7a0a104..345836192a2195e682343f3eb1b3c5127743f35d 100644 (file)
--- a/src/libpspp/hmapx.h
+++ b/src/libpspp/hmapx.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -115,7 +115,7 @@
        }
    */
 
-#include <libpspp/hmap.h>
+#include "libpspp/hmap.h"
 #include <stdlib.h>
 
 /* Hash table node. */

diff --git a/src/libpspp/integer-format.c b/src/libpspp/integer-format.c
index 2d8a72efe68569d015e67a62b3a851e19c7a8121..c248e0ff042b8c765ebe5724d3aa82d7e278a76c 100644 (file)
--- a/src/libpspp/integer-format.c
+++ b/src/libpspp/integer-format.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 #include <config.h>
 
-#include <libpspp/integer-format.h>
+#include "libpspp/integer-format.h"
 
 #include <assert.h>
 

diff --git a/src/libpspp/integer-format.h b/src/libpspp/integer-format.h
index 8649bf0c390f3f80982fd628a46a0807130d5681..e888292f27d0214ab19fc746c7650777f882067a 100644 (file)
--- a/src/libpspp/integer-format.h
+++ b/src/libpspp/integer-format.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 #include <byteswap.h>
 #include <stdint.h>
 
-#include <libpspp/str.h>
+#include "libpspp/str.h"
 
 /* An integer format. */
 enum integer_format

diff --git a/src/libpspp/ll.c b/src/libpspp/ll.c
index e6533f2cd25fccf5beb2cbf9a4da31c279022027..21f8dd8870a2fc96b48ccfd49c228aeb7bc3db21 100644 (file)
--- a/src/libpspp/ll.c
+++ b/src/libpspp/ll.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -28,7 +28,8 @@
 #include <config.h>
 #endif
 
-#include <libpspp/ll.h>
+#include "libpspp/ll.h"
+
 #include <assert.h>
 
 /* Returns the number of nodes in LIST (not counting the null

diff --git a/src/libpspp/ll.h b/src/libpspp/ll.h
index f59736f1e71c7d3d88990f4a8702405558abe8cf..9e6e35f04ad72ee4af7264883cf080bc49359ad0 100644 (file)
--- a/src/libpspp/ll.h
+++ b/src/libpspp/ll.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -50,7 +50,7 @@
 #include <assert.h>
 #include <stdbool.h>
 #include <stddef.h>
-#include <libpspp/cast.h>
+#include "libpspp/cast.h"
 
 /* Embedded, circular doubly linked list.
 

diff --git a/src/libpspp/llx.c b/src/libpspp/llx.c
index 905850bc41c13ec74be83289e0571c0972f464dc..3a0cbf60fce154cc7c5c88e390741236ae38cc80 100644 (file)
--- a/src/libpspp/llx.c
+++ b/src/libpspp/llx.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -28,8 +28,8 @@
 #include <config.h>
 #endif
 
-#include <libpspp/llx.h>
-#include "compiler.h"
+#include "libpspp/llx.h"
+#include "libpspp/compiler.h"
 #include <assert.h>
 #include <stdlib.h>
 

diff --git a/src/libpspp/llx.h b/src/libpspp/llx.h
index 2aa18e7ba5694bced71cbe32a3feb69700e23f9b..80a8a838063e3c2a3e05963c11030f4d141f5803 100644 (file)
--- a/src/libpspp/llx.h
+++ b/src/libpspp/llx.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -49,7 +49,7 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include <libpspp/ll.h>
+#include "libpspp/ll.h"
 
 /* External, circular doubly linked list.
 

diff --git a/src/libpspp/message.c b/src/libpspp/message.c
index 409499301e4f68d343a29287672ef8d69e8d2496..c7b56e0a8d3a1b680571244a835b680355eace7f 100644 (file)
--- a/src/libpspp/message.c
+++ b/src/libpspp/message.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,8 +16,8 @@
 
 #include <config.h>
 
-#include "message.h"
-#include "msg-locator.h"
+#include "libpspp/message.h"
+#include "libpspp/msg-locator.h"
 
 #include <assert.h>
 #include <stdarg.h>
@@ -26,9 +26,9 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <libpspp/str.h>
-#include <libpspp/version.h>
-#include <data/settings.h>
+#include "data/settings.h"
+#include "libpspp/str.h"
+#include "libpspp/version.h"
 
 #include "gl/progname.h"
 #include "gl/xalloc.h"

diff --git a/src/libpspp/message.h b/src/libpspp/message.h
index fad7816f19b0c57804248010203fbbda35feb512..7c59847f4aac760e2d7ad32abee7da3f97d5f080 100644 (file)
--- a/src/libpspp/message.h
+++ b/src/libpspp/message.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 
 #include <stdarg.h>
 #include <stdbool.h>
-#include <libpspp/compiler.h>
+#include "libpspp/compiler.h"
 
 /* What kind of message is this? */
 enum msg_category

diff --git a/src/libpspp/model-checker.c b/src/libpspp/model-checker.c
index 0e73fec651110f2330c0e807fadbc766d5825a9e..e0a0f71a62706891145c01966d4dacff94530d53 100644 (file)
--- a/src/libpspp/model-checker.c
+++ b/src/libpspp/model-checker.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 #include <config.h>
 
-#include <libpspp/model-checker.h>
+#include "libpspp/model-checker.h"
 
 #include <limits.h>
 #include <signal.h>
@@ -26,16 +26,16 @@
 #include <string.h>
 #include <sys/time.h>
 
-#include <libpspp/argv-parser.h>
-#include <libpspp/bit-vector.h>
-#include <libpspp/compiler.h>
-#include <libpspp/deque.h>
-#include <libpspp/misc.h>
-#include <libpspp/str.h>
+#include "libpspp/argv-parser.h"
+#include "libpspp/bit-vector.h"
+#include "libpspp/compiler.h"
+#include "libpspp/deque.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
 
-#include "error.h"
-#include "minmax.h"
-#include "xalloc.h"
+#include "gl/error.h"
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 \f
 /* Initializes PATH as an empty path. */
 void

diff --git a/src/libpspp/model-checker.h b/src/libpspp/model-checker.h
index a7372f8d3faf6066435064372c3279eedc970031..be97d389bcc7219c8dd325e02900f829b2082077 100644 (file)
--- a/src/libpspp/model-checker.h
+++ b/src/libpspp/model-checker.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -298,7 +298,7 @@
 #include <stdio.h>
 #include <sys/time.h>
 
-#include <libpspp/compiler.h>
+#include "libpspp/compiler.h"
 
 /* An active model checking run. */
 struct mc;

diff --git a/src/libpspp/msg-locator.c b/src/libpspp/msg-locator.c
index fb8082e9217f6d7d4614b35e9a347761e8ad356a..d29f35db9375cca79dfe6a572f0ad55fd87fd15f 100644 (file)
--- a/src/libpspp/msg-locator.c
+++ b/src/libpspp/msg-locator.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,14 +15,17 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
+
+#include "libpspp/msg-locator.h"
+
 #include <stdlib.h>
-#include "msg-locator.h"
-#include <libpspp/assertion.h>
-#include <libpspp/cast.h>
-#include <libpspp/message.h>
-#include "getl.h"
 
-#include "xalloc.h"
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "libpspp/message.h"
+#include "libpspp/getl.h"
+
+#include "gl/xalloc.h"
 
 /* File locator stack. */
 static const struct msg_locator **file_loc;

diff --git a/src/libpspp/range-map.c b/src/libpspp/range-map.c
index 0d6ce8263078674b321898ac4a38e6533a54d77a..2af9405a869393e2ca7a7ab852348a98e2d5ab7d 100644 (file)
--- a/src/libpspp/range-map.c
+++ b/src/libpspp/range-map.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,10 +16,10 @@
 
 #include <config.h>
 
-#include <libpspp/range-map.h>
+#include "libpspp/range-map.h"
 
-#include <libpspp/assertion.h>
-#include <libpspp/compiler.h>
+#include "libpspp/assertion.h"
+#include "libpspp/compiler.h"
 
 static struct range_map_node *bt_to_range_map_node (const struct bt_node *);
 static int compare_range_map_nodes (const struct bt_node *,

diff --git a/src/libpspp/range-map.h b/src/libpspp/range-map.h
index 024fe93790e507a052e14e4990152b9b17c7ea91..2d4b5ade334fcdad52a00f1b46b6aa37f9e7b6ec 100644 (file)
--- a/src/libpspp/range-map.h
+++ b/src/libpspp/range-map.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -32,8 +32,8 @@
 
 #include <stdbool.h>
 
-#include <libpspp/bt.h>
-#include <libpspp/cast.h>
+#include "libpspp/bt.h"
+#include "libpspp/cast.h"
 
 /* Returns the data structure corresponding to the given NODE,
    assuming that NODE is embedded as the given MEMBER name in

diff --git a/src/libpspp/range-set.c b/src/libpspp/range-set.c
index cd17fe02a4e2130544d5d37687cf46210ff2de39..ed7b3f5edb6a50f4220b8a3d9c372cdd05bdc373 100644 (file)
--- a/src/libpspp/range-set.c
+++ b/src/libpspp/range-set.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,17 +23,17 @@
 
 #include <config.h>
 
-#include <libpspp/range-set.h>
+#include "libpspp/range-set.h"
 
 #include <limits.h>
 #include <stdlib.h>
 
-#include <libpspp/assertion.h>
-#include <libpspp/compiler.h>
-#include <libpspp/pool.h>
+#include "libpspp/assertion.h"
+#include "libpspp/compiler.h"
+#include "libpspp/pool.h"
 
-#include "minmax.h"
-#include "xalloc.h"
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 
 static int compare_range_set_nodes (const struct bt_node *,
                                     const struct bt_node *,

diff --git a/src/libpspp/range-set.h b/src/libpspp/range-set.h
index ee7dac23137d3c39b392b13cb11c7d560c71fc79..9e665e994efae8d079cc0166129568779c9bdfb2 100644 (file)
--- a/src/libpspp/range-set.h
+++ b/src/libpspp/range-set.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,8 +25,8 @@
 #define LIBPSPP_RANGE_SET_H
 
 #include <stdbool.h>
-#include <libpspp/bt.h>
-#include <libpspp/cast.h>
+#include "libpspp/bt.h"
+#include "libpspp/cast.h"
 
 /* A set of ranges. */
 struct range_set

diff --git a/src/libpspp/sparse-array.c b/src/libpspp/sparse-array.c
index 5babbc125fafb9cf4e3f3c737d74a36cd337501c..65a4612259f7e0510feb8cb55bbd7e619ce3e1d5 100644 (file)
--- a/src/libpspp/sparse-array.c
+++ b/src/libpspp/sparse-array.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,18 +16,18 @@
 
 #include <config.h>
 
-#include <libpspp/sparse-array.h>
+#include "libpspp/sparse-array.h"
 
 #include <limits.h>
 #include <string.h>
 
-#include <libpspp/assertion.h>
-#include <libpspp/cast.h>
-#include <libpspp/misc.h>
-#include <libpspp/pool.h>
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "libpspp/misc.h"
+#include "libpspp/pool.h"
 
-#include "count-one-bits.h"
-#include "minmax.h"
+#include "gl/count-one-bits.h"
+#include "gl/minmax.h"
 
 /* Sparse array data structure.
 

diff --git a/src/libpspp/sparse-xarray.c b/src/libpspp/sparse-xarray.c
index 69c2ef28a7e3c5f83e60f4c864b35bf3b351ae7f..f839b0f2a8c6581c13f9a61feda56c0deb9263e8 100644 (file)
--- a/src/libpspp/sparse-xarray.c
+++ b/src/libpspp/sparse-xarray.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,22 +16,22 @@
 
 #include <config.h>
 
-#include <libpspp/sparse-xarray.h>
+#include "libpspp/sparse-xarray.h"
 
 #include <limits.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include <libpspp/assertion.h>
-#include <libpspp/ext-array.h>
-#include <libpspp/misc.h>
-#include <libpspp/range-set.h>
-#include <libpspp/sparse-array.h>
+#include "libpspp/assertion.h"
+#include "libpspp/ext-array.h"
+#include "libpspp/misc.h"
+#include "libpspp/range-set.h"
+#include "libpspp/sparse-array.h"
 
-#include "md4.h"
-#include "minmax.h"
-#include "xalloc.h"
+#include "gl/md4.h"
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 
 /* A sparse array of arrays of bytes. */
 struct sparse_xarray

diff --git a/src/libpspp/string-map.c b/src/libpspp/string-map.c
index 48124797ba570af9cdd70b61230295dc160749ce..e67ed470283d6ee7e34e14257ed86656863af460 100644 (file)
--- a/src/libpspp/string-map.c
+++ b/src/libpspp/string-map.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,13 +16,13 @@
 
 #include <config.h>
 
-#include <libpspp/string-map.h>
+#include "libpspp/string-map.h"
 
 #include <stdlib.h>
 #include <string.h>
 
-#include <libpspp/hash-functions.h>
-#include <libpspp/string-set.h>
+#include "libpspp/hash-functions.h"
+#include "libpspp/string-set.h"
 
 #include "gl/xalloc.h"
 

diff --git a/src/libpspp/string-map.h b/src/libpspp/string-map.h
index f8ffabcffc1250bfdbdc428c511601937bdc6353..c29551bb1ff62b709eb7e876313faab45abd40c7 100644 (file)
--- a/src/libpspp/string-map.h
+++ b/src/libpspp/string-map.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
    key-value pairs. */
 
 #include <stdbool.h>
-#include <libpspp/hmap.h>
+#include "libpspp/hmap.h"
 
 struct string_set;
 

diff --git a/src/libpspp/string-set.c b/src/libpspp/string-set.c
index 3fd370db93877900504f6c4b693efe308af46044..d6a8012749652b40e4b675bcae623e9c3e536111 100644 (file)
--- a/src/libpspp/string-set.c
+++ b/src/libpspp/string-set.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,12 +19,12 @@
 
 #include <config.h>
 
-#include <libpspp/string-set.h>
+#include "libpspp/string-set.h"
 
 #include <stdlib.h>
 #include <string.h>
 
-#include <libpspp/hash-functions.h>
+#include "libpspp/hash-functions.h"
 
 #include "gl/xalloc.h"
 

diff --git a/src/libpspp/string-set.h b/src/libpspp/string-set.h
index a604e1513efe9179ff931a2f4bf0b2d8edf746d2..aad8cdb01d63d4408a6686d3bc33b706407d2d1d 100644 (file)
--- a/src/libpspp/string-set.h
+++ b/src/libpspp/string-set.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
    This is a convenient wrapper around a "struct hmap" for storing strings. */
 
 #include <stdbool.h>
-#include <libpspp/hmap.h>
+#include "libpspp/hmap.h"
 
 /* A node in the string set. */
 struct string_set_node

diff --git a/src/libpspp/stringi-map.h b/src/libpspp/stringi-map.h
index bc01e721cd92a735a7c06ff2a61e1f8bf699605c..1c4894b411bb8a8cae193635572756ccabf27e09 100644 (file)
--- a/src/libpspp/stringi-map.h
+++ b/src/libpspp/stringi-map.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
    key-value pairs. */
 
 #include <stdbool.h>
-#include <libpspp/hmap.h>
+#include "libpspp/hmap.h"
 
 struct string_set;
 struct stringi_set;

diff --git a/src/libpspp/stringi-set.h b/src/libpspp/stringi-set.h
index f438d048e3661555923a15cf6ad1c71e2c1efc86..2a000889ec1fa9a686a519dbb859a3355131f01b 100644 (file)
--- a/src/libpspp/stringi-set.h
+++ b/src/libpspp/stringi-set.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
    This is a convenient wrapper around a "struct hmap" for storing strings. */
 
 #include <stdbool.h>
-#include <libpspp/hmap.h>
+#include "libpspp/hmap.h"
 
 /* A node in the string set. */
 struct stringi_set_node

diff --git a/src/libpspp/taint.c b/src/libpspp/taint.c
index 4c1cecb97cdbbdbcdd2302e91f2741e7a68a8bc2..c655d60a61cf9009fae1043ee9833877625f2704 100644 (file)
--- a/src/libpspp/taint.c
+++ b/src/libpspp/taint.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,15 +16,15 @@
 
 #include <config.h>
 
-#include <libpspp/taint.h>
+#include "libpspp/taint.h"
 
 #include <stddef.h>
 
-#include <libpspp/array.h>
-#include <libpspp/assertion.h>
-#include <libpspp/cast.h>
+#include "libpspp/array.h"
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 /* This code maintains two invariants:
 

diff --git a/src/libpspp/tower.c b/src/libpspp/tower.c
index 9157987774e555c625d63af41a9343dc4447c574..863da820c3bf081ec1ed374d36a6411ceade7f9e 100644 (file)
--- a/src/libpspp/tower.c
+++ b/src/libpspp/tower.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,13 +16,13 @@
 
 #include <config.h>
 
-#include <libpspp/tower.h>
+#include "libpspp/tower.h"
 
 #include <limits.h>
 
-#include <libpspp/assertion.h>
-#include <libpspp/cast.h>
-#include <libpspp/compiler.h>
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "libpspp/compiler.h"
 
 static struct tower_node *abt_to_tower_node (const struct abt_node *);
 static struct tower_node *first_node (const struct tower *);

diff --git a/src/libpspp/tower.h b/src/libpspp/tower.h
index 9be8231c98ad7c9b0c7fc217a14a513d2813aa92..2ec5a0d820b354a91f19cfa1dd961f5407f52dc0 100644 (file)
--- a/src/libpspp/tower.h
+++ b/src/libpspp/tower.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -50,8 +50,8 @@
 #define LIBPSPP_TOWER_H
 
 #include <stdbool.h>
-#include <libpspp/abt.h>
-#include <libpspp/cast.h>
+#include "libpspp/abt.h"
+#include "libpspp/cast.h"
 
 /* Returns the data structure corresponding to the given NODE,
    assuming that NODE is embedded as the given MEMBER name in

diff --git a/src/math/box-whisker.c b/src/math/box-whisker.c
index de4124efe16c5beb799c7b5d0b2af42743ff79d7..2e4545906f9d558059a0950d9ad5a551adeaf7f3 100644 (file)
--- a/src/math/box-whisker.c
+++ b/src/math/box-whisker.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,18 +15,22 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
+
 #include "box-whisker.h"
-#include "order-stats.h"
-#include "tukey-hinges.h"
-#include <gl/xalloc.h>
-#include <libpspp/assertion.h>
-#include <libpspp/cast.h>
+
 #include <math.h>
 #include <float.h>
-#include <data/val-type.h>
-#include <libpspp/str.h>
-#include <data/case.h>
-#include <data/variable.h>
+
+#include "data/case.h"
+#include "data/val-type.h"
+#include "data/variable.h"
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "libpspp/str.h"
+#include "math/order-stats.h"
+#include "math/tukey-hinges.h"
+
+#include "gl/xalloc.h"
 
 static void
 destroy (struct statistic *s)

diff --git a/src/math/box-whisker.h b/src/math/box-whisker.h
index bef091e83b448dafc5c601fab3d04eb0d60f19f6..f6856d1e8a125783242b9a67ff8f9b8f5150eacb 100644 (file)
--- a/src/math/box-whisker.h
+++ b/src/math/box-whisker.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,9 +18,9 @@
 #define __MATH_BOX_WHISKER_H__
 
 #include <stddef.h>
-#include <libpspp/ll.h>
-#include <libpspp/str.h>
-#include "order-stats.h"
+#include "libpspp/ll.h"
+#include "libpspp/str.h"
+#include "math/order-stats.h"
 
 /* This module calculates the statistics typically displayed by box-plots.
    However, there's no reason not to use it for other purposes too.

diff --git a/src/math/categoricals.c b/src/math/categoricals.c
index 25de2cc6ea18a0d5240edb39d239a8959264686a..215f4d1fbc89ca5d406fae4a196bb4797e6cdac0 100644 (file)
--- a/src/math/categoricals.c
+++ b/src/math/categoricals.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,19 +16,19 @@
 
 #include <config.h>
 
-#include <stdio.h>
+#include "math/categoricals.h"
 
-#include "categoricals.h"
+#include <stdio.h>
 
-#include <gl/xalloc.h>
-#include <data/variable.h>
-#include <data/case.h>
-#include <data/value.h>
-#include <libpspp/hmap.h>
-#include <libpspp/pool.h>
-#include <libpspp/array.h>
+#include "data/case.h"
+#include "data/value.h"
+#include "data/variable.h"
+#include "libpspp/array.h"
+#include "libpspp/hmap.h"
+#include "libpspp/pool.h"
+#include "libpspp/str.h"
 
-#include <libpspp/str.h>
+#include "gl/xalloc.h"
 
 struct value_node
 {

diff --git a/src/math/categoricals.h b/src/math/categoricals.h
index 044722eed61cdfb96fac4eeb177982baeef24658..97cde65e74dda7f856674bb253eda6748d3ccb24 100644 (file)
--- a/src/math/categoricals.h
+++ b/src/math/categoricals.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 #define _CATEGORICALS__
 
 #include <stddef.h>
-#include <data/missing-values.h>
+#include "data/missing-values.h"
 
 struct categoricals;
 struct variable;

diff --git a/src/math/correlation.c b/src/math/correlation.c
index 47762747340974f815207389fb48b71a59bf3605..e7ebd1f52dbc94ac8469af1c23b68eefe715547d 100644 (file)
--- a/src/math/correlation.c
+++ b/src/math/correlation.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,13 +16,15 @@
 
 #include <config.h>
 
-#include "correlation.h"
+#include "math/correlation.h"
 
 #include <gsl/gsl_matrix.h>
 #include <gsl/gsl_cdf.h>
 #include <math.h>
-#include <libpspp/misc.h>
-#include "minmax.h"
+
+#include "libpspp/misc.h"
+
+#include "gl/minmax.h"
 
 
 double

diff --git a/src/math/covariance.c b/src/math/covariance.c
index b0b0b466676a58eb67311067dbba8f4aab2de413..446ee6621a1e11881c37e5dba04d8d645c1610a8 100644 (file)
--- a/src/math/covariance.c
+++ b/src/math/covariance.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,15 +16,18 @@
 
 #include <config.h>
 
-#include <libpspp/assertion.h>
-#include "covariance.h"
-#include <gl/xalloc.h>
-#include "moments.h"
+#include "math/covariance.h"
+
 #include <gsl/gsl_matrix.h>
-#include <data/case.h>
-#include <data/variable.h>
-#include <libpspp/misc.h>
-#include "categoricals.h"
+
+#include "data/case.h"
+#include "data/variable.h"
+#include "libpspp/assertion.h"
+#include "libpspp/misc.h"
+#include "math/categoricals.h"
+#include "math/moments.h"
+
+#include "gl/xalloc.h"
 
 #define n_MOMENTS (MOMENT_VARIANCE + 1)
 

diff --git a/src/math/covariance.h b/src/math/covariance.h
index f12e994d52fd6f89d33cbdcb9e5f46e4689d117c..4eb2f3f6483f0cc4a4edbdd865dd9c3b1dfd0c31 100644 (file)
--- a/src/math/covariance.h
+++ b/src/math/covariance.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,10 +18,9 @@
 #ifndef COVARIANCE_H
 #define COVARIANCE_H
 
-#include <stddef.h>
-
-#include <data/missing-values.h>
 #include <gsl/gsl_matrix.h>
+#include <stddef.h>
+#include "data/missing-values.h"
 
 struct covariance;
 struct variable;

diff --git a/src/math/extrema.c b/src/math/extrema.c
index 617c7ac72bb15ba646c2e9b7926188bcaa40bc04..7b82a5c4a0e4914d04c35d8c726209adadaaf9c9 100644 (file)
--- a/src/math/extrema.c
+++ b/src/math/extrema.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,14 +15,18 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include "extrema.h"
-#include <xalloc.h>
-#include <data/case.h>
-#include <data/val-type.h>
-#include <libpspp/compiler.h>
-#include <libpspp/ll.h>
+
+#include "math/extrema.h"
+
 #include <stdlib.h>
 
+#include "data/case.h"
+#include "data/val-type.h"
+#include "libpspp/compiler.h"
+#include "libpspp/ll.h"
+
+#include "gl/xalloc.h"
+
 struct extrema
 {
   size_t capacity;

diff --git a/src/math/extrema.h b/src/math/extrema.h
index d891c533c91824be90c37e5ea80ae90fac00424b..5c8fa6062e6118a1229a3c218b7925ae2372a977 100644 (file)
--- a/src/math/extrema.h
+++ b/src/math/extrema.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,8 +18,8 @@
 #define __EXTREMA_H__ 1
 
 #include <stddef.h>
-#include <data/case.h>
-#include <libpspp/ll.h>
+#include "data/case.h"
+#include "libpspp/ll.h"
 
 struct extremum
 {

diff --git a/src/math/group.c b/src/math/group.c
index fabd4db289b42a46eab8368b35d82fd3ea532bb6..6f86f87d61659800343a38ba090bf8d6472ddbe3 100644 (file)
--- a/src/math/group.c
+++ b/src/math/group.c
@@ -15,16 +15,19 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
+
+#include "math/group.h"
+
 #include <stdlib.h>
-#include <libpspp/compiler.h>
-#include <libpspp/hash.h>
-#include "group.h"
-#include "group-proc.h"
-#include <libpspp/str.h>
-#include <data/variable.h>
-#include <libpspp/misc.h>
-
-#include "xalloc.h"
+
+#include "data/variable.h"
+#include "libpspp/compiler.h"
+#include "libpspp/hash.h"
+#include "libpspp/misc.h"
+#include "libpspp/str.h"
+#include "math/group-proc.h"
+
+#include "gl/xalloc.h"
 
 void
 free_group (struct group_statistics *v, void *aux UNUSED)

diff --git a/src/math/group.h b/src/math/group.h
index 72f3cb5d7409334ffbe1abfa0dba54333396a13b..1e0b26724d0d2dc559966deb6b94c7984f7b7a3c 100644 (file)
--- a/src/math/group.h
+++ b/src/math/group.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 #ifndef GROUP_H
 #define GROUP_H
 
-#include <data/value.h>
+#include "data/value.h"
 
 /* Statistics for grouped data */
 struct group_statistics

diff --git a/src/math/histogram.c b/src/math/histogram.c
index 0c641b56e127ddbdf9a180363629101fad746b6c..1b55d204b866fa2e15dc4ff3f84d3b3a509a9915 100644 (file)
--- a/src/math/histogram.c
+++ b/src/math/histogram.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004, 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2008, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,16 +15,17 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include "histogram.h"
 
-#include <gl/xalloc.h>
-#include <libpspp/assertion.h>
-#include <libpspp/cast.h>
+#include "math/histogram.h"
 
 #include <gsl/gsl_histogram.h>
-#include "chart-geometry.h"
 #include <math.h>
 
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "math/chart-geometry.h"
+
+#include "gl/xalloc.h"
 
 void
 histogram_add (struct histogram *h, double y, double c)

diff --git a/src/math/histogram.h b/src/math/histogram.h
index bc4a5ae6c1354d9711a467ceba8cf904a875a8fa..4c0e54fb0488ae38cd931684f52e472476463303 100644 (file)
--- a/src/math/histogram.h
+++ b/src/math/histogram.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 
 #include <stddef.h>
 
-#include "statistic.h"
+#include "math/statistic.h"
 
 #include <gsl/gsl_histogram.h>
 

diff --git a/src/math/interaction.c b/src/math/interaction.c
index 2f8da8ccaaa1fd4619a73415a8ff888cd097d9ac..87f4836da23479ced8fa9a2069841ada800408d9 100644 (file)
--- a/src/math/interaction.c
+++ b/src/math/interaction.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -30,14 +30,18 @@
  */
 
 #include <config.h>
+
+#include "math/interaction.h"
+
 #include <assert.h>
-#include <data/dictionary.h>
-#include <data/value.h>
-#include <data/variable.h>
-#include <gl/unistr.h>
-#include <math/interaction.h>
 #include <string.h>
-#include <xalloc.h>
+#include <unistr.h>
+
+#include "data/dictionary.h"
+#include "data/value.h"
+#include "data/variable.h"
+
+#include "gl/xalloc.h"
 
 struct interaction_variable
 {

diff --git a/src/math/interaction.h b/src/math/interaction.h
index 995d0684517d78a8207e040121126b1ae63f473c..13b13690f9360114826b2deda1597f4c9e3a2ae1 100644 (file)
--- a/src/math/interaction.h
+++ b/src/math/interaction.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,7 +16,8 @@
 
 #ifndef INTERACTION_H
 #define INTERACTION_H
-#include <data/case.h>
+
+#include "data/case.h"
 
 struct interaction_variable;
 struct interaction_value;

diff --git a/src/math/levene.c b/src/math/levene.c
index d93673b8c9e7e4c6c60e34639686814baa6f3fb2..13fad93e52107ebe5a16ca826fbbedb06dbf8928 100644 (file)
--- a/src/math/levene.c
+++ b/src/math/levene.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2010 Free Software Foundation, Inc.
+   Copyright (C) 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,18 +16,15 @@
 
 #include <config.h>
 
-#include "levene.h"
+#include "math/levene.h"
 
 #include <math.h>
 
-#include <libpspp/misc.h>
-
-#include <data/case.h>
-#include <data/casereader.h>
-#include <data/variable.h>
-
-
-#include <libpspp/hmap.h>
+#include "data/case.h"
+#include "data/casereader.h"
+#include "data/variable.h"
+#include "libpspp/hmap.h"
+#include "libpspp/misc.h"
 
 struct lev
 {

diff --git a/src/math/linreg.c b/src/math/linreg.c
index 63d1a0f976ee420ca52b476e67aa85cd94ff4a5e..90c62a5258640fdfb9a1eeb8b29bd4164ba77d29 100644 (file)
--- a/src/math/linreg.c
+++ b/src/math/linreg.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2005, 2010 Free Software Foundation, Inc. 
+   Copyright (C) 2005, 2010, 2011 Free Software Foundation, Inc. 
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,17 +15,21 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
+
+#include "math/linreg.h"
+
 #include <gsl/gsl_blas.h>
 #include <gsl/gsl_cblas.h>
 #include <gsl/gsl_errno.h>
 #include <gsl/gsl_fit.h>
 #include <gsl/gsl_linalg.h>
 #include <gsl/gsl_multifit.h>
-#include <linreg/sweep.h>
-#include <math/linreg.h>
-#include <src/data/variable.h>
-#include <src/data/value.h>
-#include <gl/xalloc.h>
+
+#include "data/value.h"
+#include "data/variable.h"
+#include "linreg/sweep.h"
+
+#include "gl/xalloc.h"
 
 /*
   Find the least-squares estimate of b for the linear model:

diff --git a/src/math/linreg.h b/src/math/linreg.h
index 31bf5651051564774d0417571a99f929a562f270..32373f5ed484eceab55fc4b1df8cf019d03860cf 100644 (file)
--- a/src/math/linreg.h
+++ b/src/math/linreg.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2005 Free Software Foundation, Inc. Written by Jason H. Stover.
+   Copyright (C) 2005, 2011 Free Software Foundation, Inc. Written by Jason H. Stover.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,10 +16,11 @@
 
 #ifndef LINREG_H
 #define LINREG_H
-#include <stdbool.h>
+
 #include <gsl/gsl_math.h>
-#include <gsl/gsl_vector.h>
 #include <gsl/gsl_matrix.h>
+#include <gsl/gsl_vector.h>
+#include <stdbool.h>
 
 enum
 {

diff --git a/src/math/merge.c b/src/math/merge.c
index af44855ce1cbb7718dd18d48d459fc5cfe15fa8a..5b0704d9c26850518041ad52f6457b23344b1952 100644 (file)
--- a/src/math/merge.c
+++ b/src/math/merge.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,17 +19,17 @@
    performance regression. */
 #include <config.h>
 
-#include <math/merge.h>
+#include "math/merge.h"
 
-#include <data/case.h>
-#include <data/casereader.h>
-#include <data/casewriter.h>
-#include <data/subcase.h>
-#include <libpspp/array.h>
-#include <libpspp/assertion.h>
-#include <libpspp/taint.h>
+#include "data/case.h"
+#include "data/casereader.h"
+#include "data/casewriter.h"
+#include "data/subcase.h"
+#include "libpspp/array.h"
+#include "libpspp/assertion.h"
+#include "libpspp/taint.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 #define MAX_MERGE_ORDER 7
 

diff --git a/src/math/moments.c b/src/math/moments.c
index 545c9644399a9501765455cfc99505be30e8d460..e289e8aec0ef27c2372e2c007eeb30e6b2f6d469 100644 (file)
--- a/src/math/moments.c
+++ b/src/math/moments.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,15 +15,18 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include "moments.h"
+
+#include "math/moments.h"
+
 #include <assert.h>
 #include <math.h>
 #include <stdlib.h>
-#include <libpspp/misc.h>
-#include <data/val-type.h>
-#include <data/value.h>
 
-#include "xalloc.h"
+#include "data/val-type.h"
+#include "data/value.h"
+#include "libpspp/misc.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/math/moments.h b/src/math/moments.h
index 23457ce67f3771c0654099b3adea9dfe16f3a586..55c517e5217864cda1a1607485c8347d1c1bbf1f 100644 (file)
--- a/src/math/moments.h
+++ b/src/math/moments.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 #define HEADER_MOMENTS
 
 #include <stddef.h>
-#include <data/value.h>
+#include "data/value.h"
 
 /* Moments of the mean.
    Higher-order moments have higher values. */

diff --git a/src/math/np.c b/src/math/np.c
index b631820903e6ebf4e41a536ebe7ea964924af918..ccaa51e22d24a0e96a91996f7f597df547d3c6ce 100644 (file)
--- a/src/math/np.c
+++ b/src/math/np.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,20 +15,21 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include "np.h"
+
+#include "math/np.h"
 
 #include <gsl/gsl_cdf.h>
 #include <math.h>
 #include <stdlib.h>
 
-#include <data/case.h>
-#include <data/casewriter.h>
-#include <libpspp/compiler.h>
-#include <libpspp/cast.h>
-#include <libpspp/misc.h>
-#include <math/moments.h>
+#include "data/case.h"
+#include "data/casewriter.h"
+#include "libpspp/cast.h"
+#include "libpspp/compiler.h"
+#include "libpspp/misc.h"
+#include "math/moments.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 static void
 destroy (struct statistic *stat)

diff --git a/src/math/order-stats.c b/src/math/order-stats.c
index 9f54e8730c9bfda7ce738b5311df3016f3c9cdbf..be9c49a3122171b6f1eee792a802e080ab2f4150 100644 (file)
--- a/src/math/order-stats.c
+++ b/src/math/order-stats.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,14 +15,18 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include "order-stats.h"
-#include <libpspp/assertion.h>
-#include <data/val-type.h>
-#include <gl/xalloc.h>
-#include <data/variable.h>
-#include <data/casereader.h>
+
+#include "math/order-stats.h"
+
 #include <string.h>
 
+#include "data/casereader.h"
+#include "data/val-type.h"
+#include "data/variable.h"
+#include "libpspp/assertion.h"
+
+#include "gl/xalloc.h"
+
 #if 0
 
 #include <stdio.h>

diff --git a/src/math/order-stats.h b/src/math/order-stats.h
index 07da284aa26af9faa95df9872d00163092471686..f3e470e652c32ad0020e38a88bcb4bfbf45bdc24 100644 (file)
--- a/src/math/order-stats.h
+++ b/src/math/order-stats.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2008, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,8 +18,8 @@
 #define __ORDER_STATS_H__
 
 #include <stddef.h>
-#include <data/missing-values.h>
-#include <math/statistic.h>
+#include "data/missing-values.h"
+#include "math/statistic.h"
 
 struct casereader;
 struct variable;

diff --git a/src/math/percentiles.c b/src/math/percentiles.c
index c76bb492ba767a90ffa2c03c8d35bf8a7d532ab6..ed7b129576f1f7d6b713f46af75ef77aeab3dbf8 100644 (file)
--- a/src/math/percentiles.c
+++ b/src/math/percentiles.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,22 +15,22 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include "percentiles.h"
-#include <math/order-stats.h>
 
+#include "math/percentiles.h"
+
+#include "data/casereader.h"
+#include "data/val-type.h"
+#include "data/variable.h"
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "math/order-stats.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
-#include <libpspp/assertion.h>
-#include <libpspp/cast.h>
-#include <data/val-type.h>
-#include <gl/xalloc.h>
-#include <data/variable.h>
-#include <data/casereader.h>
-
-
 const char *const ptile_alg_desc[] = {
   "",
   N_("HAverage"),

diff --git a/src/math/sort.c b/src/math/sort.c
index 5b82277cb7b255f25c1663b6bbc1167f8bae72f9..3491a20bfd684abae50fe88f2f232d0bbe04a3e4 100644 (file)
--- a/src/math/sort.c
+++ b/src/math/sort.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,21 +16,21 @@
 
 #include <config.h>
 
-#include "sort.h"
+#include "math/sort.h"
 
 #include <stdio.h>
 
-#include <data/case.h>
-#include <data/casereader.h>
-#include <data/casewriter.h>
-#include <data/casewriter-provider.h>
-#include <data/settings.h>
-#include <data/subcase.h>
-#include <libpspp/array.h>
-#include <libpspp/assertion.h>
-#include <math/merge.h>
-
-#include "xalloc.h"
+#include "data/case.h"
+#include "data/casereader.h"
+#include "data/casewriter-provider.h"
+#include "data/casewriter.h"
+#include "data/settings.h"
+#include "data/subcase.h"
+#include "libpspp/array.h"
+#include "libpspp/assertion.h"
+#include "math/merge.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/math/trimmed-mean.c b/src/math/trimmed-mean.c
index d1cc6b708279098ab8d263b95923d9b31c968ed6..5e48689626817ddf59ad46363a17e1d0e763084d 100644 (file)
--- a/src/math/trimmed-mean.c
+++ b/src/math/trimmed-mean.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,15 +15,17 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include "trimmed-mean.h"
-#include <math/order-stats.h>
 
-#include <gl/xalloc.h>
-#include <libpspp/assertion.h>
-#include <libpspp/cast.h>
+#include "math/trimmed-mean.h"
+
 #include <math.h>
-#include <data/val-type.h>
 
+#include "data/val-type.h"
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "math/order-stats.h"
+
+#include "gl/xalloc.h"
 
 static void
 acc (struct statistic *s, const struct ccase *cx UNUSED, double c, double cc, double y)

diff --git a/src/math/ts/innovations.c b/src/math/ts/innovations.c
index 3ab2f3edce165ed0a709688e711867986683eee3..ba2120fb4e6bc735f41d300b5aef406be5c2828d 100644 (file)
--- a/src/math/ts/innovations.c
+++ b/src/math/ts/innovations.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -27,17 +27,18 @@
 
 #include <config.h>
 
-#include <math.h>
-#include <stdlib.h>
+#include "math/ts/innovations.h"
 
 #include <gsl/gsl_matrix.h>
 #include <gsl/gsl_vector.h>
-#include <libpspp/compiler.h>
-#include <libpspp/misc.h>
-#include <math/coefficient.h>
-#include <math/ts/innovations.h>
+#include <math.h>
+#include <stdlib.h>
+
+#include "libpspp/compiler.h"
+#include "libpspp/misc.h"
+#include "math/coefficient.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 static void
 get_mean (const gsl_matrix *data,

diff --git a/src/math/ts/innovations.h b/src/math/ts/innovations.h
index f0e40c59f7e2400b0d47609534a14ba1e64c3580..7693690ce58e072e91305619b15508c7e001a644 100644 (file)
--- a/src/math/ts/innovations.h
+++ b/src/math/ts/innovations.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,8 +25,9 @@
  */
 #ifndef INNOVATIONS_H
 #define INNOVATIONS_H
-#include <math/coefficient.h>
-#include <math/design-matrix.h>
+
+#include "math/coefficient.h"
+#include "math/design-matrix.h"
 
 struct innovations_estimate
 {

diff --git a/src/math/tukey-hinges.c b/src/math/tukey-hinges.c
index 22ab45210c38c98066eb4bb654663114cb496ddd..3e9ea9374eb4198b76d83688234b23de97fc7cf9 100644 (file)
--- a/src/math/tukey-hinges.c
+++ b/src/math/tukey-hinges.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -15,14 +15,17 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
-#include "tukey-hinges.h"
-#include <math/order-stats.h>
 
-#include <gl/xalloc.h>
-#include <libpspp/assertion.h>
-#include <libpspp/cast.h>
+#include "math/tukey-hinges.h"
+
 #include <math.h>
 
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "math/order-stats.h"
+
+#include "gl/xalloc.h"
+
 void
 tukey_hinges_calculate (const struct tukey_hinges *th, double hinge[3])
 {

diff --git a/src/output/cairo-chart.c b/src/output/cairo-chart.c
index a776eab3fc7aed926cb2de4986a235a60017fa8d..3ec00ce9a53920c978afcb05bc2ec598f0cf304c 100644 (file)
--- a/src/output/cairo-chart.c
+++ b/src/output/cairo-chart.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -35,9 +35,9 @@
 #include "output/cairo.h"
 #include "output/chart-item.h"
 
-#include "error.h"
-#include "xalloc.h"
-#include "xvasprintf.h"
+#include "gl/error.h"
+#include "gl/xalloc.h"
+#include "gl/xvasprintf.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/output/cairo-chart.h b/src/output/cairo-chart.h
index 041a169102395546db470f5fd79a693ba8f38f8c..1a23dd179329cde657b12a98cd6c5f1ef1c8b05b 100644 (file)
--- a/src/output/cairo-chart.h
+++ b/src/output/cairo-chart.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

diff --git a/src/output/chart-item-provider.h b/src/output/chart-item-provider.h
index 4f13fcfeb6d6aa973885053ce12b5f96a8235e54..dd2fa9f12e838e854361001f80248d593be433b4 100644 (file)
--- a/src/output/chart-item-provider.h
+++ b/src/output/chart-item-provider.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,8 +17,8 @@
 #ifndef OUTPUT_CHART_ITEM_PROVIDER_H
 #define OUTPUT_CHART_ITEM_PROVIDER_H 1
 
-#include <output/chart-item.h>
-#include <output/output-item.h>
+#include "output/chart-item.h"
+#include "output/output-item.h"
 
 struct chart_item_class
   {

diff --git a/src/output/chart-item.c b/src/output/chart-item.c
index 227994dd219060676f218ae0ee57e565adc379d1..e70099d22ac7624195be01a980aff67b5ca1a554 100644 (file)
--- a/src/output/chart-item.c
+++ b/src/output/chart-item.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,16 +16,16 @@
 
 #include <config.h>
 
-#include <output/chart-item.h>
-#include <output/chart-item-provider.h>
+#include "output/chart-item.h"
+#include "output/chart-item-provider.h"
 
 #include <assert.h>
 #include <stdlib.h>
 
-#include <libpspp/cast.h>
-#include <libpspp/compiler.h>
-#include <output/driver.h>
-#include <output/output-item-provider.h>
+#include "libpspp/cast.h"
+#include "libpspp/compiler.h"
+#include "output/driver.h"
+#include "output/output-item-provider.h"
 
 #include "gl/xalloc.h"
 

diff --git a/src/output/chart-item.h b/src/output/chart-item.h
index c005a46c8fc97387d1c0b4d2608d2e3770bcf390..ac25eb0a770ea4293868fa4c04c9ff74825ceeb5 100644 (file)
--- a/src/output/chart-item.h
+++ b/src/output/chart-item.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@
    chart_item. */
 
 #include <stdbool.h>
-#include <output/output-item.h>
+#include "output/output-item.h"
 
 /* A chart item.
 
@@ -45,7 +45,7 @@ void chart_item_set_title (struct chart_item *, const char *);
    autogenerated by mk-class-boilerplate. */
 
 #include <assert.h>
-#include <libpspp/cast.h>
+#include "libpspp/cast.h"
 
 extern const struct output_item_class chart_item_class;
 

diff --git a/src/output/charts/boxplot-cairo.c b/src/output/charts/boxplot-cairo.c
index ddecbfccceb2564c347738b5f53f7f864d285d90..1660e86b2db1455d9a4a01bb22b4ace7ec568463 100644 (file)
--- a/src/output/charts/boxplot-cairo.c
+++ b/src/output/charts/boxplot-cairo.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,13 +16,13 @@
 
 #include <config.h>
 
-#include <output/cairo-chart.h>
+#include "output/cairo-chart.h"
 
 #include <math.h>
 
-#include <output/charts/boxplot.h>
-#include <math/box-whisker.h>
-#include <math/chart-geometry.h>
+#include "math/box-whisker.h"
+#include "math/chart-geometry.h"
+#include "output/charts/boxplot.h"
 
 /* Draw an OUTLIER on the plot CH
  * at CENTRELINE

diff --git a/src/output/charts/boxplot.c b/src/output/charts/boxplot.c
index 7e9248004b3c2b2662f684241e55ab06b865b0c4..deabc1fa6e8f059c026c5c079b6e4a60f43b0b5a 100644 (file)
--- a/src/output/charts/boxplot.c
+++ b/src/output/charts/boxplot.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004, 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2008, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,10 +17,10 @@
 
 #include <config.h>
 
-#include <output/charts/boxplot.h>
+#include "output/charts/boxplot.h"
 
-#include <math/box-whisker.h>
-#include <output/chart-item-provider.h>
+#include "math/box-whisker.h"
+#include "output/chart-item-provider.h"
 
 struct boxplot *
 boxplot_create (double y_min, double y_max, const char *title)

diff --git a/src/output/charts/boxplot.h b/src/output/charts/boxplot.h
index bd5a7a32379b3b029babb89718b53908851f13eb..e18daa844cd61ed0bfb13b52d7606880c53edca5 100644 (file)
--- a/src/output/charts/boxplot.h
+++ b/src/output/charts/boxplot.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 #define OUTPUT_CHARTS_BOXPLOT_H 1
 
 #include <stddef.h>
-#include <output/chart-item.h>
+#include "output/chart-item.h"
 
 /* Box-whiskers plot. */
 struct boxplot
@@ -49,7 +49,7 @@ void boxplot_add_box (struct boxplot *,
    autogenerated by mk-class-boilerplate. */
 
 #include <assert.h>
-#include <libpspp/cast.h>
+#include "libpspp/cast.h"
 
 extern const struct chart_item_class boxplot_class;
 

diff --git a/src/output/charts/np-plot-cairo.c b/src/output/charts/np-plot-cairo.c
index 8c96b73fadaf517c93a388e8c26f087bf4a7b0ab..334284ba8f857c20db90cb1ff561051a9ec9793d 100644 (file)
--- a/src/output/charts/np-plot-cairo.c
+++ b/src/output/charts/np-plot-cairo.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,12 +16,12 @@
 
 #include <config.h>
 
-#include <output/charts/np-plot.h>
+#include "output/charts/np-plot.h"
 
-#include <data/case.h>
-#include <data/casereader.h>
-#include <math/np.h>
-#include <output/cairo-chart.h>
+#include "data/case.h"
+#include "data/casereader.h"
+#include "math/np.h"
+#include "output/cairo-chart.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/output/charts/np-plot.c b/src/output/charts/np-plot.c
index dfc74603003f342dacc7141ee347d472aa8a127b..ccccbeff36ae192b844a3f95b25aa6ca9c4b6534 100644 (file)
--- a/src/output/charts/np-plot.c
+++ b/src/output/charts/np-plot.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004, 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2008, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,14 +16,14 @@
 
 #include <config.h>
 
-#include <output/charts/np-plot.h>
+#include "output/charts/np-plot.h"
 
 #include <gsl/gsl_cdf.h>
 
-#include <data/casereader.h>
-#include <libpspp/cast.h>
-#include <math/np.h>
-#include <output/chart-item-provider.h>
+#include "data/casereader.h"
+#include "libpspp/cast.h"
+#include "math/np.h"
+#include "output/chart-item-provider.h"
 
 #include "gl/minmax.h"
 

diff --git a/src/output/charts/np-plot.h b/src/output/charts/np-plot.h
index 82c81ed8f35c923fcb54df5342b5bf3f4e44d3b1..15c1cb9f71b39c9d96fb7c899e4ec77733d38f3c 100644 (file)
--- a/src/output/charts/np-plot.h
+++ b/src/output/charts/np-plot.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004, 2008, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2008, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 #ifndef OUTPUT_CHARTS_NP_PLOT_H
 #define OUTPUT_CHARTS_NP_PLOT_H 1
 
-#include <output/chart-item.h>
+#include "output/chart-item.h"
 
 struct np;
 
@@ -50,7 +50,7 @@ struct chart_item *dnp_plot_create (const struct np *,
    autogenerated by mk-class-boilerplate. */
 
 #include <assert.h>
-#include <libpspp/cast.h>
+#include "libpspp/cast.h"
 
 extern const struct chart_item_class np_plot_chart_class;
 

diff --git a/src/output/charts/piechart-cairo.c b/src/output/charts/piechart-cairo.c
index 3917e4e14b4833b04c6519a724ce5fe728095410..9e55c56f46a0b8d83ef4b0cf2b9ad4489f1c8fec 100644 (file)
--- a/src/output/charts/piechart-cairo.c
+++ b/src/output/charts/piechart-cairo.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,11 +16,11 @@
 
 #include <config.h>
 
-#include <output/charts/piechart.h>
+#include "output/charts/piechart.h"
 
 #include <math.h>
 
-#include <output/cairo-chart.h>
+#include "output/cairo-chart.h"
 
 #include "gl/minmax.h"
 

diff --git a/src/output/charts/piechart.c b/src/output/charts/piechart.c
index 0b9153d545b76d26340532a22b9e218bb29f15c6..aac8bfbf8d03429517987e4c52e4d03f7f4d85cf 100644 (file)
--- a/src/output/charts/piechart.c
+++ b/src/output/charts/piechart.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,13 +16,13 @@
 
 #include <config.h>
 
-#include <output/charts/piechart.h>
+#include "output/charts/piechart.h"
 
 #include <stdlib.h>
 
-#include <libpspp/cast.h>
-#include <libpspp/str.h>
-#include <output/chart-item-provider.h>
+#include "libpspp/cast.h"
+#include "libpspp/str.h"
+#include "output/chart-item-provider.h"
 
 #include "gl/xalloc.h"
 

diff --git a/src/output/charts/piechart.h b/src/output/charts/piechart.h
index 312a45ee08ce759f84e9c02e2991ca9acd3163f0..b59a7296d14e792031a595a1c024808c25a13451 100644 (file)
--- a/src/output/charts/piechart.h
+++ b/src/output/charts/piechart.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,8 +17,8 @@
 #ifndef PIECHART_H
 #define PIECHART_H
 
-#include <libpspp/str.h>
-#include <output/chart-item.h>
+#include "libpspp/str.h"
+#include "output/chart-item.h"
 
 struct piechart
   {
@@ -40,7 +40,7 @@ struct chart_item *piechart_create (const char *title,
    autogenerated by mk-class-boilerplate. */
 
 #include <assert.h>
-#include <libpspp/cast.h>
+#include "libpspp/cast.h"
 
 extern const struct chart_item_class piechart_class;
 

diff --git a/src/output/charts/plot-hist-cairo.c b/src/output/charts/plot-hist-cairo.c
index a70fa174fa7b72511856e67b359a18c12ece6d99..d000a1ac21e26f2961e80b6ced90c94932ee94ff 100644 (file)
--- a/src/output/charts/plot-hist-cairo.c
+++ b/src/output/charts/plot-hist-cairo.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,12 +16,12 @@
 
 #include <config.h>
 
-#include <output/charts/plot-hist.h>
+#include "output/charts/plot-hist.h"
 
 #include <gsl/gsl_randist.h>
 
-#include <data/val-type.h>
-#include <output/cairo-chart.h>
+#include "data/val-type.h"
+#include "output/cairo-chart.h"
 
 #include "gl/xvasprintf.h"
 

diff --git a/src/output/charts/plot-hist.c b/src/output/charts/plot-hist.c
index 5925df6d1a35af5d0122f75312b497bc01e68eb8..5abbbb6c8c4a32ac695bb4f50478af79b538b0a7 100644 (file)
--- a/src/output/charts/plot-hist.c
+++ b/src/output/charts/plot-hist.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,12 +22,11 @@
 #include <gsl/gsl_randist.h>
 #include <assert.h>
 
-#include <output/charts/plot-hist.h>
-#include <output/chart-item-provider.h>
-
-#include <libpspp/cast.h>
-#include <math/histogram.h>
-#include <math/moments.h>
+#include "libpspp/cast.h"
+#include "math/histogram.h"
+#include "math/moments.h"
+#include "output/chart-item-provider.h"
+#include "output/charts/plot-hist.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/output/charts/plot-hist.h b/src/output/charts/plot-hist.h
index 237b8b3c11ef7d2ac612675ef879b456a96cf714..bf3674b00e53b986848b1d5bc12f2138513549bc 100644 (file)
--- a/src/output/charts/plot-hist.h
+++ b/src/output/charts/plot-hist.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2004, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -46,7 +46,7 @@ struct chart_item *histogram_chart_create (const gsl_histogram *,
    autogenerated by mk-class-boilerplate. */
 
 #include <assert.h>
-#include <libpspp/cast.h>
+#include "libpspp/cast.h"
 
 extern const struct chart_item_class histogram_chart_class;
 

diff --git a/src/output/charts/roc-chart-cairo.c b/src/output/charts/roc-chart-cairo.c
index b5c22aca5329a8e3a1af7c0449f2d8a323c1a92c..f6da35066705a18fb4af56bd8dc0d2704755a684 100644 (file)
--- a/src/output/charts/roc-chart-cairo.c
+++ b/src/output/charts/roc-chart-cairo.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,12 +16,12 @@
 
 #include <config.h>
 
-#include <output/charts/roc-chart.h>
+#include "output/charts/roc-chart.h"
 
-#include <data/case.h>
-#include <data/casereader.h>
-#include <language/stats/roc.h>
-#include <output/cairo-chart.h>
+#include "data/case.h"
+#include "data/casereader.h"
+#include "language/stats/roc.h"
+#include "output/cairo-chart.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/output/charts/roc-chart.c b/src/output/charts/roc-chart.c
index 5af8f27ff35ee93eeb8ede9086ce738e71d24944..0285d6f6a107e8a599e9be7e93e3adf580389548 100644 (file)
--- a/src/output/charts/roc-chart.c
+++ b/src/output/charts/roc-chart.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,13 +16,13 @@
 
 #include <config.h>
 
-#include <output/charts/roc-chart.h>
+#include "output/charts/roc-chart.h"
 
-#include <output/chart-item-provider.h>
-#include <data/casereader.h>
-#include <language/stats/roc.h>
+#include "data/casereader.h"
+#include "language/stats/roc.h"
+#include "output/chart-item-provider.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/output/charts/roc-chart.h b/src/output/charts/roc-chart.h
index a995f9302d4f3f4d3d39feefb2045a01ba62a3fe..309ac38e987a432c67454b0e6c2996b9cd725a54 100644 (file)
--- a/src/output/charts/roc-chart.h
+++ b/src/output/charts/roc-chart.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include <output/chart-item.h>
+#include "output/chart-item.h"
 
 struct roc_chart
   {
@@ -44,7 +44,7 @@ void roc_chart_add_var (struct roc_chart *, const char *var_name,
    autogenerated by mk-class-boilerplate. */
 
 #include <assert.h>
-#include <libpspp/cast.h>
+#include "libpspp/cast.h"
 
 extern const struct chart_item_class roc_chart_class;
 

diff --git a/src/output/charts/scree-cairo.c b/src/output/charts/scree-cairo.c
index d48a3642a805c3190feffad8fbcaf84c8c31b71c..f9765c69f242d70f336628db354f19c406333393 100644 (file)
--- a/src/output/charts/scree-cairo.c
+++ b/src/output/charts/scree-cairo.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,11 +16,11 @@
 
 #include <config.h>
 
-#include <output/charts/scree.h>
+#include "output/charts/scree.h"
 
 #include <math.h>
 
-#include <output/cairo-chart.h>
+#include "output/cairo-chart.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/output/charts/scree.c b/src/output/charts/scree.c
index ffa77568bd975a4c537beef1541d4169cb0cb701..4de1f5e6fc664ecf888d9c47daa7f532542a5265 100644 (file)
--- a/src/output/charts/scree.c
+++ b/src/output/charts/scree.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,9 +16,9 @@
 
 #include <config.h>
 
-#include <output/charts/scree.h>
+#include "output/charts/scree.h"
 
-#include <output/chart-item-provider.h>
+#include "output/chart-item-provider.h"
 
 #include "gl/xalloc.h"
 

diff --git a/src/output/charts/scree.h b/src/output/charts/scree.h
index 43f5b822482c066bbf7b7364ce301f4fdd3e02a2..5691451d7cdbf250285e0f5b6f0d39d4916afd92 100644 (file)
--- a/src/output/charts/scree.h
+++ b/src/output/charts/scree.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -18,7 +18,7 @@
 #define OUTPUT_CHARTS_SCREE_H 1
 
 #include <gsl/gsl_vector.h>
-#include <output/chart-item.h>
+#include "output/chart-item.h"
 
 /* A scree plot. */
 struct scree
@@ -38,7 +38,7 @@ struct chart *scree_get_chart (struct scree *scree);
    autogenerated by mk-class-boilerplate. */
 
 #include <assert.h>
-#include <libpspp/cast.h>
+#include "libpspp/cast.h"
 
 extern const struct chart_item_class scree_class;
 

diff --git a/src/output/measure.c b/src/output/measure.c
index 8de7ed1d486bf9ca62a4d399c2b12f4fcb6d8281..14cd5dab9fdb56de6e263a4b4162a94df60dc4cb 100644 (file)
--- a/src/output/measure.c
+++ b/src/output/measure.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,17 +16,17 @@
 
 #include <config.h>
 
-#include <output/measure.h>
+#include "output/measure.h"
 
 #include <ctype.h>
 #include <errno.h>
 #if HAVE_LC_PAPER
 #include <langinfo.h>
 #endif
-#include <libpspp/str.h>
 #include <stdlib.h>
 
-#include <data/file-name.h>
+#include "data/file-name.h"
+#include "libpspp/str.h"
 
 #include "gl/error.h"
 

diff --git a/src/output/message-item.h b/src/output/message-item.h
index a97b2270d6f1d1cc055a244ed04c4e0f6d1952ed..88450f1adee4cc91276e649853794eaab767fe95 100644 (file)
--- a/src/output/message-item.h
+++ b/src/output/message-item.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2010 Free Sonftware Foundation, Inc.
+   Copyright (C) 2010, 2011 Free Sonftware Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@
    the message gets routed properly for the PSPP user interface in use. */
 
 #include <stdbool.h>
-#include <output/output-item.h>
+#include "output/output-item.h"
 
 /* A message item. */
 struct message_item
@@ -46,7 +46,7 @@ const struct msg *message_item_get_msg (const struct message_item *);
    autogenerated by mk-class-boilerplate. */
 
 #include <assert.h>
-#include <libpspp/cast.h>
+#include "libpspp/cast.h"
 
 extern const struct output_item_class message_item_class;
 

diff --git a/src/output/mk-class-boilerplate b/src/output/mk-class-boilerplate
index b2191aae3b2e1b7a8e3958ca187dfa35011e9f66..3541c150a6a3fb3ed240b91f9ce1259994e00152 100755 (executable)
--- a/src/output/mk-class-boilerplate
+++ b/src/output/mk-class-boilerplate
@@ -10,7 +10,7 @@ while (<>) {
    autogenerated by mk-class-boilerplate. */
 
 #include <assert.h>
-#include <libpspp/cast.h>
+#include "libpspp/cast.h"
 
 extern const struct ${super}_class ${class}_class;
 

diff --git a/src/output/output-item-provider.h b/src/output/output-item-provider.h
index a810f97c7d2627ae60bc49631b4554c68e408ebe..1273f13419df8819c139f7fd07a60d60ff9dfd49 100644 (file)
--- a/src/output/output-item-provider.h
+++ b/src/output/output-item-provider.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 #ifndef OUTPUT_ITEM_PROVIDER_H
 #define OUTPUT_ITEM_PROVIDER_H 1
 
-#include <output/output-item.h>
+#include "output/output-item.h"
 
 /* Class structure for an output item.
 

diff --git a/src/output/output-item.c b/src/output/output-item.c
index e1c889ffe33b09967f3bcf798198ed825363fe05..dd4e70c2ee48b8591813767374d166b8a1615b0e 100644 (file)
--- a/src/output/output-item.c
+++ b/src/output/output-item.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,15 +16,15 @@
 
 #include <config.h>
 
-#include <output/output-item-provider.h>
+#include "output/output-item-provider.h"
 
 #include <assert.h>
 #include <stdlib.h>
 
-#include <libpspp/assertion.h>
-#include <libpspp/cast.h>
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
 
-#include "xalloc.h"
+#include "gl/xalloc.h"
 \f
 /* Increases ITEM's reference count, indicating that it has an additional
    owner.  An output item that is shared among multiple owners must not be

diff --git a/src/output/output-item.h b/src/output/output-item.h
index b45e008720dee14132c1d03ee25ad49df982915a..13a5c34a74348d3361653d8b3842071b033a2097 100644 (file)
--- a/src/output/output-item.h
+++ b/src/output/output-item.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -31,8 +31,8 @@
         - Messages (see output/message-item.h).
 */
 
-#include <libpspp/cast.h>
 #include <stdbool.h>
+#include "libpspp/cast.h"
 
 /* A single output item. */
 struct output_item

diff --git a/src/output/render.h b/src/output/render.h
index f6035cf0ab52fae1c16c55d9acdc383bf3be4a02..51b84a3005cf03705739266c6e68e3d357f8833b 100644 (file)
--- a/src/output/render.h
+++ b/src/output/render.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
 
 #include <stdbool.h>
 #include <stddef.h>
-#include <output/table-provider.h>
+#include "output/table-provider.h"
 
 struct table;
 

diff --git a/src/output/tab.c b/src/output/tab.c
index fd4685579756dfefda936f95b36597c777262ab4..7ce860f14e09c1e357eb11bafce1d3dba1d766b9 100644 (file)
--- a/src/output/tab.c
+++ b/src/output/tab.c
@@ -16,31 +16,31 @@
 
 #include <config.h>
 
-#include <output/tab.h>
+#include "output/tab.h"
 
 #include <ctype.h>
 #include <stdarg.h>
 #include <limits.h>
 #include <stdlib.h>
 
-#include <data/data-out.h>
-#include <data/format.h>
-#include <data/settings.h>
-#include <data/value.h>
-#include <data/dictionary.h>
-#include <libpspp/assertion.h>
-#include <libpspp/compiler.h>
-#include <libpspp/i18n.h>
-#include <libpspp/misc.h>
-#include <libpspp/pool.h>
-#include <output/driver.h>
-#include <output/table-item.h>
-#include <output/table-provider.h>
-#include <output/text-item.h>
-
-#include "error.h"
-#include "minmax.h"
-#include "xalloc.h"
+#include "data/data-out.h"
+#include "data/dictionary.h"
+#include "data/format.h"
+#include "data/settings.h"
+#include "data/value.h"
+#include "libpspp/assertion.h"
+#include "libpspp/compiler.h"
+#include "libpspp/i18n.h"
+#include "libpspp/misc.h"
+#include "libpspp/pool.h"
+#include "output/driver.h"
+#include "output/table-item.h"
+#include "output/table-provider.h"
+#include "output/text-item.h"
+
+#include "gl/error.h"
+#include "gl/minmax.h"
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/output/tab.h b/src/output/tab.h
index db38b6b8144d0b94cb638a7abe0c65174d1b7b48..7ac85187f833b0bdb7818be7efdb5bef057395ff 100644 (file)
--- a/src/output/tab.h
+++ b/src/output/tab.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997, 1998, 1999, 2000, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2000, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -38,8 +38,8 @@
          the table code here.
 */
 
-#include <libpspp/compiler.h>
-#include <output/table.h>
+#include "libpspp/compiler.h"
+#include "output/table.h"
 
 /* A table. */
 struct tab_table

diff --git a/src/output/table-casereader.c b/src/output/table-casereader.c
index 4a1452c0e91eea776b2eb4af75c57f4b2c53bdb8..fa7498c849ac4dd4daced36a956ffc725362d078 100644 (file)
--- a/src/output/table-casereader.c
+++ b/src/output/table-casereader.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,12 +16,12 @@
 
 #include <config.h>
 
-#include <output/table-provider.h>
+#include "output/table-provider.h"
 
-#include <data/casereader.h>
-#include <data/data-out.h>
-#include <data/format.h>
-#include <libpspp/i18n.h>
+#include "data/casereader.h"
+#include "data/data-out.h"
+#include "data/format.h"
+#include "libpspp/i18n.h"
 
 #include "gl/xalloc.h"
 

diff --git a/src/output/table-item.c b/src/output/table-item.c
index c7c0f91c9cea8ca20911661fa0ee7698f72d95bf..664f093abfb792d9fde5afbb017bba493b5ec9ad 100644 (file)
--- a/src/output/table-item.c
+++ b/src/output/table-item.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,15 +16,15 @@
 
 #include <config.h>
 
-#include <output/table-provider.h>
+#include "output/table-provider.h"
 
 #include <assert.h>
 
-#include <libpspp/assertion.h>
-#include <libpspp/cast.h>
-#include <output/driver.h>
-#include <output/output-item-provider.h>
-#include <output/table-item.h>
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "output/driver.h"
+#include "output/output-item-provider.h"
+#include "output/table-item.h"
 
 #include "gl/xalloc.h"
 

diff --git a/src/output/table-item.h b/src/output/table-item.h
index 01e9899b880e9dfe93b961c5ea88cf0f05eed356..dddf846ca952a08ea0709ffc72f737b9654da175 100644 (file)
--- a/src/output/table-item.h
+++ b/src/output/table-item.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,8 +23,8 @@
    contains a table (see table.h) and some formatting properties (currently
    just a caption). */
 
-#include <libpspp/compiler.h>
-#include <output/output-item.h>
+#include "libpspp/compiler.h"
+#include "output/output-item.h"
 
 /* A table item.
 
@@ -48,7 +48,7 @@ void table_item_set_caption (struct table_item *, const char *);
    autogenerated by mk-class-boilerplate. */
 
 #include <assert.h>
-#include <libpspp/cast.h>
+#include "libpspp/cast.h"
 
 extern const struct output_item_class table_item_class;
 

diff --git a/src/output/table-paste.c b/src/output/table-paste.c
index 102b51404d3da130d29f3176404eb94317964e53..5f6d3f83e0e9a0e4f5e5ab39e97e27954c6ad31b 100644 (file)
--- a/src/output/table-paste.c
+++ b/src/output/table-paste.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,9 +16,9 @@
 
 #include <config.h>
 
-#include <libpspp/assertion.h>
-#include <libpspp/tower.h>
-#include <output/table-provider.h>
+#include "libpspp/assertion.h"
+#include "libpspp/tower.h"
+#include "output/table-provider.h"
 
 #include "gl/minmax.h"
 #include "gl/xalloc.h"

diff --git a/src/output/table-provider.h b/src/output/table-provider.h
index 6d1a415618e18529d8ab029a79893fb5a6b321a0..36a666534fe42486fa1350f1d0775f0ca1bf308e 100644 (file)
--- a/src/output/table-provider.h
+++ b/src/output/table-provider.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997, 1998, 1999, 2000, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2000, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
 #ifndef OUTPUT_TABLE_PROVIDER
 #define OUTPUT_TABLE_PROVIDER 1
 
-#include <output/table.h>
+#include "output/table.h"
 
 /* A cell in a table. */
 struct table_cell

diff --git a/src/output/table-select.c b/src/output/table-select.c
index 241448e572538491186e0506168b025be8533e13..dcc6b7de2af8c8a4ead62190a532fd96d8d83c56 100644 (file)
--- a/src/output/table-select.c
+++ b/src/output/table-select.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,9 +16,9 @@
 
 #include <config.h>
 
-#include <libpspp/assertion.h>
-#include <libpspp/cast.h>
-#include <output/table-provider.h>
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "output/table-provider.h"
 
 #include "gl/minmax.h"
 #include "gl/xalloc.h"

diff --git a/src/output/table-transpose.c b/src/output/table-transpose.c
index 59801942cb9b2dd6af4a324949b7c87ff47b7dc1..3dd862026274e3185dc18e4ab27e2a44d9e264be 100644 (file)
--- a/src/output/table-transpose.c
+++ b/src/output/table-transpose.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,9 +16,9 @@
 
 #include <config.h>
 
-#include <libpspp/assertion.h>
-#include <libpspp/cast.h>
-#include <output/table-provider.h>
+#include "libpspp/assertion.h"
+#include "libpspp/cast.h"
+#include "output/table-provider.h"
 
 #include "gl/minmax.h"
 #include "gl/xalloc.h"

diff --git a/src/output/table.c b/src/output/table.c
index 696931ae50980147be4212dd1af477a73c2448d1..bd51f494033ad346d3377e3f25e00db9e536a559 100644 (file)
--- a/src/output/table.c
+++ b/src/output/table.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,14 +16,14 @@
 
 #include <config.h>
 
-#include <output/table.h>
-#include <output/table-provider.h>
+#include "output/table.h"
+#include "output/table-provider.h"
 
 #include <assert.h>
 #include <stdlib.h>
 
-#include <libpspp/cast.h>
-#include <libpspp/compiler.h>
+#include "libpspp/cast.h"
+#include "libpspp/compiler.h"
 
 #include "gl/xalloc.h"
 

diff --git a/src/output/text-item.c b/src/output/text-item.c
index 16588ae5c54e2beef6a1e96d3fbfd170a29572c3..cb21caa2e7c0e5addd823055fca48c1dc4b472e6 100644 (file)
--- a/src/output/text-item.c
+++ b/src/output/text-item.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,18 +16,18 @@
 
 #include <config.h>
 
-#include <output/text-item.h>
+#include "output/text-item.h"
 
 #include <assert.h>
 #include <stdarg.h>
 #include <stdlib.h>
 
-#include <libpspp/cast.h>
-#include <output/driver.h>
-#include <output/output-item-provider.h>
+#include "libpspp/cast.h"
+#include "output/driver.h"
+#include "output/output-item-provider.h"
 
-#include "xalloc.h"
-#include "xvasprintf.h"
+#include "gl/xalloc.h"
+#include "gl/xvasprintf.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/output/text-item.h b/src/output/text-item.h
index b62e7dc4011e8616b843c0bc604938fa9fd04a8a..5f1e8a2e01a9e59b194b707cb7fad5b287156f13 100644 (file)
--- a/src/output/text-item.h
+++ b/src/output/text-item.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 2009 Free Sonftware Foundation, Inc.
+   Copyright (C) 2009, 2011 Free Sonftware Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -25,8 +25,8 @@
    A text item is just a text string. */
 
 #include <stdbool.h>
-#include <libpspp/compiler.h>
-#include <output/output-item.h>
+#include "libpspp/compiler.h"
+#include "output/output-item.h"
 
 enum text_item_type
   {
@@ -78,7 +78,7 @@ const char *text_item_get_text (const struct text_item *);
    autogenerated by mk-class-boilerplate. */
 
 #include <assert.h>
-#include <libpspp/cast.h>
+#include "libpspp/cast.h"
 
 extern const struct output_item_class text_item_class;
 

diff --git a/src/ui/syntax-gen.c b/src/ui/syntax-gen.c
index d829d80a2bc7662274e98c5040c4cbf547b36e51..bcec18e5565bab56169eee50766d541c9f5e0999 100644 (file)
--- a/src/ui/syntax-gen.c
+++ b/src/ui/syntax-gen.c
@@ -16,7 +16,7 @@
 
 #include <config.h>
 
-#include <ui/syntax-gen.h>
+#include "ui/syntax-gen.h"
 
 #include <ctype.h>
 #include <mbchar.h>

diff --git a/src/ui/syntax-gen.h b/src/ui/syntax-gen.h
index 244e528b0748cd349c1481d3856aff5990c98e8a..78ae5ea999375b44aaa3e03e5f2d96bee320939f 100644 (file)
--- a/src/ui/syntax-gen.h
+++ b/src/ui/syntax-gen.h
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2007, 2008, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -21,8 +21,8 @@
 
 #include <stdarg.h>
 #include <stddef.h>
-#include <libpspp/compiler.h>
-#include <libpspp/str.h>
+#include "libpspp/compiler.h"
+#include "libpspp/str.h"
 
 struct fmt_spec;
 struct substring;

diff --git a/src/ui/terminal/read-line.c b/src/ui/terminal/read-line.c
index 0fa145c98ac502edb7f29f25e471a2ca6ee885b7..544e18d55dd965608919ba6b5e435c002edeb165 100644 (file)
--- a/src/ui/terminal/read-line.c
+++ b/src/ui/terminal/read-line.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2007, 2009 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2007, 2009, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
 
 #include <config.h>
 
-#include "read-line.h"
+#include "ui/terminal/read-line.h"
 
 #include <stdlib.h>
 #include <stdbool.h>
@@ -26,21 +26,20 @@
 #include <stdint.h>
 #endif
 
-#include "msg-ui.h"
-
-#include <data/file-name.h>
-#include <data/settings.h>
-#include <language/command.h>
-#include <libpspp/cast.h>
-#include <libpspp/message.h>
-#include <libpspp/str.h>
-#include <libpspp/version.h>
-#include <language/prompt.h>
-#include <output/journal.h>
-#include <output/driver.h>
-#include <ui/terminal/terminal.h>
-
-#include "xalloc.h"
+#include "data/file-name.h"
+#include "data/settings.h"
+#include "language/command.h"
+#include "language/prompt.h"
+#include "libpspp/cast.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+#include "libpspp/version.h"
+#include "output/driver.h"
+#include "output/journal.h"
+#include "ui/terminal/msg-ui.h"
+#include "ui/terminal/terminal.h"
+
+#include "gl/xalloc.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)

diff --git a/src/ui/terminal/read-line.h b/src/ui/terminal/read-line.h
index 6738411f426ee963e38ff26658d246288ce54554..0eb670977c3ee673a4a6619d7fa05e8687e3fcfb 100644 (file)
--- a/src/ui/terminal/read-line.h
+++ b/src/ui/terminal/read-line.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2011 Free Software Foundation, Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,8 +17,8 @@
 #ifndef READLN_H
 #define READLN_H
 
-#include <libpspp/str.h>
-#include <libpspp/getl.h>
+#include "libpspp/str.h"
+#include "libpspp/getl.h"
 
 void readln_initialize (void);
 void readln_uninitialize (void);