Wrote a script to check for files that forget to include <config.h> and

	* check-config-h.pl: Wrote a script to check for files that forget
	to include <config.h> and optionally edit to add it.

        * src/nautilus-zoom-control.c (set_zoom_level): Fixed the bug
	number in a FIXME.

        * docs/style-guide.html: Added one more tip.

        * check-FIXME.pl: Use my newfound Perl knowledge to spruce it up.

        * components/help/converters/gnome-db2html2/gdb3html.c:
        * components/help/converters/gnome-db2html2/sect-elements.c:
        * components/help/converters/gnome-db2html2/sect-preparse.c:
        * components/help/converters/gnome-db2html2/toc-elements.c:
        * components/help/converters/gnome-info2html2/html.c:
        * components/help/converters/gnome-info2html2/main.c:
        * components/help/converters/gnome-info2html2/parse.c:
        * components/help/converters/gnome-info2html2/utils.c:
        * components/help/converters/gnome-man2html2/gnome-man2html.c:
        * components/help/hyperbola-filefmt.c:
        * components/help/hyperbola-nav-index.c:
        * components/help/hyperbola-nav-search.c:
        * components/help/hyperbola-nav-tree.c:
        * components/html/glibwww-callbacks.c:
        * components/html/glibwww-init.c:
        * components/html/glibwww-trans.c:
        * components/html/gnome-dialogs.c:
        * components/html/ntl-web-browser.c:
        * components/services/install/eazel-install-metadata.c:
        * components/services/install/eazel-install-protocols.c:
        * components/services/install/eazel-install-rpm-glue.c:
        * components/services/install/eazel-install-tests.c:
        * components/services/install/eazel-install-utils.c:
        * components/services/install/eazel-install-xml-package-list.c:
        * components/services/install/eazel-install.c:
        * components/services/install/helixcode-install-utils.c:
        * components/services/startup/eazel-register.c:
        * components/websearch/ntl-web-search.c:
        * helper-utilities/authenticate/nautilus-authenticate-fork.c:
        * helper-utilities/authenticate/nautilus-authenticate-pam.c:
        * helper-utilities/authenticate/nautilus-authenticate.c:
        * libnautilus-extensions/nautilus-bonobo-extensions.c:
        * libnautilus-extensions/nautilus-file-utilities.c:
        * libnautilus-extensions/nautilus-glib-extensions.c:
        * libnautilus-extensions/nautilus-link.c:
        * libnautilus-extensions/nautilus-mime-type.c:
        * libnautilus-extensions/nautilus-undo-transaction.c:
        * librsvg/art_rgba.c:
        * librsvg/art_rgba_svp.c:
        * librsvg/rsvg-bpath-util.c:
        * librsvg/rsvg-path.c:
        * librsvg/rsvg.c:
        * librsvg/test-rsvg.c:
        * nautilus-widgets/nautilus-caption-table.c:
        * nautilus-widgets/nautilus-password-dialog.c:
        * nautilus-widgets/nautilus-preferences-box.c:
        * nautilus-widgets/nautilus-preferences-dialog.c:
        * nautilus-widgets/nautilus-preferences-group.c:
        * nautilus-widgets/nautilus-preferences-item.c:
        * nautilus-widgets/nautilus-preferences-pane.c:
        * nautilus-widgets/nautilus-radio-button-group.c:
        * nautilus-widgets/test-nautilus-widgets.c:
        * nautilus-widgets/test-preferences.c:
        * src/file-manager/desktop-item.c:
        * src/file-manager/desktop-layout.c:
        * src/file-manager/desktop-menu.c:
        * src/nautilus-bookmarks-window.c:
        * src/nautilus-gconf.c:
	* src/nautilus-window-menus.c:
        * src/nautilus-window-toolbars.c:
	* src/nautilus-zoom-control.c
        * src/nautilus-zoomable-frame-svr.c:
        * src/ntl-app.c:
        * src/ntl-content-view.c:
        * src/ntl-main.c:
        * src/ntl-meta-view.c:
        * src/ntl-miniicon.c:
        * src/ntl-uri-map.c:
        * src/ntl-view-frame-svr.c:
        * src/ntl-view.c:
        * src/ntl-window-state.c:
	Added includes of <config.h>.

111 files changed, 339 insertions, 56 deletions

diff --git a/ChangeLog b/ChangeLog
index dd3d32a51..0eec81d99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,88 @@
+2000-05-01  Darin Adler  <darin@eazel.com>
+
+	* check-config-h.pl: Wrote a script to check for files that forget
+	to include <config.h> and optionally edit to add it.
+	
+        * src/nautilus-zoom-control.c (set_zoom_level): Fixed the bug
+	number in a FIXME.
+
+        * docs/style-guide.html: Added one more tip.
+
+        * check-FIXME.pl: Use my newfound Perl knowledge to spruce it up.
+
+        * components/help/converters/gnome-db2html2/gdb3html.c:
+        * components/help/converters/gnome-db2html2/sect-elements.c:
+        * components/help/converters/gnome-db2html2/sect-preparse.c:
+        * components/help/converters/gnome-db2html2/toc-elements.c:
+        * components/help/converters/gnome-info2html2/html.c:
+        * components/help/converters/gnome-info2html2/main.c:
+        * components/help/converters/gnome-info2html2/parse.c:
+        * components/help/converters/gnome-info2html2/utils.c:
+        * components/help/converters/gnome-man2html2/gnome-man2html.c:
+        * components/help/hyperbola-filefmt.c:
+        * components/help/hyperbola-nav-index.c:
+        * components/help/hyperbola-nav-search.c:
+        * components/help/hyperbola-nav-tree.c:
+        * components/html/glibwww-callbacks.c:
+        * components/html/glibwww-init.c:
+        * components/html/glibwww-trans.c:
+        * components/html/gnome-dialogs.c:
+        * components/html/ntl-web-browser.c:
+        * components/services/install/eazel-install-metadata.c:
+        * components/services/install/eazel-install-protocols.c:
+        * components/services/install/eazel-install-rpm-glue.c:
+        * components/services/install/eazel-install-tests.c:
+        * components/services/install/eazel-install-utils.c:
+        * components/services/install/eazel-install-xml-package-list.c:
+        * components/services/install/eazel-install.c:
+        * components/services/install/helixcode-install-utils.c:
+        * components/services/startup/eazel-register.c:
+        * components/websearch/ntl-web-search.c:
+        * helper-utilities/authenticate/nautilus-authenticate-fork.c:
+        * helper-utilities/authenticate/nautilus-authenticate-pam.c:
+        * helper-utilities/authenticate/nautilus-authenticate.c:
+        * libnautilus-extensions/nautilus-bonobo-extensions.c:
+        * libnautilus-extensions/nautilus-file-utilities.c:
+        * libnautilus-extensions/nautilus-glib-extensions.c:
+        * libnautilus-extensions/nautilus-link.c:
+        * libnautilus-extensions/nautilus-mime-type.c:
+        * libnautilus-extensions/nautilus-undo-transaction.c:
+        * librsvg/art_rgba.c:
+        * librsvg/art_rgba_svp.c:
+        * librsvg/rsvg-bpath-util.c:
+        * librsvg/rsvg-path.c:
+        * librsvg/rsvg.c:
+        * librsvg/test-rsvg.c:
+        * nautilus-widgets/nautilus-caption-table.c:
+        * nautilus-widgets/nautilus-password-dialog.c:
+        * nautilus-widgets/nautilus-preferences-box.c:
+        * nautilus-widgets/nautilus-preferences-dialog.c:
+        * nautilus-widgets/nautilus-preferences-group.c:
+        * nautilus-widgets/nautilus-preferences-item.c:
+        * nautilus-widgets/nautilus-preferences-pane.c:
+        * nautilus-widgets/nautilus-radio-button-group.c:
+        * nautilus-widgets/test-nautilus-widgets.c:
+        * nautilus-widgets/test-preferences.c:
+        * src/file-manager/desktop-item.c:
+        * src/file-manager/desktop-layout.c:
+        * src/file-manager/desktop-menu.c:
+        * src/nautilus-bookmarks-window.c:
+        * src/nautilus-gconf.c:
+	* src/nautilus-window-menus.c:
+        * src/nautilus-window-toolbars.c:
+	* src/nautilus-zoom-control.c
+        * src/nautilus-zoomable-frame-svr.c:
+        * src/ntl-app.c:
+        * src/ntl-content-view.c:
+        * src/ntl-main.c:
+        * src/ntl-meta-view.c:
+        * src/ntl-miniicon.c:
+        * src/ntl-uri-map.c:
+        * src/ntl-view-frame-svr.c:
+        * src/ntl-view.c:
+        * src/ntl-window-state.c:
+	Added includes of <config.h>.
+
 2000-05-01  Gene Z. Ragan  <gzr@eazel.com>
 
 	* libnautilus-extensions/nautilus-icon-text-item.c 
diff --git a/check-FIXME.pl b/check-FIXME.pl
index 47ef26457..257fd0d86 100755
--- a/check-FIXME.pl
+++ b/check-FIXME.pl
@@ -33,20 +33,23 @@ use strict;
 my %skip_files;
 if (!@ARGV)
   {
-    @ARGV = `find -name '*' -and ! \\( -name '*~' -or -name '#*' -or -name 'ChangeLog*' -or -name 'Entries' -or -name 'check-FIXME.pl' \\)`;
-    $skip_files{"./TODO"} = 1;
-    $skip_files{"./autogen.sh"} = 1;
-    $skip_files{"./aclocal.m4"} = 1;
-    $skip_files{"./config.sub"} = 1;
-    $skip_files{"./libtool"} = 1;
-    $skip_files{"./ltconfig"} = 1;
-    $skip_files{"./ltmain.sh"} = 1;
-    $skip_files{"./macros/gnome-fileutils.m4"} = 1;
-    $skip_files{"./macros/gnome-objc-checks.m4"} = 1;
-    $skip_files{"./macros/gnome-vfs.m4"} = 1;
-    $skip_files{"./src/file-manager/desktop-canvas.c"} = 1;
-    $skip_files{"./src/file-manager/desktop-layout.c"} = 1;
-    $skip_files{"./src/file-manager/desktop-window.c"} = 1;
+    @ARGV = `find -name '*' -and ! \\( -name '*~' -or -name '#*' -or -name 'ChangeLog*' -or -name 'Entries' \\)`;
+    %skip_files =
+      (
+       "./TODO" => 1,
+       "./aclocal.m4" => 1,
+       "./check-FIXME.pl" => 1,
+       "./config.sub" => 1,
+       "./libtool" => 1,
+       "./ltconfig" => 1,
+       "./ltmain.sh" => 1,
+       "./macros/gnome-fileutils.m4" => 1,
+       "./macros/gnome-objc-checks.m4" => 1,
+       "./macros/gnome-vfs.m4" => 1,
+       "./src/file-manager/desktop-canvas.c" => 1,
+       "./src/file-manager/desktop-layout.c" => 1,
+       "./src/file-manager/desktop-window.c" => 1,
+      );
   }
 
 # locate all of the target lines
diff --git a/check-config-h.pl b/check-config-h.pl
new file mode 100755
index 000000000..d7ee76856
--- /dev/null
+++ b/check-config-h.pl
@@ -0,0 +1,91 @@
+#!/usr/bin/perl -w
+# -*- Mode: perl; indent-tabs-mode: nil -*-
+
+#
+#  Nautilus
+#
+#  Copyright (C) 2000 Eazel, Inc.
+#
+#  This library 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 2 of the
+#  License, or (at your option) any later version.
+#
+#  This library 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 library; if not, write to the Free Software
+#  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+#  Author: Darin Adler <darin@eazel.com>,
+#
+
+# check-config-h.pl: Search for .c files where someone forgot to
+# put an include for <config.h> in.
+
+use diagnostics;
+use strict;
+
+use Getopt::Long;
+
+my $edit = 0;
+&GetOptions("edit" => \$edit);
+
+# default to all the files starting from the current directory
+my %skip_files;
+if (!@ARGV)
+  {
+    @ARGV = `find -name '*.c'`;
+  }
+
+# locate all of the target lines
+my @missing_files;
+FILE: foreach my $file (@ARGV)
+  {
+    chomp $file;
+    next if $skip_files{$file};
+    open FILE, $file or die "can't open $file";
+    while (<FILE>)
+      {
+        next FILE if /generated by/;
+        next FILE if /^\s*\#\s*include\s*[<\"]config\.h[>\"]/;
+      }
+    close FILE;
+    push @missing_files, $file;
+  }
+
+if (@missing_files)
+  {
+    print "\n", scalar(@missing_files), " C files don't have bug reports:\n\n";
+    if (!$edit)
+      {
+        print join("\n", @missing_files), "\n";
+      }
+    else
+      {
+        foreach my $file (@missing_files)
+          {
+            open OLD, $file or die "can't open $file";
+            open NEW, "> $file.new" or die "can't open $file.new";
+            while (<OLD>)
+              {
+                if (/^\s*\#\s*include\s/)
+                  {
+                    print NEW "$&<config.h>\n";
+                    print NEW;
+                    last;
+                  }
+                print NEW;
+              }
+            print NEW <OLD>;
+            close NEW;
+            close OLD;
+            rename "$file.new", $file or die "can't rename $file";
+            print "edited $file\n";
+          }
+      }
+  }
+
diff --git a/components/help/converters/gnome-db2html2/gdb3html.c b/components/help/converters/gnome-db2html2/gdb3html.c
index 30bb1608f..3d458f130 100644
--- a/components/help/converters/gnome-db2html2/gdb3html.c
+++ b/components/help/converters/gnome-db2html2/gdb3html.c
@@ -1,3 +1,4 @@
+#include <config.h>
 #include "gdb3html.h"
 #include "toc-elements.h"
 #include "sect-elements.h"
diff --git a/components/help/converters/gnome-db2html2/sect-elements.c b/components/help/converters/gnome-db2html2/sect-elements.c
index 9b90390ca..9a14c4a69 100644
--- a/components/help/converters/gnome-db2html2/sect-elements.c
+++ b/components/help/converters/gnome-db2html2/sect-elements.c
@@ -1,3 +1,4 @@
+#include <config.h>
 #include "sect-elements.h"
 #include "gnome.h"
 
diff --git a/components/help/converters/gnome-db2html2/sect-preparse.c b/components/help/converters/gnome-db2html2/sect-preparse.c
index 897c5e823..d84ead78a 100644
--- a/components/help/converters/gnome-db2html2/sect-preparse.c
+++ b/components/help/converters/gnome-db2html2/sect-preparse.c
@@ -1,4 +1,5 @@
 
+#include <config.h>
 #include "sect-elements.h"
 #include "gnome.h"
 
diff --git a/components/help/converters/gnome-db2html2/toc-elements.c b/components/help/converters/gnome-db2html2/toc-elements.c
index 186f26355..f007f848b 100644
--- a/components/help/converters/gnome-db2html2/toc-elements.c
+++ b/components/help/converters/gnome-db2html2/toc-elements.c
@@ -1,4 +1,5 @@
 
+#include <config.h>
 #include "toc-elements.h"
 
 
diff --git a/components/help/converters/gnome-info2html2/html.c b/components/help/converters/gnome-info2html2/html.c
index 1deec6be5..ef0d74a9e 100644
--- a/components/help/converters/gnome-info2html2/html.c
+++ b/components/help/converters/gnome-info2html2/html.c
@@ -1,5 +1,6 @@
 /* handles all html operations */
 
+#include <config.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <ctype.h>
diff --git a/components/help/converters/gnome-info2html2/main.c b/components/help/converters/gnome-info2html2/main.c
index 14d83e565..bebec68c0 100644
--- a/components/help/converters/gnome-info2html2/main.c
+++ b/components/help/converters/gnome-info2html2/main.c
@@ -1,5 +1,6 @@
 /* little test main() to see how we're doing */
 
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/components/help/converters/gnome-info2html2/parse.c b/components/help/converters/gnome-info2html2/parse.c
index 5f19012d7..0177368b0 100644
--- a/components/help/converters/gnome-info2html2/parse.c
+++ b/components/help/converters/gnome-info2html2/parse.c
@@ -2,6 +2,7 @@
 /* currently only finds nodes and contructs a tree */
 /* partially motivated by source code of the 'info' program */
 
+#include <config.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/components/help/converters/gnome-info2html2/utils.c b/components/help/converters/gnome-info2html2/utils.c
index 691372219..5ab276a57 100644
--- a/components/help/converters/gnome-info2html2/utils.c
+++ b/components/help/converters/gnome-info2html2/utils.c
@@ -1,5 +1,6 @@
 /* various utility functions */
 
+#include <config.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
diff --git a/components/help/converters/gnome-man2html2/gnome-man2html.c b/components/help/converters/gnome-man2html2/gnome-man2html.c
index f8d764a32..479932487 100644
--- a/components/help/converters/gnome-man2html2/gnome-man2html.c
+++ b/components/help/converters/gnome-man2html2/gnome-man2html.c
@@ -122,6 +122,7 @@
 */
 
 
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/components/help/hyperbola-filefmt.c b/components/help/hyperbola-filefmt.c
index 2825a87f2..6c06e49df 100644
--- a/components/help/hyperbola-filefmt.c
+++ b/components/help/hyperbola-filefmt.c
@@ -1,3 +1,4 @@
+#include <config.h>
 #include <gnome.h>
 #include <zlib.h>
 
diff --git a/components/help/hyperbola-nav-index.c b/components/help/hyperbola-nav-index.c
index 1db30eece..7cd32c3e2 100644
--- a/components/help/hyperbola-nav-index.c
+++ b/components/help/hyperbola-nav-index.c
@@ -1,3 +1,4 @@
+#include <config.h>
 #include <libnautilus/libnautilus.h>
 #include <gnome.h>
 #include "hyperbola-filefmt.h"
diff --git a/components/help/hyperbola-nav-search.c b/components/help/hyperbola-nav-search.c
index 7b8d75af9..8ab2fb411 100644
--- a/components/help/hyperbola-nav-search.c
+++ b/components/help/hyperbola-nav-search.c
@@ -1,3 +1,4 @@
+#include <config.h>
 #include <libnautilus/libnautilus.h>
 #include <gnome.h>
 #include "hyperbola-filefmt.h"
diff --git a/components/help/hyperbola-nav-tree.c b/components/help/hyperbola-nav-tree.c
index f0e6a1d48..83e916153 100644
--- a/components/help/hyperbola-nav-tree.c
+++ b/components/help/hyperbola-nav-tree.c
@@ -1,3 +1,4 @@
+#include <config.h>
 #include <libnautilus/libnautilus.h>
 #include "hyperbola-filefmt.h"
 #include <gtk/gtk.h>
diff --git a/components/html/glibwww-callbacks.c b/components/html/glibwww-callbacks.c
index 47caabe06..fec38ce56 100644
--- a/components/html/glibwww-callbacks.c
+++ b/components/html/glibwww-callbacks.c
@@ -1,4 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+#include <config.h>
 #include "glibwww.h"
 #include <HTEvent.h>
 #include <HTTimer.h>
diff --git a/components/html/glibwww-init.c b/components/html/glibwww-init.c
index 19853fb4d..8223eba7f 100644
--- a/components/html/glibwww-init.c
+++ b/components/html/glibwww-init.c
@@ -15,7 +15,7 @@
 #undef _
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 #include <glib.h>
 #include "glibwww.h"
diff --git a/components/html/glibwww-trans.c b/components/html/glibwww-trans.c
index 6263cb56d..cb903c82e 100644
--- a/components/html/glibwww-trans.c
+++ b/components/html/glibwww-trans.c
@@ -8,7 +8,7 @@
 #undef _
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 #include "glibwww.h"
 #include <stdio.h>
diff --git a/components/html/gnome-dialogs.c b/components/html/gnome-dialogs.c
index cc0c313ef..0cc2cec91 100644
--- a/components/html/gnome-dialogs.c
+++ b/components/html/gnome-dialogs.c
@@ -10,7 +10,7 @@
 #undef _
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 #include "glibwww.h"
 
diff --git a/components/html/ntl-web-browser.c b/components/html/ntl-web-browser.c
index b97fda4db..f3dec1ea2 100644
--- a/components/html/ntl-web-browser.c
+++ b/components/html/ntl-web-browser.c
@@ -1,3 +1,4 @@
+#include <config.h>
 #include <WWWCore.h>
 #include <WWWStream.h>
 #include <WWWTrans.h>
diff --git a/components/services/install/eazel-install-metadata.c b/components/services/install/eazel-install-metadata.c
index b72bc48f7..1f1b4aa02 100644
--- a/components/services/install/eazel-install-metadata.c
+++ b/components/services/install/eazel-install-metadata.c
@@ -25,6 +25,7 @@
  * file and install a services generated package-list.xml.
  */
 
+#include <config.h>
 #include "eazel-install-metadata.h"
 
 static gboolean create_default_configuration_metafile (const char* target_file);
diff --git a/components/services/install/eazel-install-protocols.c b/components/services/install/eazel-install-protocols.c
index 69759083c..89c8da4af 100644
--- a/components/services/install/eazel-install-protocols.c
+++ b/components/services/install/eazel-install-protocols.c
@@ -26,6 +26,7 @@
  * file and install a services generated package-list.xml.
  */
 
+#include <config.h>
 #include "eazel-install-protocols.h"
 
 gboolean
diff --git a/components/services/install/eazel-install-rpm-glue.c b/components/services/install/eazel-install-rpm-glue.c
index 88989c546..cd4eca340 100644
--- a/components/services/install/eazel-install-rpm-glue.c
+++ b/components/services/install/eazel-install-rpm-glue.c
@@ -25,6 +25,7 @@
  * file and install a services generated package-list.xml.
  */
 
+#include <config.h>
 #include "eazel-install-rpm-glue.h"
 
 gboolean
diff --git a/components/services/install/eazel-install-tests.c b/components/services/install/eazel-install-tests.c
index 6b49e8935..cd7ba955d 100644
--- a/components/services/install/eazel-install-tests.c
+++ b/components/services/install/eazel-install-tests.c
@@ -25,6 +25,7 @@
  * file and install a services generated package-list.xml.
  */
 
+#include <config.h>
 #include "eazel-install-tests.h"
 
 InstallOptions*
diff --git a/components/services/install/eazel-install-utils.c b/components/services/install/eazel-install-utils.c
index 1aaabe4d0..6bbfeb5b6 100644
--- a/components/services/install/eazel-install-utils.c
+++ b/components/services/install/eazel-install-utils.c
@@ -26,4 +26,5 @@
  * file and install a services generated package-list.xml.
  */
 
+#include <config.h>
 #include "eazel-install-utils.h"
diff --git a/components/services/install/eazel-install-xml-package-list.c b/components/services/install/eazel-install-xml-package-list.c
index 76822d337..9abf2b8e2 100644
--- a/components/services/install/eazel-install-xml-package-list.c
+++ b/components/services/install/eazel-install-xml-package-list.c
@@ -27,6 +27,7 @@
  * file and install a services generated package-list.xml.
  */
 
+#include <config.h>
 #include "eazel-install-xml-package-list.h"
 
 static PackageData* parse_package (xmlNode* package);
diff --git a/components/services/install/eazel-install.c b/components/services/install/eazel-install.c
index 4d9fbd8fa..cc1321c4d 100644
--- a/components/services/install/eazel-install.c
+++ b/components/services/install/eazel-install.c
@@ -28,6 +28,7 @@
  * file and install a services generated package-list.xml.
  */
 
+#include <config.h>
 #include "eazel-install-types.h"
 #include "eazel-install-protocols.h"
 #include "eazel-install-rpm-glue.h"
diff --git a/components/services/install/helixcode-install-utils.c b/components/services/install/helixcode-install-utils.c
index 9997d17b2..53420a26c 100644
--- a/components/services/install/helixcode-install-utils.c
+++ b/components/services/install/helixcode-install-utils.c
@@ -25,6 +25,7 @@
 /* Most of this code is taken directly from Joe Shaw's Helix Code install / Updater
  * with a few very minor changes made by me. */
 
+#include <config.h>
 #include "helixcode-install-utils.h"
 
 char*
diff --git a/components/services/startup/eazel-register.c b/components/services/startup/eazel-register.c
index 61852a103..be81ad1a9 100644
--- a/components/services/startup/eazel-register.c
+++ b/components/services/startup/eazel-register.c
@@ -24,6 +24,7 @@
  *
  */
 
+#include <config.h>
 #include <gdk/gdk.h>
 #include <stdio.h>
 #include <fcntl.h>
diff --git a/components/websearch/ntl-web-search.c b/components/websearch/ntl-web-search.c
index 160e88a05..cf9d8254e 100644
--- a/components/websearch/ntl-web-search.c
+++ b/components/websearch/ntl-web-search.c
@@ -23,8 +23,8 @@
  *
  */
 /* ntl-web-search.c: Rewrite KWebSearch using Gtk+ and Nautilus */
-#include "config.h"
 
+#include <config.h>
 #include <libnautilus/libnautilus.h>
 #include <gnome.h>
 #include <liboaf/liboaf.h>
diff --git a/docs/style-guide.html b/docs/style-guide.html
index c0398ac98..e58923f15 100644
--- a/docs/style-guide.html
+++ b/docs/style-guide.html
@@ -32,7 +32,8 @@ braces that open the block for an if statement on the same line as the
 if statement (part of Linux kernel brace style).</p>
 
 <p><b>We prefer to use words rather than acronyms or abbreviations.</b> This means that
-we name classes with a prefix like Nautilus, not Ntl, for example.</p>
+we name classes with a prefix like Nautilus, not Ntl, for example. And we use variables
+named result rather than retval or rv.</p>
 
 <p><b>We strive to have a minimum number of local variables.</b> This makes it
 easier to move pieces of code around. For more on this, read
diff --git a/helper-utilities/authenticate/nautilus-authenticate-fork.c b/helper-utilities/authenticate/nautilus-authenticate-fork.c
index 3488e0f4e..34dad71c0 100644
--- a/helper-utilities/authenticate/nautilus-authenticate-fork.c
+++ b/helper-utilities/authenticate/nautilus-authenticate-fork.c
@@ -24,6 +24,7 @@
  * command.   Return the process id in *pid_out.
  */
 
+#include <config.h>
 #include "nautilus-authenticate.h"
 
 #include <stdio.h>
diff --git a/helper-utilities/authenticate/nautilus-authenticate-pam.c b/helper-utilities/authenticate/nautilus-authenticate-pam.c
index 929ef75ee..7869fa611 100644
--- a/helper-utilities/authenticate/nautilus-authenticate-pam.c
+++ b/helper-utilities/authenticate/nautilus-authenticate-pam.c
@@ -23,6 +23,7 @@
 /* nautilus-authenticate-pam.c - Use PAM to authenticate a user.
  */
 
+#include <config.h>
 #include "nautilus-authenticate.h"
 
 #include <security/pam_appl.h>
diff --git a/helper-utilities/authenticate/nautilus-authenticate.c b/helper-utilities/authenticate/nautilus-authenticate.c
index e3ce0b9a3..5e9895d92 100644
--- a/helper-utilities/authenticate/nautilus-authenticate.c
+++ b/helper-utilities/authenticate/nautilus-authenticate.c
@@ -24,6 +24,7 @@
  * user and execute a priviledge command on their behalf.
  */
 
+#include <config.h>
 #include "nautilus-authenticate.h"
 
 #include <nautilus-widgets/nautilus-password-dialog.h>
diff --git a/libnautilus-extensions/nautilus-bonobo-extensions.c b/libnautilus-extensions/nautilus-bonobo-extensions.c
index 2fbfb2051..52c129068 100644
--- a/libnautilus-extensions/nautilus-bonobo-extensions.c
+++ b/libnautilus-extensions/nautilus-bonobo-extensions.c
@@ -24,6 +24,7 @@
    Author: John Sullivan <sullivan@eazel.com>
 */
 
+#include <config.h>
 #include "nautilus-bonobo-extensions.h"
 
 
diff --git a/libnautilus-extensions/nautilus-caption-table.c b/libnautilus-extensions/nautilus-caption-table.c
index a30d30c2d..ea9b4f0f5 100644
--- a/libnautilus-extensions/nautilus-caption-table.c
+++ b/libnautilus-extensions/nautilus-caption-table.c
@@ -22,6 +22,7 @@
    Authors: Ramiro Estrugo <ramiro@eazel.com>
 */
 
+#include <config.h>
 #include "nautilus-caption-table.h"
 
 #include <gtk/gtkentry.h>
diff --git a/libnautilus-extensions/nautilus-file-utilities.c b/libnautilus-extensions/nautilus-file-utilities.c
index b8b0e054a..9dda2b6e2 100644
--- a/libnautilus-extensions/nautilus-file-utilities.c
+++ b/libnautilus-extensions/nautilus-file-utilities.c
@@ -22,6 +22,7 @@
    Authors: John Sullivan <sullivan@eazel.com>
 */
 
+#include <config.h>
 #include "nautilus-file-utilities.h"
 
 #include <libgnome/gnome-defs.h>
diff --git a/libnautilus-extensions/nautilus-glib-extensions.c b/libnautilus-extensions/nautilus-glib-extensions.c
index 296883b13..61a5d5d35 100644
--- a/libnautilus-extensions/nautilus-glib-extensions.c
+++ b/libnautilus-extensions/nautilus-glib-extensions.c
@@ -24,6 +24,7 @@
    Authors: John Sullivan <sullivan@eazel.com>
 */
 
+#include <config.h>
 #include "nautilus-glib-extensions.h"
 
 #include "nautilus-lib-self-check-functions.h"
diff --git a/libnautilus-extensions/nautilus-link.c b/libnautilus-extensions/nautilus-link.c
index 8df50ad40..8cca581d4 100644
--- a/libnautilus-extensions/nautilus-link.c
+++ b/libnautilus-extensions/nautilus-link.c
@@ -22,6 +22,7 @@
    Author: Andy Hertzfeld <andy@eazel.com>
 */
 
+#include <config.h>
 #include <stdlib.h>
 
 #include <parser.h>
diff --git a/libnautilus-extensions/nautilus-mime-type.c b/libnautilus-extensions/nautilus-mime-type.c
index 44d19bb43..a423f91fd 100644
--- a/libnautilus-extensions/nautilus-mime-type.c
+++ b/libnautilus-extensions/nautilus-mime-type.c
@@ -26,6 +26,7 @@
    Author: Andy Hertzfeld <andy@eazel.com>
 */
 
+#include <config.h>
 #include <string.h>
 #include <stdio.h>
 #include "nautilus-glib-extensions.h"
diff --git a/libnautilus-extensions/nautilus-mini-icon.c b/libnautilus-extensions/nautilus-mini-icon.c
index 747d8c014..33dc63002 100644
--- a/libnautilus-extensions/nautilus-mini-icon.c
+++ b/libnautilus-extensions/nautilus-mini-icon.c
@@ -19,6 +19,7 @@
  * USA
  */
 
+#include <config.h>
 #include "ntl-miniicon.h"
 
 #include <gdk/gdkprivate.h>
diff --git a/libnautilus-extensions/nautilus-password-dialog.c b/libnautilus-extensions/nautilus-password-dialog.c
index ca19b7564..fd4072550 100644
--- a/libnautilus-extensions/nautilus-password-dialog.c
+++ b/libnautilus-extensions/nautilus-password-dialog.c
@@ -22,6 +22,7 @@
    Authors: Ramiro Estrugo <ramiro@eazel.com>
 */
 
+#include <config.h>
 #include "nautilus-password-dialog.h"
 #include "nautilus-caption-table.h"
 
diff --git a/libnautilus-extensions/nautilus-preferences-box.c b/libnautilus-extensions/nautilus-preferences-box.c
index 49947584d..94a70579e 100644
--- a/libnautilus-extensions/nautilus-preferences-box.c
+++ b/libnautilus-extensions/nautilus-preferences-box.c
@@ -23,6 +23,7 @@
 */
 
 
+#include <config.h>
 #include <nautilus-widgets/nautilus-preferences-box.h>
 #include <libnautilus-extensions/nautilus-gtk-macros.h>
 
diff --git a/libnautilus-extensions/nautilus-preferences-dialog.c b/libnautilus-extensions/nautilus-preferences-dialog.c
index e82f3e466..a2c2e5390 100644
--- a/libnautilus-extensions/nautilus-preferences-dialog.c
+++ b/libnautilus-extensions/nautilus-preferences-dialog.c
@@ -22,6 +22,7 @@
    Authors: Ramiro Estrugo <ramiro@eazel.com>
 */
 
+#include <config.h>
 #include <nautilus-widgets/nautilus-preferences-dialog.h>
 #include <libnautilus-extensions/nautilus-gtk-macros.h>
 
diff --git a/libnautilus-extensions/nautilus-preferences-group.c b/libnautilus-extensions/nautilus-preferences-group.c
index bb8a99ddf..dd6ed1426 100644
--- a/libnautilus-extensions/nautilus-preferences-group.c
+++ b/libnautilus-extensions/nautilus-preferences-group.c
@@ -22,6 +22,7 @@
    Authors: Ramiro Estrugo <ramiro@eazel.com>
 */
 
+#include <config.h>
 #include "nautilus-preferences-group.h"
 
 #include <gnome.h>
diff --git a/libnautilus-extensions/nautilus-preferences-item.c b/libnautilus-extensions/nautilus-preferences-item.c
index bee11995e..9808891c4 100644
--- a/libnautilus-extensions/nautilus-preferences-item.c
+++ b/libnautilus-extensions/nautilus-preferences-item.c
@@ -22,6 +22,7 @@
    Authors: Ramiro Estrugo <ramiro@eazel.com>
 */
 
+#include <config.h>
 #include "nautilus-preferences-item.h"
 #include "nautilus-preferences.h"
 #include <libnautilus-extensions/nautilus-gtk-macros.h>
diff --git a/libnautilus-extensions/nautilus-preferences-pane.c b/libnautilus-extensions/nautilus-preferences-pane.c
index db8b9d33f..9b2b40d31 100644
--- a/libnautilus-extensions/nautilus-preferences-pane.c
+++ b/libnautilus-extensions/nautilus-preferences-pane.c
@@ -23,6 +23,7 @@
 */
 
 
+#include <config.h>
 #include <nautilus-widgets/nautilus-preferences-pane.h>
 #include <libnautilus-extensions/nautilus-gtk-macros.h>
 
diff --git a/libnautilus-extensions/nautilus-radio-button-group.c b/libnautilus-extensions/nautilus-radio-button-group.c
index 38a9030b9..5b3b86dab 100644
--- a/libnautilus-extensions/nautilus-radio-button-group.c
+++ b/libnautilus-extensions/nautilus-radio-button-group.c
@@ -22,6 +22,7 @@
    Authors: Ramiro Estrugo <ramiro@eazel.com>
 */
 
+#include <config.h>
 #include <nautilus-widgets/nautilus-radio-button-group.h>
 
 #include <gtk/gtkradiobutton.h>
diff --git a/libnautilus-extensions/nautilus-undo-transaction.c b/libnautilus-extensions/nautilus-undo-transaction.c
index a007df281..e7c500c88 100644
--- a/libnautilus-extensions/nautilus-undo-transaction.c
+++ b/libnautilus-extensions/nautilus-undo-transaction.c
@@ -22,6 +22,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include "nautilus-undo-transaction.h"
 
 /* nautilus_undo_transaction_new */
diff --git a/libnautilus-extensions/test-nautilus-widgets.c b/libnautilus-extensions/test-nautilus-widgets.c
index ea7a25681..a53521362 100644
--- a/libnautilus-extensions/test-nautilus-widgets.c
+++ b/libnautilus-extensions/test-nautilus-widgets.c
@@ -1,4 +1,5 @@
 
+#include <config.h>
 #include <nautilus-widgets/nautilus-radio-button-group.h>
 #include <nautilus-widgets/nautilus-caption-table.h>
 #include <nautilus-widgets/nautilus-password-dialog.h>
diff --git a/libnautilus-extensions/test-preferences.c b/libnautilus-extensions/test-preferences.c
index d7b10a276..17d465521 100644
--- a/libnautilus-extensions/test-preferences.c
+++ b/libnautilus-extensions/test-preferences.c
@@ -1,4 +1,5 @@
 
+#include <config.h>
 #include <nautilus-widgets/nautilus-radio-button-group.h>
 #include <nautilus-widgets/nautilus-preferences-group.h>
 #include <nautilus-widgets/nautilus-preferences-item.h>
diff --git a/libnautilus-private/nautilus-bonobo-extensions.c b/libnautilus-private/nautilus-bonobo-extensions.c
index 2fbfb2051..52c129068 100644
--- a/libnautilus-private/nautilus-bonobo-extensions.c
+++ b/libnautilus-private/nautilus-bonobo-extensions.c
@@ -24,6 +24,7 @@
    Author: John Sullivan <sullivan@eazel.com>
 */
 
+#include <config.h>
 #include "nautilus-bonobo-extensions.h"
 
 
diff --git a/libnautilus-private/nautilus-caption-table.c b/libnautilus-private/nautilus-caption-table.c
index a30d30c2d..ea9b4f0f5 100644
--- a/libnautilus-private/nautilus-caption-table.c
+++ b/libnautilus-private/nautilus-caption-table.c
@@ -22,6 +22,7 @@
    Authors: Ramiro Estrugo <ramiro@eazel.com>
 */
 
+#include <config.h>
 #include "nautilus-caption-table.h"
 
 #include <gtk/gtkentry.h>
diff --git a/libnautilus-private/nautilus-file-utilities.c b/libnautilus-private/nautilus-file-utilities.c
index b8b0e054a..9dda2b6e2 100644
--- a/libnautilus-private/nautilus-file-utilities.c
+++ b/libnautilus-private/nautilus-file-utilities.c
@@ -22,6 +22,7 @@
    Authors: John Sullivan <sullivan@eazel.com>
 */
 
+#include <config.h>
 #include "nautilus-file-utilities.h"
 
 #include <libgnome/gnome-defs.h>
diff --git a/libnautilus-private/nautilus-glib-extensions.c b/libnautilus-private/nautilus-glib-extensions.c
index 296883b13..61a5d5d35 100644
--- a/libnautilus-private/nautilus-glib-extensions.c
+++ b/libnautilus-private/nautilus-glib-extensions.c
@@ -24,6 +24,7 @@
    Authors: John Sullivan <sullivan@eazel.com>
 */
 
+#include <config.h>
 #include "nautilus-glib-extensions.h"
 
 #include "nautilus-lib-self-check-functions.h"
diff --git a/libnautilus-private/nautilus-link.c b/libnautilus-private/nautilus-link.c
index 8df50ad40..8cca581d4 100644
--- a/libnautilus-private/nautilus-link.c
+++ b/libnautilus-private/nautilus-link.c
@@ -22,6 +22,7 @@
    Author: Andy Hertzfeld <andy@eazel.com>
 */
 
+#include <config.h>
 #include <stdlib.h>
 
 #include <parser.h>
diff --git a/libnautilus-private/nautilus-mime-type.c b/libnautilus-private/nautilus-mime-type.c
index 44d19bb43..a423f91fd 100644
--- a/libnautilus-private/nautilus-mime-type.c
+++ b/libnautilus-private/nautilus-mime-type.c
@@ -26,6 +26,7 @@
    Author: Andy Hertzfeld <andy@eazel.com>
 */
 
+#include <config.h>
 #include <string.h>
 #include <stdio.h>
 #include "nautilus-glib-extensions.h"
diff --git a/libnautilus-private/nautilus-mini-icon.c b/libnautilus-private/nautilus-mini-icon.c
index 747d8c014..33dc63002 100644
--- a/libnautilus-private/nautilus-mini-icon.c
+++ b/libnautilus-private/nautilus-mini-icon.c
@@ -19,6 +19,7 @@
  * USA
  */
 
+#include <config.h>
 #include "ntl-miniicon.h"
 
 #include <gdk/gdkprivate.h>
diff --git a/libnautilus-private/nautilus-password-dialog.c b/libnautilus-private/nautilus-password-dialog.c
index ca19b7564..fd4072550 100644
--- a/libnautilus-private/nautilus-password-dialog.c
+++ b/libnautilus-private/nautilus-password-dialog.c
@@ -22,6 +22,7 @@
    Authors: Ramiro Estrugo <ramiro@eazel.com>
 */
 
+#include <config.h>
 #include "nautilus-password-dialog.h"
 #include "nautilus-caption-table.h"
 
diff --git a/libnautilus-private/nautilus-preferences-box.c b/libnautilus-private/nautilus-preferences-box.c
index 49947584d..94a70579e 100644
--- a/libnautilus-private/nautilus-preferences-box.c
+++ b/libnautilus-private/nautilus-preferences-box.c
@@ -23,6 +23,7 @@
 */
 
 
+#include <config.h>
 #include <nautilus-widgets/nautilus-preferences-box.h>
 #include <libnautilus-extensions/nautilus-gtk-macros.h>
 
diff --git a/libnautilus-private/nautilus-preferences-dialog.c b/libnautilus-private/nautilus-preferences-dialog.c
index e82f3e466..a2c2e5390 100644
--- a/libnautilus-private/nautilus-preferences-dialog.c
+++ b/libnautilus-private/nautilus-preferences-dialog.c
@@ -22,6 +22,7 @@
    Authors: Ramiro Estrugo <ramiro@eazel.com>
 */
 
+#include <config.h>
 #include <nautilus-widgets/nautilus-preferences-dialog.h>
 #include <libnautilus-extensions/nautilus-gtk-macros.h>
 
diff --git a/libnautilus-private/nautilus-preferences-group.c b/libnautilus-private/nautilus-preferences-group.c
index bb8a99ddf..dd6ed1426 100644
--- a/libnautilus-private/nautilus-preferences-group.c
+++ b/libnautilus-private/nautilus-preferences-group.c
@@ -22,6 +22,7 @@
    Authors: Ramiro Estrugo <ramiro@eazel.com>
 */
 
+#include <config.h>
 #include "nautilus-preferences-group.h"
 
 #include <gnome.h>
diff --git a/libnautilus-private/nautilus-preferences-item.c b/libnautilus-private/nautilus-preferences-item.c
index bee11995e..9808891c4 100644
--- a/libnautilus-private/nautilus-preferences-item.c
+++ b/libnautilus-private/nautilus-preferences-item.c
@@ -22,6 +22,7 @@
    Authors: Ramiro Estrugo <ramiro@eazel.com>
 */
 
+#include <config.h>
 #include "nautilus-preferences-item.h"
 #include "nautilus-preferences.h"
 #include <libnautilus-extensions/nautilus-gtk-macros.h>
diff --git a/libnautilus-private/nautilus-preferences-pane.c b/libnautilus-private/nautilus-preferences-pane.c
index db8b9d33f..9b2b40d31 100644
--- a/libnautilus-private/nautilus-preferences-pane.c
+++ b/libnautilus-private/nautilus-preferences-pane.c
@@ -23,6 +23,7 @@
 */
 
 
+#include <config.h>
 #include <nautilus-widgets/nautilus-preferences-pane.h>
 #include <libnautilus-extensions/nautilus-gtk-macros.h>
 
diff --git a/libnautilus-private/nautilus-radio-button-group.c b/libnautilus-private/nautilus-radio-button-group.c
index 38a9030b9..5b3b86dab 100644
--- a/libnautilus-private/nautilus-radio-button-group.c
+++ b/libnautilus-private/nautilus-radio-button-group.c
@@ -22,6 +22,7 @@
    Authors: Ramiro Estrugo <ramiro@eazel.com>
 */
 
+#include <config.h>
 #include <nautilus-widgets/nautilus-radio-button-group.h>
 
 #include <gtk/gtkradiobutton.h>
diff --git a/libnautilus-private/nautilus-undo-transaction.c b/libnautilus-private/nautilus-undo-transaction.c
index a007df281..e7c500c88 100644
--- a/libnautilus-private/nautilus-undo-transaction.c
+++ b/libnautilus-private/nautilus-undo-transaction.c
@@ -22,6 +22,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include <config.h>
 #include "nautilus-undo-transaction.h"
 
 /* nautilus_undo_transaction_new */
diff --git a/libnautilus-private/test-nautilus-widgets.c b/libnautilus-private/test-nautilus-widgets.c
index ea7a25681..a53521362 100644
--- a/libnautilus-private/test-nautilus-widgets.c
+++ b/libnautilus-private/test-nautilus-widgets.c
@@ -1,4 +1,5 @@
 
+#include <config.h>
 #include <nautilus-widgets/nautilus-radio-button-group.h>
 #include <nautilus-widgets/nautilus-caption-table.h>
 #include <nautilus-widgets/nautilus-password-dialog.h>
diff --git a/libnautilus-private/test-preferences.c b/libnautilus-private/test-preferences.c
index d7b10a276..17d465521 100644
--- a/libnautilus-private/test-preferences.c
+++ b/libnautilus-private/test-preferences.c
@@ -1,4 +1,5 @@
 
+#include <config.h>
 #include <nautilus-widgets/nautilus-radio-button-group.h>
 #include <nautilus-widgets/nautilus-preferences-group.h>
 #include <nautilus-widgets/nautilus-preferences-item.h>
diff --git a/librsvg/art_rgba.c b/librsvg/art_rgba.c
index 6b1b5d8ad..209f67564 100644
--- a/librsvg/art_rgba.c
+++ b/librsvg/art_rgba.c
@@ -20,6 +20,7 @@
  * 02111-1307, USA.
  */
 
+#include <config.h>
 #include <libart_lgpl/art_misc.h>
 #include "art_rgba.h"
 
diff --git a/librsvg/art_rgba_svp.c b/librsvg/art_rgba_svp.c
index 20eff1833..29658cd70 100644
--- a/librsvg/art_rgba_svp.c
+++ b/librsvg/art_rgba_svp.c
@@ -20,6 +20,7 @@
  * 02111-1307, USA.
  */
 
+#include <config.h>
 #include <libart_lgpl/art_misc.h>
 #include <libart_lgpl/art_svp.h>
 #include <libart_lgpl/art_svp_render_aa.h>
diff --git a/librsvg/rsvg-bpath-util.c b/librsvg/rsvg-bpath-util.c
index 1c8cca5bb..b6556d77c 100644
--- a/librsvg/rsvg-bpath-util.c
+++ b/librsvg/rsvg-bpath-util.c
@@ -21,6 +21,7 @@
    Author: Raph Levien <raph@artofcode.com>
 */
 
+#include <config.h>
 #include <glib.h>
 #include <math.h>
 #include "rsvg-bpath-util.h"
diff --git a/librsvg/rsvg-path.c b/librsvg/rsvg-path.c
index 155e521f4..9393e9924 100644
--- a/librsvg/rsvg-path.c
+++ b/librsvg/rsvg-path.c
@@ -24,6 +24,7 @@
 /* This is adapted from svg-path in Gill. */
 
 
+#include <config.h>
 #include <string.h>
 #include <stdlib.h>
 #include <math.h>
diff --git a/librsvg/rsvg.c b/librsvg/rsvg.c
index 466d44fcc..7c915c1c3 100644
--- a/librsvg/rsvg.c
+++ b/librsvg/rsvg.c
@@ -21,6 +21,7 @@
    Author: Raph Levien <raph@artofcode.com>
 */
 
+#include <config.h>
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
diff --git a/librsvg/test-rsvg.c b/librsvg/test-rsvg.c
index 347bfd1d6..618491ba3 100644
--- a/librsvg/test-rsvg.c
+++ b/librsvg/test-rsvg.c
@@ -22,6 +22,7 @@
    Author: Raph Levien <raph@artofcode.com>
 */
 
+#include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <png.h>
diff --git a/nautilus-widgets/nautilus-caption-table.c b/nautilus-widgets/nautilus-caption-table.c
index a30d30c2d..ea9b4f0f5 100644
--- a/nautilus-widgets/nautilus-caption-table.c
+++ b/nautilus-widgets/nautilus-caption-table.c
@@ -22,6 +22,7 @@
    Authors: Ramiro Estrugo <ramiro@eazel.com>
 */
 
+#include <config.h>
 #include "nautilus-caption-table.h"
 
 #include <gtk/gtkentry.h>
diff --git a/nautilus-widgets/nautilus-password-dialog.c b/nautilus-widgets/nautilus-password-dialog.c
index ca19b7564..fd4072550 100644
--- a/nautilus-widgets/nautilus-password-dialog.c
+++ b/nautilus-widgets/nautilus-password-dialog.c
@@ -22,6 +22,7 @@
    Authors: Ramiro Estrugo <ramiro@eazel.com>
 */
 
+#include <config.h>
 #include "nautilus-password-dialog.h"
 #include "nautilus-caption-table.h"
 
diff --git a/nautilus-widgets/nautilus-preferences-box.c b/nautilus-widgets/nautilus-preferences-box.c
index 49947584d..94a70579e 100644
--- a/nautilus-widgets/nautilus-preferences-box.c
+++ b/nautilus-widgets/nautilus-preferences-box.c
@@ -23,6 +23,7 @@
 */
 
 
+#include <config.h>
 #include <nautilus-widgets/nautilus-preferences-box.h>
 #include <libnautilus-extensions/nautilus-gtk-macros.h>
 
diff --git a/nautilus-widgets/nautilus-preferences-dialog.c b/nautilus-widgets/nautilus-preferences-dialog.c
index e82f3e466..a2c2e5390 100644
--- a/nautilus-widgets/nautilus-preferences-dialog.c
+++ b/nautilus-widgets/nautilus-preferences-dialog.c
@@ -22,6 +22,7 @@
    Authors: Ramiro Estrugo <ramiro@eazel.com>
 */
 
+#include <config.h>
 #include <nautilus-widgets/nautilus-preferences-dialog.h>
 #include <libnautilus-extensions/nautilus-gtk-macros.h>
 
diff --git a/nautilus-widgets/nautilus-preferences-group.c b/nautilus-widgets/nautilus-preferences-group.c
index bb8a99ddf..dd6ed1426 100644
--- a/nautilus-widgets/nautilus-preferences-group.c
+++ b/nautilus-widgets/nautilus-preferences-group.c
@@ -22,6 +22,7 @@
    Authors: Ramiro Estrugo <ramiro@eazel.com>
 */
 
+#include <config.h>
 #include "nautilus-preferences-group.h"
 
 #include <gnome.h>
diff --git a/nautilus-widgets/nautilus-preferences-item.c b/nautilus-widgets/nautilus-preferences-item.c
index bee11995e..9808891c4 100644
--- a/nautilus-widgets/nautilus-preferences-item.c
+++ b/nautilus-widgets/nautilus-preferences-item.c
@@ -22,6 +22,7 @@
    Authors: Ramiro Estrugo <ramiro@eazel.com>
 */
 
+#include <config.h>
 #include "nautilus-preferences-item.h"
 #include "nautilus-preferences.h"
 #include <libnautilus-extensions/nautilus-gtk-macros.h>
diff --git a/nautilus-widgets/nautilus-preferences-pane.c b/nautilus-widgets/nautilus-preferences-pane.c
index db8b9d33f..9b2b40d31 100644
--- a/nautilus-widgets/nautilus-preferences-pane.c
+++ b/nautilus-widgets/nautilus-preferences-pane.c
@@ -23,6 +23,7 @@
 */
 
 
+#include <config.h>
 #include <nautilus-widgets/nautilus-preferences-pane.h>
 #include <libnautilus-extensions/nautilus-gtk-macros.h>
 
diff --git a/nautilus-widgets/nautilus-radio-button-group.c b/nautilus-widgets/nautilus-radio-button-group.c
index 38a9030b9..5b3b86dab 100644
--- a/nautilus-widgets/nautilus-radio-button-group.c
+++ b/nautilus-widgets/nautilus-radio-button-group.c
@@ -22,6 +22,7 @@
    Authors: Ramiro Estrugo <ramiro@eazel.com>
 */
 
+#include <config.h>
 #include <nautilus-widgets/nautilus-radio-button-group.h>
 
 #include <gtk/gtkradiobutton.h>
diff --git a/nautilus-widgets/test-nautilus-widgets.c b/nautilus-widgets/test-nautilus-widgets.c
index ea7a25681..a53521362 100644
--- a/nautilus-widgets/test-nautilus-widgets.c
+++ b/nautilus-widgets/test-nautilus-widgets.c
@@ -1,4 +1,5 @@
 
+#include <config.h>
 #include <nautilus-widgets/nautilus-radio-button-group.h>
 #include <nautilus-widgets/nautilus-caption-table.h>
 #include <nautilus-widgets/nautilus-password-dialog.h>
diff --git a/nautilus-widgets/test-preferences.c b/nautilus-widgets/test-preferences.c
index d7b10a276..17d465521 100644
--- a/nautilus-widgets/test-preferences.c
+++ b/nautilus-widgets/test-preferences.c
@@ -1,4 +1,5 @@
 
+#include <config.h>
 #include <nautilus-widgets/nautilus-radio-button-group.h>
 #include <nautilus-widgets/nautilus-preferences-group.h>
 #include <nautilus-widgets/nautilus-preferences-item.h>
diff --git a/src/file-manager/desktop-item.c b/src/file-manager/desktop-item.c
index 8312bac1b..49eaeaba4 100644
--- a/src/file-manager/desktop-item.c
+++ b/src/file-manager/desktop-item.c
@@ -20,6 +20,7 @@
  * USA
  */
 
+#include <config.h>
 #include "desktop-item.h"
 
 #include <gdk-pixbuf/gnome-canvas-pixbuf.h>
diff --git a/src/file-manager/desktop-layout.c b/src/file-manager/desktop-layout.c
index c8e151d7b..1076808f8 100644
--- a/src/file-manager/desktop-layout.c
+++ b/src/file-manager/desktop-layout.c
@@ -20,6 +20,7 @@
  * USA
  */
 
+#include <config.h>
 #include "desktop-layout.h"
 
 struct _DesktopLayoutItem {
diff --git a/src/file-manager/desktop-menu.c b/src/file-manager/desktop-menu.c
index 3d6806f0f..ef8ba9269 100644
--- a/src/file-manager/desktop-menu.c
+++ b/src/file-manager/desktop-menu.c
@@ -20,6 +20,7 @@
  * USA
  */
 
+#include <config.h>
 #include "desktop-menu.h"
 
 #include <libgnomeui/gnome-popup-menu.h>
diff --git a/src/nautilus-applicable-views.c b/src/nautilus-applicable-views.c
index 4d50bd775..bd14dc5f3 100644
--- a/src/nautilus-applicable-views.c
+++ b/src/nautilus-applicable-views.c
@@ -26,6 +26,7 @@
 /* ntl-uri-map.c: Implementation of routines for mapping a location
    change request to a set of views and actual URL to be loaded. */
 
+#include <config.h>
 #include "ntl-uri-map.h"
 
 #include <libnautilus-extensions/nautilus-directory.h>
diff --git a/src/nautilus-application.c b/src/nautilus-application.c
index c77e01d8b..2ccc18802 100644
--- a/src/nautilus-application.c
+++ b/src/nautilus-application.c
@@ -24,6 +24,7 @@
  *
  */
 
+#include <config.h>
 #include "nautilus.h"
 #include <libnautilus/libnautilus.h>
 #include <bonobo.h>
diff --git a/src/nautilus-bookmarks-window.c b/src/nautilus-bookmarks-window.c
index 1ea7558ea..2b29540c8 100644
--- a/src/nautilus-bookmarks-window.c
+++ b/src/nautilus-bookmarks-window.c
@@ -22,6 +22,7 @@
    Authors: John Sullivan <sullivan@eazel.com>
 */
 
+#include <config.h>
 #include "nautilus-bookmarks-window.h"
 #include <libnautilus-extensions/nautilus-entry.h>
 #include <libnautilus-extensions/nautilus-icon-factory.h>
diff --git a/src/nautilus-gconf.c b/src/nautilus-gconf.c
index 2bd895a29..0fee3dd2e 100644
--- a/src/nautilus-gconf.c
+++ b/src/nautilus-gconf.c
@@ -22,6 +22,7 @@
    Authors: Havoc Pennington <hp@redhat.com>
 */
 
+#include <config.h>
 #include "nautilus-gconf.h"
 
 static GConfClient *global_client = NULL;
diff --git a/src/nautilus-main.c b/src/nautilus-main.c
index ab310980c..abd99e400 100644
--- a/src/nautilus-main.c
+++ b/src/nautilus-main.c
@@ -28,7 +28,7 @@
 
 /* ntl-main.c: Implementation of the routines that drive program lifecycle and main window creation/destruction. */
 
-#include "config.h"
+#include <config.h>
 #include "nautilus.h"
 #include "nautilus-self-check-functions.h"
 #include <libnautilus-extensions/nautilus-debug.h>
diff --git a/src/nautilus-navigation-window-menus.c b/src/nautilus-navigation-window-menus.c
index 93169bdd0..427a4383a 100644
--- a/src/nautilus-navigation-window-menus.c
+++ b/src/nautilus-navigation-window-menus.c
@@ -23,6 +23,8 @@
    Author: John Sullivan <sullivan@eazel.com>
 */
 
+#include <config.h>
+
 #include "nautilus-bookmark-list.h"
 #include "nautilus-bookmarks-window.h"
 #include "nautilus-signaller.h"
@@ -78,19 +80,19 @@ file_menu_new_window_callback (BonoboUIHandler *ui_handler,
 			       gpointer user_data, 
 			       const char *path)
 {
-  NautilusWindow *current_mainwin;
-  NautilusWindow *new_mainwin;
-
-  g_return_if_fail (NAUTILUS_IS_WINDOW (user_data));
-  
-  current_mainwin = NAUTILUS_WINDOW (user_data);
-
-  new_mainwin = nautilus_app_create_window (NAUTILUS_APP (current_mainwin->app));
-
-  nautilus_window_goto_uri (new_mainwin, 
-                            nautilus_window_get_requested_uri (current_mainwin));
-
-  gtk_widget_show (GTK_WIDGET (new_mainwin));
+	NautilusWindow *current_mainwin;
+	NautilusWindow *new_mainwin;
+	
+	g_return_if_fail (NAUTILUS_IS_WINDOW (user_data));
+	
+	current_mainwin = NAUTILUS_WINDOW (user_data);
+	
+	new_mainwin = nautilus_app_create_window (NAUTILUS_APP (current_mainwin->app));
+	
+	nautilus_window_goto_uri (new_mainwin, 
+				  nautilus_window_get_requested_uri (current_mainwin));
+	
+	gtk_widget_show (GTK_WIDGET (new_mainwin));
 }
 
 static void
@@ -849,15 +851,15 @@ nautilus_window_initialize_menus (NautilusWindow *window)
          * Some (hopefully all) will be overridden by implementations by the
          * different content views.
          */
-	bonobo_ui_handler_menu_set_sensitivity(ui_handler, 
-        				       NAUTILUS_MENU_PATH_SELECT_ALL_ITEM, 
-        				       FALSE);
+	bonobo_ui_handler_menu_set_sensitivity (ui_handler, 
+        				        NAUTILUS_MENU_PATH_SELECT_ALL_ITEM, 
+						FALSE);
 
         /* Set initial toggle state of Eazel theme menu item */
         update_eazel_theme_menu_item (window);
 
         /* Set inital state of undo menu */
-	update_undo_menu_item(window);
+	update_undo_menu_item (window);
         
         /* Sign up to be notified of icon theme changes so Use Eazel Theme Icons
          * menu item will show correct toggle state. */        
diff --git a/src/nautilus-view-frame-corba.c b/src/nautilus-view-frame-corba.c
index cab50b069..3e1d22ce2 100644
--- a/src/nautilus-view-frame-corba.c
+++ b/src/nautilus-view-frame-corba.c
@@ -26,6 +26,7 @@
 /* ntl-view-frame-svr.c: CORBA server implementation of the object
    representing a data view frame. */
 
+#include <config.h>
 #include "nautilus.h"
 #include "ntl-view-private.h"
 
diff --git a/src/nautilus-view-frame.c b/src/nautilus-view-frame.c
index d69cdcb02..da2f3bd6a 100644
--- a/src/nautilus-view-frame.c
+++ b/src/nautilus-view-frame.c
@@ -27,6 +27,7 @@
    and its associated CORBA object for proxying requests into this
    object. */
 
+#include <config.h>
 #include "ntl-view-private.h"
 #include "nautilus.h"
 #include <libnautilus-extensions/nautilus-gtk-extensions.h>
diff --git a/src/nautilus-window-menus.c b/src/nautilus-window-menus.c
index 93169bdd0..427a4383a 100644
--- a/src/nautilus-window-menus.c
+++ b/src/nautilus-window-menus.c
@@ -23,6 +23,8 @@
    Author: John Sullivan <sullivan@eazel.com>
 */
 
+#include <config.h>
+
 #include "nautilus-bookmark-list.h"
 #include "nautilus-bookmarks-window.h"
 #include "nautilus-signaller.h"
@@ -78,19 +80,19 @@ file_menu_new_window_callback (BonoboUIHandler *ui_handler,
 			       gpointer user_data, 
 			       const char *path)
 {
-  NautilusWindow *current_mainwin;
-  NautilusWindow *new_mainwin;
-
-  g_return_if_fail (NAUTILUS_IS_WINDOW (user_data));
-  
-  current_mainwin = NAUTILUS_WINDOW (user_data);
-
-  new_mainwin = nautilus_app_create_window (NAUTILUS_APP (current_mainwin->app));
-
-  nautilus_window_goto_uri (new_mainwin, 
-                            nautilus_window_get_requested_uri (current_mainwin));
-
-  gtk_widget_show (GTK_WIDGET (new_mainwin));
+	NautilusWindow *current_mainwin;
+	NautilusWindow *new_mainwin;
+	
+	g_return_if_fail (NAUTILUS_IS_WINDOW (user_data));
+	
+	current_mainwin = NAUTILUS_WINDOW (user_data);
+	
+	new_mainwin = nautilus_app_create_window (NAUTILUS_APP (current_mainwin->app));
+	
+	nautilus_window_goto_uri (new_mainwin, 
+				  nautilus_window_get_requested_uri (current_mainwin));
+	
+	gtk_widget_show (GTK_WIDGET (new_mainwin));
 }
 
 static void
@@ -849,15 +851,15 @@ nautilus_window_initialize_menus (NautilusWindow *window)
          * Some (hopefully all) will be overridden by implementations by the
          * different content views.
          */
-	bonobo_ui_handler_menu_set_sensitivity(ui_handler, 
-        				       NAUTILUS_MENU_PATH_SELECT_ALL_ITEM, 
-        				       FALSE);
+	bonobo_ui_handler_menu_set_sensitivity (ui_handler, 
+        				        NAUTILUS_MENU_PATH_SELECT_ALL_ITEM, 
+						FALSE);
 
         /* Set initial toggle state of Eazel theme menu item */
         update_eazel_theme_menu_item (window);
 
         /* Set inital state of undo menu */
-	update_undo_menu_item(window);
+	update_undo_menu_item (window);
         
         /* Sign up to be notified of icon theme changes so Use Eazel Theme Icons
          * menu item will show correct toggle state. */        
diff --git a/src/nautilus-window-state.c b/src/nautilus-window-state.c
index c7f14b66b..0fec33f9f 100644
--- a/src/nautilus-window-state.c
+++ b/src/nautilus-window-state.c
@@ -24,6 +24,7 @@
  *
  */
 
+#include <config.h>
 #include "nautilus.h"
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>
diff --git a/src/nautilus-window-toolbars.c b/src/nautilus-window-toolbars.c
index 655b9086b..d1a72800c 100644
--- a/src/nautilus-window-toolbars.c
+++ b/src/nautilus-window-toolbars.c
@@ -23,6 +23,7 @@
    Author: John Sullivan <sullivan@eazel.com>
 */
 
+#include <config.h>
 #include "ntl-window-private.h"
 #include "ntl-app.h"
 
diff --git a/src/nautilus-zoom-control.c b/src/nautilus-zoom-control.c
index caf3730f9..b7e7871ad 100644
--- a/src/nautilus-zoom-control.c
+++ b/src/nautilus-zoom-control.c
@@ -23,6 +23,7 @@
  *
  */
 
+#include <config.h>
 #include <gdk/gdk.h>
 #include <gtk/gtkeventbox.h>
 #include <gtk/gtkwidget.h>
@@ -260,7 +261,7 @@ set_zoom_level(NautilusZoomControl *zoom_control, gint new_level)
 	zoom_control->current_zoom = new_level;
 	zoom_control->zoom_factor = (double) nautilus_get_icon_size_for_zoom_level
 		(zoom_control->current_zoom) / NAUTILUS_ICON_SIZE_STANDARD;    
-	/* FIXME bugzilla.eazel.com 671: 
+	/* FIXME bugzilla.eazel.com 305: 
 	 * tell the content view about the zoom change here soon 
 	 */
 }
diff --git a/src/nautilus-zoomable-frame-corba.c b/src/nautilus-zoomable-frame-corba.c
index 489ad6fb1..5ede0b97c 100644
--- a/src/nautilus-zoomable-frame-corba.c
+++ b/src/nautilus-zoomable-frame-corba.c
@@ -26,6 +26,7 @@
 /* ntl-zoomable-frame-svr.c: CORBA server implementation of
    Nautilus::ZoomableFrame interface of a nautilus ViewFrame. */
 
+#include <config.h>
 #include "nautilus.h"
 #include "ntl-view-private.h"
 
diff --git a/src/nautilus-zoomable-frame-svr.c b/src/nautilus-zoomable-frame-svr.c
index 489ad6fb1..5ede0b97c 100644
--- a/src/nautilus-zoomable-frame-svr.c
+++ b/src/nautilus-zoomable-frame-svr.c
@@ -26,6 +26,7 @@
 /* ntl-zoomable-frame-svr.c: CORBA server implementation of
    Nautilus::ZoomableFrame interface of a nautilus ViewFrame. */
 
+#include <config.h>
 #include "nautilus.h"
 #include "ntl-view-private.h"
 
diff --git a/src/ntl-app.c b/src/ntl-app.c
index c77e01d8b..2ccc18802 100644
--- a/src/ntl-app.c
+++ b/src/ntl-app.c
@@ -24,6 +24,7 @@
  *
  */
 
+#include <config.h>
 #include "nautilus.h"
 #include <libnautilus/libnautilus.h>
 #include <bonobo.h>
diff --git a/src/ntl-content-view.c b/src/ntl-content-view.c
index f460e4d76..4f866b9bd 100644
--- a/src/ntl-content-view.c
+++ b/src/ntl-content-view.c
@@ -25,6 +25,7 @@
  */
 /* ntl-content-view.c: Implementation of the object representing a content view. */
 
+#include <config.h>
 #include "ntl-content-view.h"
 #include "ntl-view-private.h"
 #include <gtk/gtksignal.h>
diff --git a/src/ntl-main.c b/src/ntl-main.c
index ab310980c..abd99e400 100644
--- a/src/ntl-main.c
+++ b/src/ntl-main.c
@@ -28,7 +28,7 @@
 
 /* ntl-main.c: Implementation of the routines that drive program lifecycle and main window creation/destruction. */
 
-#include "config.h"
+#include <config.h>
 #include "nautilus.h"
 #include "nautilus-self-check-functions.h"
 #include <libnautilus-extensions/nautilus-debug.h>
diff --git a/src/ntl-meta-view.c b/src/ntl-meta-view.c
index 07ec77c58..d6dc92301 100644
--- a/src/ntl-meta-view.c
+++ b/src/ntl-meta-view.c
@@ -24,6 +24,7 @@
  */
 /* ntl-meta-view.c: Implementation of the object representing a meta/navigation view. */
 
+#include <config.h>
 #include "nautilus.h"
 #include "ntl-view-private.h"
 #include <gtk/gtksignal.h>
diff --git a/src/ntl-miniicon.c b/src/ntl-miniicon.c
index 747d8c014..33dc63002 100644
--- a/src/ntl-miniicon.c
+++ b/src/ntl-miniicon.c
@@ -19,6 +19,7 @@
  * USA
  */
 
+#include <config.h>
 #include "ntl-miniicon.h"
 
 #include <gdk/gdkprivate.h>
diff --git a/src/ntl-uri-map.c b/src/ntl-uri-map.c
index 4d50bd775..bd14dc5f3 100644
--- a/src/ntl-uri-map.c
+++ b/src/ntl-uri-map.c
@@ -26,6 +26,7 @@
 /* ntl-uri-map.c: Implementation of routines for mapping a location
    change request to a set of views and actual URL to be loaded. */
 
+#include <config.h>
 #include "ntl-uri-map.h"
 
 #include <libnautilus-extensions/nautilus-directory.h>
diff --git a/src/ntl-view-frame-svr.c b/src/ntl-view-frame-svr.c
index cab50b069..3e1d22ce2 100644
--- a/src/ntl-view-frame-svr.c
+++ b/src/ntl-view-frame-svr.c
@@ -26,6 +26,7 @@
 /* ntl-view-frame-svr.c: CORBA server implementation of the object
    representing a data view frame. */
 
+#include <config.h>
 #include "nautilus.h"
 #include "ntl-view-private.h"
 
diff --git a/src/ntl-view.c b/src/ntl-view.c
index d69cdcb02..da2f3bd6a 100644
--- a/src/ntl-view.c
+++ b/src/ntl-view.c
@@ -27,6 +27,7 @@
    and its associated CORBA object for proxying requests into this
    object. */
 
+#include <config.h>
 #include "ntl-view-private.h"
 #include "nautilus.h"
 #include <libnautilus-extensions/nautilus-gtk-extensions.h>
diff --git a/src/ntl-window-state.c b/src/ntl-window-state.c
index c7f14b66b..0fec33f9f 100644
--- a/src/ntl-window-state.c
+++ b/src/ntl-window-state.c
@@ -24,6 +24,7 @@
  *
  */
 
+#include <config.h>
 #include "nautilus.h"
 #include <libnautilus-extensions/nautilus-file-utilities.h>
 #include <libnautilus-extensions/nautilus-global-preferences.h>