Cleanup and standardize the #include files

BUGS

@@ -21,7 +21,6 @@ Release Critical
 - autofill with merges and partial regions can overflow the target with the
   final merge.
 - Various pasting & merging bugs.
-- Tino's INDEX error issue.
 
 Pending Patches
 ---------------

plugins/applix/applix-read.c

@@ -23,7 +23,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#include "config.h"
+#include <gnumeric-config.h>
+#include <gnumeric.h>
 #include <libgnome/libgnome.h>
 #include "applix.h"
 #include "application.h"

plugins/applix/boot.c

@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
  * USA
  */
-#include "config.h"
-#include "gnumeric.h"
+#include <gnumeric-config.h>
+#include <gnumeric.h>
 #include "io-context.h"
 #include "plugin.h"
 #include "plugin-util.h"

plugins/derivatives/options.c

@@ -6,11 +6,11 @@
  *   Morten Welinder <terra@diku.dk>     Port to new plugin framework.
  *                                         Cleanup.
  */
-#include <config.h>
+#include <gnumeric-config.h>
+#include <gnumeric.h>
 #include <glib.h>
 #include <math.h>
 
-#include "gnumeric.h"
 #include "func.h"
 #include "mathfunc.h"
 #include "plugin.h"

plugins/derivatives/plugin.xml.in

@@ -9,7 +9,7 @@
 	</loader>
 	<services>
 		<service type="function_group" id="derivatives">
-			<_category>Finance</_category>
+			<_category>Financial</_category>
 			<functions>
 				<function name="opt_bs_call"/>
 				<function name="opt_bs_call_delta"/>

plugins/dif/dif.c

@@ -7,7 +7,8 @@
  *
  *	Based on ff-csv code.
  */
-#include <config.h>
+#include <gnumeric-config.h>
+#include <gnumeric.h>
 #include <sys/types.h>
 #include <sys/mman.h>
 #include <unistd.h>
@@ -15,7 +16,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include "portability.h"
-#include "gnumeric.h"
 #include "cell.h"
 #include "sheet.h"
 #include "value.h"

plugins/excel/boot.c

@@ -9,9 +9,9 @@
 #include <stdio.h>
 #include <sys/stat.h>
 
-#include <config.h>
+#include <gnumeric-config.h>
+#include <gnumeric.h>
 #include <gnome.h>
-#include "gnumeric.h"
 #include "file.h"
 #include "main.h"
 #include "io-context.h"

plugins/excel/ms-biff.c

@@ -15,7 +15,8 @@
 #include <fcntl.h>
 #include <ctype.h>
 
-#include <config.h>
+#include <gnumeric-config.h>
+#include <gnumeric.h>
 #include <glib.h>
 #include <libole2/ms-ole.h>
 

plugins/excel/ms-chart.c

@@ -8,7 +8,8 @@
  * (C) 1999-2001 Jody Goldberg
  **/
 
-#include <config.h>
+#include <gnumeric-config.h>
+#include <gnumeric.h>
 #include "boot.h"
 #include "excel.h"
 #include "ms-chart.h"

plugins/excel/ms-container.c

@@ -10,7 +10,8 @@
  * (C) 2000-2001 Jody Goldberg
  **/
 
-#include "config.h"
+#include <gnumeric-config.h>
+#include <gnumeric.h>
 #include "ms-container.h"
 #include "ms-escher.h"
 #include "ms-obj.h"

plugins/excel/ms-escher.c

@@ -25,7 +25,8 @@
 
 #include <stdio.h>
 
-#include <config.h>
+#include <gnumeric-config.h>
+#include <gnumeric.h>
 #include "boot.h"
 #include "ms-escher.h"
 #include "escher-types.h"

plugins/excel/ms-excel-read.c

@@ -10,7 +10,8 @@
  * unicode and national language support (C) 2001 by Vlad Harchev <hvv@hippo.ru>
  **/
 
-#include <config.h>
+#include <gnumeric-config.h>
+#include <gnumeric.h>
 
 #include "boot.h"
 #include "ms-formula-read.h"
@@ -46,7 +47,6 @@
 #  include <gnumeric-graph.h>
 #endif
 
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
 #include <locale.h>
 

plugins/excel/ms-excel-util.c

@@ -8,7 +8,8 @@
  * excel_iconv* family of functions (C) 2001 by Vlad Harchev <hvv@hippo.ru>
  **/
 
-#include "config.h"
+#include <gnumeric-config.h>
+#include <gnumeric.h>
 #include <glib.h>
 
 #include "boot.h"

plugins/excel/ms-excel-write.c

@@ -17,7 +17,8 @@
 /*
  * FIXME: Check for errors and propagate upward. We've only started.
  */
-#include <config.h>
+#include <gnumeric-config.h>
+#include <gnumeric.h>
 #include "ms-formula-write.h"
 #include "boot.h"
 #include "ms-biff.h"
@@ -25,7 +26,6 @@
 #include "ms-excel-write.h"
 #include "ms-excel-xf.h"
 
-#include <gnumeric.h>
 #include <format.h>
 #include <position.h>
 #include <style-color.h>
@@ -60,7 +60,6 @@
 #include <ctype.h>
 #include <math.h>
 
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-i18n.h>
 
 /* #define NO_DEBUG_EXCEL */

plugins/excel/ms-formula-read.c

@@ -6,13 +6,13 @@
  *
  * (C) 1998-2001 Michael Meeks
  */
-#include <config.h>
+#include <gnumeric-config.h>
+#include <gnumeric.h>
 #include "ms-formula-read.h"
 #include "excel.h"
 #include "ms-biff.h"
 #include "formula-types.h"
 #include "boot.h"
-#include <gnumeric.h>
 #include <gutils.h>
 #include <func.h>
 #include <value.h>

plugins/excel/ms-formula-write.c

@@ -8,9 +8,9 @@
  * (C) 1998-2001 Michael Meeks
  */
 
-#include <config.h>
+#include <gnumeric-config.h>
+#include <gnumeric.h>
 #include "ms-formula-write.h"
-#include "gnumeric.h"
 #include "excel.h"
 #include "ms-biff.h"
 #include "formula-types.h"

plugins/excel/ms-obj.c

@@ -23,7 +23,8 @@
  * USA
  */
 
-#include <config.h>
+#include <gnumeric-config.h>
+#include <gnumeric.h>
 
 #include "boot.h"
 #include "ms-obj.h"

plugins/excel/ms-obj.h

@@ -11,7 +11,6 @@
  * (C) 1998-2001 Michael Meeks, Jody Goldberg
  **/
 
-#include "config.h"
 #include "ms-excel-read.h"
 
 #define MS_ANCHOR_SIZE	18

plugins/excel/ms-summary.c

@@ -9,7 +9,8 @@
 
 #include <stdio.h>
 
-#include <config.h>
+#include <gnumeric-config.h>
+#include <gnumeric.h>
 #include <glib.h>
 #include <string.h>
 #include <libole2/ms-ole.h>

plugins/fn-database/functions.c

@@ -4,14 +4,16 @@
  * Author:
  *  Jukka-Pekka Iivonen (iivonen@iki.fi)
  */
-#include <config.h>
-#include "func.h"
-#include "func-util.h"
-#include "parse-util.h"
-#include "str.h"
-#include "cell.h"
-#include "sheet.h"
-#include "number-match.h"
+#include <gnumeric-config.h>
+#include <gnumeric.h>
+#include <func.h>
+
+#include <func-util.h>
+#include <parse-util.h>
+#include <str.h>
+#include <cell.h>
+#include <sheet.h>
+#include <number-match.h>
 
 #include <math.h>
 #include <string.h>

plugins/fn-date/functions.c

@@ -5,13 +5,15 @@
  *   Miguel de Icaza (miguel@gnu.org)
  *   Jukka-Pekka Iivonen (iivonen@iki.fi)
  */
-#include <config.h>
-#include "func.h"
-#include "parse-util.h"
-#include "str.h"
-#include "cell.h"
-#include "datetime.h"
-#include "auto-format.h"
+#include <gnumeric-config.h>
+#include <gnumeric.h>
+#include <func.h>
+
+#include <parse-util.h>
+#include <str.h>
+#include <cell.h>
+#include <datetime.h>
+#include <auto-format.h>
 
 #include <math.h>
 #include <string.h>

plugins/fn-eng/functions.c

@@ -5,12 +5,14 @@
  *  Michael Meeks <michael@imaginator.com>
  *  Jukka-Pekka Iivonen <iivonen@iki.fi>
  */
-#include <config.h>
-#include "func.h"
-#include "parse-util.h"
-#include "complex.h"
-#include "str.h"
-#include "mathfunc.h"
+#include <gnumeric-config.h>
+#include <gnumeric.h>
+#include <func.h>
+
+#include <parse-util.h>
+#include <complex.h>
+#include <str.h>
+#include <mathfunc.h>
 
 #include <ctype.h>
 #include <math.h>

plugins/fn-financial/functions.c

@@ -8,15 +8,17 @@
  *
 
  */
-#include <config.h>
-#include "func.h"
-#include "parse-util.h"
-#include "cell.h"
-#include "goal-seek.h"
-#include "collect.h"
-#include "auto-format.h"
-#include "datetime.h"
-#include "str.h"
+#include <gnumeric-config.h>
+#include <gnumeric.h>
+#include <func.h>
+
+#include <parse-util.h>
+#include <cell.h>
+#include <goal-seek.h>
+#include <collect.h>
+#include <auto-format.h>
+#include <datetime.h>
+#include <str.h>
 
 #include <math.h>
 #include <limits.h>

plugins/fn-info/functions.c

@@ -8,18 +8,20 @@
  *  Morten Welinder (terra@diku.dk)
  *  Almer S. Tigelaar (almer@gnome.org)
  */
-#include <config.h>
-#include "func.h"
-#include "parse-util.h"
-#include "cell.h"
-#include "str.h"
-#include "sheet.h"
-#include "workbook.h"
-#include "format.h"
-#include "formats.h"
-#include "style.h"
-#include "sheet-style.h"
-#include "number-match.h"
+#include <gnumeric-config.h>
+#include <gnumeric.h>
+#include <func.h>
+
+#include <parse-util.h>
+#include <cell.h>
+#include <str.h>
+#include <sheet.h>
+#include <workbook.h>
+#include <format.h>
+#include <formats.h>
+#include <style.h>
+#include <sheet-style.h>
+#include <number-match.h>
 
 #include <sys/utsname.h>
 #include <math.h>

plugins/fn-logical/functions.c

@@ -6,11 +6,13 @@
  *  Jukka-Pekka Iivonen (iivonen@iki.fi)
  */
 
-#include <config.h>
-#include "func.h"
-#include "parse-util.h"
-#include "cell.h"
-#include "auto-format.h"
+#include <gnumeric-config.h>
+#include <gnumeric.h>
+#include <func.h>
+
+#include <parse-util.h>
+#include <cell.h>
+#include <auto-format.h>
 
 /***************************************************************************/
 

plugins/fn-lookup/functions.c

@@ -8,14 +8,16 @@
  *  JP Rosevear <jpr@arcavia.com>
  */
 
-#include <config.h>
-#include "func.h"
-#include "parse-util.h"
-#include "eval.h"
-#include "cell.h"
-#include "str.h"
-#include "sheet.h"
-#include "expr-name.h"
+#include <gnumeric-config.h>
+#include <gnumeric.h>
+#include <func.h>
+
+#include <parse-util.h>
+#include <eval.h>
+#include <cell.h>
+#include <str.h>
+#include <sheet.h>
+#include <expr-name.h>
 
 #include <string.h>
 #include <stdlib.h>

plugins/fn-math/functions.c

@@ -5,17 +5,19 @@
  *  Miguel de Icaza (miguel@gnu.org)
  *  Jukka-Pekka Iivonen (iivonen@iki.fi)
  */
-#include <config.h>
-#include "func.h"
-#include "func-util.h"
-#include "parse-util.h"
-#include "cell.h"
-#include "sheet.h"
-#include "str.h"
-#include "mathfunc.h"
-#include "rangefunc.h"
-#include "collect.h"
-#include "auto-format.h"
+#include <gnumeric-config.h>
+#include <gnumeric.h>
+#include <func.h>
+
+#include <func-util.h>
+#include <parse-util.h>
+#include <cell.h>
+#include <sheet.h>
+#include <str.h>
+#include <mathfunc.h>
+#include <rangefunc.h>
+#include <collect.h>
+#include <auto-format.h>
 
 #include <math.h>
 #include <string.h>

plugins/fn-stat/functions.c

@@ -6,17 +6,19 @@
  *  Michael Meeks <michael@imaginator.com>
  *  Morten Welinder <terra@diku.dk>
  */
-#include <config.h>
-#include "func.h"
-#include "func-util.h"
-#include "parse-util.h"
-#include "mathfunc.h"
-#include "rangefunc.h"
-#include "regression.h"
-#include "sheet.h"
-#include "cell.h"
-#include "collect.h"
-#include "auto-format.h"
+#include <gnumeric-config.h>
+#include <gnumeric.h>
+#include <func.h>
+
+#include <func-util.h>
+#include <parse-util.h>
+#include <mathfunc.h>
+#include <rangefunc.h>
+#include <regression.h>
+#include <sheet.h>
+#include <cell.h>
+#include <collect.h>
+#include <auto-format.h>
 
 #include <math.h>
 #include <stdlib.h>

plugins/fn-string/functions.c

@@ -7,15 +7,17 @@
  *  Sean Atkinson (sca20@cam.ac.uk)
  *  Jukka-Pekka Iivonen (iivonen@iki.fi)
  */
-#include <config.h>
-#include "func.h"
-#include "parse-util.h"
-#include "cell.h"
-#include "format.h"
-#include "str.h"
-#include "sheet.h"
-#include "number-match.h"
-#include "mathfunc.h"
+#include <gnumeric-config.h>
+#include <gnumeric.h>
+#include <func.h>
+
+#include <parse-util.h>
+#include <cell.h>
+#include <format.h>
+#include <str.h>
+#include <sheet.h>
+#include <number-match.h>
+#include <mathfunc.h>
 
 #include <ctype.h>
 #include <math.h>

plugins/gb/common.c

-#include <config.h>
+#include <gnumeric-config.h>
+#include <gnumeric.h>
 #include <gbrun/libgbrun.h>
 
 #include "common.h"

plugins/gb/excel-gb-application.c

@@ -7,8 +7,8 @@
  *      Michael Meeks  <michael@helixcode.com>
  */
 
-#include <config.h>
-#include "gnumeric.h"
+#include <gnumeric-config.h>
+#include <gnumeric.h>
 #include "workbook.h"
 #include "sheet.h"
 

plugins/gb/excel-gb-context.c

-#include <config.h>
+#include <gnumeric-config.h>
+#include <gnumeric.h>
 #include <excel-gb-context.h>