unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
* Using " rather than < for header files in Emacs
@ 2016-03-02 22:30 Wilfred Hughes
  2016-03-02 23:10 ` Paul Eggert
  0 siblings, 1 reply; 8+ messages in thread
From: Wilfred Hughes @ 2016-03-02 22:30 UTC (permalink / raw)
  To: emacs-devel

[-- Attachment #1: Type: text/plain, Size: 274 bytes --]

I've noticed that it's common for Emacs C code to say:

#include <config.h>

or

#include <c-ctype.h>

even though these headers are from Emacs source, not system headers.
Are we interested in fixing this? I.e. to write

#include "config.h"

I've attached an example patch.

[-- Attachment #2: c_include_formatting.diff --]
[-- Type: text/plain, Size: 82102 bytes --]

diff --git a/configure.ac b/configure.ac
index 0de6736..e92f0bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5202,7 +5202,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define EMACS_CONFIG_H
 ])dnl
 
-AH_BOTTOM([#include <conf_post.h>
+AH_BOTTOM([#include "conf_post.h"
 
 #endif /* EMACS_CONFIG_H */
 
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index cb09ab8..043fca0 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 #include <stddef.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index c7cef8a..4e71064 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 
 #ifdef WINDOWSNT
 
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 796adaa..fc20a23 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -88,7 +88,7 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
 #  define NDEBUG		/* disable assert */
 #endif
 
-#include <config.h>
+#include "config.h"
 
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE 1		/* enables some compiler checks on GNU */
@@ -128,7 +128,7 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
 #include <errno.h>
 #include <fcntl.h>
 #include <binary-io.h>
-#include <c-ctype.h>
+#include "c-ctype.h"
 #include <c-strcase.h>
 
 #include <assert.h>
diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index 833ea50..12d96b4 100644
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -20,7 +20,7 @@ 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 "config.h"
 
 #include <stdio.h>
 #include <ctype.h>
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index e266207..79854b1 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -34,7 +34,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
  Then comes the documentation for that function or variable.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdarg.h>
 #include <stdbool.h>
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index eb1962a..7b91f40 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -55,7 +55,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
  *
  */
 
-#include <config.h>
+#include "config.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/file.h>
diff --git a/lib-src/pop.c b/lib-src/pop.c
index 57a5e52..5be8cde 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -21,7 +21,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 
 #ifdef MAIL_USE_POP
 
diff --git a/lib-src/profile.c b/lib-src/profile.c
index da6232a..5316eca 100644
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -31,7 +31,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
  */
 
 #define INLINE EXTERN_INLINE
-#include <config.h>
+#include "config.h"
 
 #include <inttypes.h>
 #include <stdio.h>
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index 3803a31..7444ac4 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -31,7 +31,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    Created 2002/03/22.
 */
 
-#include <config.h>
+#include "config.h"
 
 #include <unistd.h>
 #include <errno.h>
diff --git a/lib/acl-errno-valid.c b/lib/acl-errno-valid.c
index 086f75f..a2037f8 100644
--- a/lib/acl-errno-valid.c
+++ b/lib/acl-errno-valid.c
@@ -17,7 +17,7 @@
 
    Written by Paul Eggert.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <acl.h>
 
diff --git a/lib/acl-internal.c b/lib/acl-internal.c
index 4de60c3..ea7b617 100644
--- a/lib/acl-internal.c
+++ b/lib/acl-internal.c
@@ -17,7 +17,7 @@
 
    Written by Paul Eggert, Andreas Grünbacher, and Bruno Haible.  */
 
-#include <config.h>
+#include "config.h"
 
 #include "acl.h"
 
diff --git a/lib/acl_entries.c b/lib/acl_entries.c
index 9fc9cf5..60ea862 100644
--- a/lib/acl_entries.c
+++ b/lib/acl_entries.c
@@ -17,7 +17,7 @@
 
    Written by Paul Eggert and Andreas Gruenbacher.  */
 
-#include <config.h>
+#include "config.h"
 
 #include "acl-internal.h"
 
diff --git a/lib/allocator.c b/lib/allocator.c
index 2c1a3da..53e8f1f 100644
--- a/lib/allocator.c
+++ b/lib/allocator.c
@@ -1,5 +1,5 @@
 #define _GL_USE_STDLIB_ALLOC 1
-#include <config.h>
+#include "config.h"
 #include "allocator.h"
 #include <stdlib.h>
 struct allocator const stdlib_allocator = { malloc, realloc, free, NULL };
diff --git a/lib/binary-io.c b/lib/binary-io.c
index d828bcd..c668448 100644
--- a/lib/binary-io.c
+++ b/lib/binary-io.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include "config.h"
 #define BINARY_IO_INLINE _GL_EXTERN_INLINE
 #include "binary-io.h"
 typedef int dummy;
diff --git a/lib/c-ctype.c b/lib/c-ctype.c
index 5d9d4d8..4e224a9 100644
--- a/lib/c-ctype.c
+++ b/lib/c-ctype.c
@@ -1,3 +1,3 @@
-#include <config.h>
+#include "config.h"
 #define C_CTYPE_INLINE _GL_EXTERN_INLINE
 #include "c-ctype.h"
diff --git a/lib/c-strcasecmp.c b/lib/c-strcasecmp.c
index bd113b7..2d8f926 100644
--- a/lib/c-strcasecmp.c
+++ b/lib/c-strcasecmp.c
@@ -14,7 +14,7 @@
    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 "config.h"
 
 /* Specification.  */
 #include "c-strcase.h"
diff --git a/lib/c-strncasecmp.c b/lib/c-strncasecmp.c
index c316929..46bbefa 100644
--- a/lib/c-strncasecmp.c
+++ b/lib/c-strncasecmp.c
@@ -14,7 +14,7 @@
    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 "config.h"
 
 /* Specification.  */
 #include "c-strcase.h"
diff --git a/lib/careadlinkat.c b/lib/careadlinkat.c
index 4180de9..f8fc067 100644
--- a/lib/careadlinkat.c
+++ b/lib/careadlinkat.c
@@ -18,7 +18,7 @@
 
 /* Written by Paul Eggert, Bruno Haible, and Jim Meyering.  */
 
-#include <config.h>
+#include "config.h"
 
 #include "careadlinkat.h"
 
diff --git a/lib/close-stream.c b/lib/close-stream.c
index 0c4beae..655ce16 100644
--- a/lib/close-stream.c
+++ b/lib/close-stream.c
@@ -15,7 +15,7 @@
    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 "config.h"
 
 #include "close-stream.h"
 
diff --git a/lib/count-one-bits.c b/lib/count-one-bits.c
index 66341d7..9fa519f 100644
--- a/lib/count-one-bits.c
+++ b/lib/count-one-bits.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include "config.h"
 #define COUNT_ONE_BITS_INLINE _GL_EXTERN_INLINE
 #include "count-one-bits.h"
 
diff --git a/lib/count-trailing-zeros.c b/lib/count-trailing-zeros.c
index f3da886..4765263 100644
--- a/lib/count-trailing-zeros.c
+++ b/lib/count-trailing-zeros.c
@@ -1,3 +1,3 @@
-#include <config.h>
+#include "config.h"
 #define COUNT_TRAILING_ZEROS_INLINE _GL_EXTERN_INLINE
 #include "count-trailing-zeros.h"
diff --git a/lib/dirfd.c b/lib/dirfd.c
index a325848..4c1c238 100644
--- a/lib/dirfd.c
+++ b/lib/dirfd.c
@@ -17,7 +17,7 @@
 
 /* Written by Jim Meyering. */
 
-#include <config.h>
+#include "config.h"
 
 #include <dirent.h>
 #include <errno.h>
diff --git a/lib/dtotimespec.c b/lib/dtotimespec.c
index 9028044..4fe9a3d 100644
--- a/lib/dtotimespec.c
+++ b/lib/dtotimespec.c
@@ -20,7 +20,7 @@
 /* Convert the double value SEC to a struct timespec.  Round toward
    positive infinity.  On overflow, return an extremal value.  */
 
-#include <config.h>
+#include "config.h"
 
 #include "timespec.h"
 
diff --git a/lib/dup2.c b/lib/dup2.c
index 5d026f2..5392943 100644
--- a/lib/dup2.c
+++ b/lib/dup2.c
@@ -17,7 +17,7 @@
 
 /* written by Paul Eggert */
 
-#include <config.h>
+#include "config.h"
 
 /* Specification.  */
 #include <unistd.h>
diff --git a/lib/execinfo.c b/lib/execinfo.c
index 0bcd9f0..6146615 100644
--- a/lib/execinfo.c
+++ b/lib/execinfo.c
@@ -1,3 +1,3 @@
-#include <config.h>
+#include "config.h"
 #define _GL_EXECINFO_INLINE _GL_EXTERN_INLINE
 #include "execinfo.h"
diff --git a/lib/faccessat.c b/lib/faccessat.c
index 1743fa3..3687d93 100644
--- a/lib/faccessat.c
+++ b/lib/faccessat.c
@@ -16,7 +16,7 @@
 
 /* written by Eric Blake */
 
-#include <config.h>
+#include "config.h"
 
 #include <unistd.h>
 #include <fcntl.h>
diff --git a/lib/fcntl.c b/lib/fcntl.c
index fd17e96..31c3303 100644
--- a/lib/fcntl.c
+++ b/lib/fcntl.c
@@ -17,7 +17,7 @@
 
 /* Written by Eric Blake <ebb9@byu.net>.  */
 
-#include <config.h>
+#include "config.h"
 
 /* Specification.  */
 #include <fcntl.h>
diff --git a/lib/fdatasync.c b/lib/fdatasync.c
index 3351a0a..d78cdee 100644
--- a/lib/fdatasync.c
+++ b/lib/fdatasync.c
@@ -15,7 +15,7 @@
    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 "config.h"
 #include <unistd.h>
 
 int
diff --git a/lib/fdopendir.c b/lib/fdopendir.c
index c1f4dcb..254dc7e 100644
--- a/lib/fdopendir.c
+++ b/lib/fdopendir.c
@@ -16,7 +16,7 @@
 
 /* written by Jim Meyering */
 
-#include <config.h>
+#include "config.h"
 
 #include <dirent.h>
 
diff --git a/lib/filemode.c b/lib/filemode.c
index 2250ee0..0087ab4 100644
--- a/lib/filemode.c
+++ b/lib/filemode.c
@@ -16,7 +16,7 @@
    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 "config.h"
 
 #include "filemode.h"
 
diff --git a/lib/filevercmp.c b/lib/filevercmp.c
index a75c946..ba8b853 100644
--- a/lib/filevercmp.c
+++ b/lib/filevercmp.c
@@ -16,14 +16,14 @@
    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 "config.h"
 #include "filevercmp.h"
 
 #include <sys/types.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
-#include <c-ctype.h>
+#include "c-ctype.h"
 #include <limits.h>
 
 /* Match a file suffix defined by this regular expression:
diff --git a/lib/fpending.c b/lib/fpending.c
index a503b9f..9e05ec6 100644
--- a/lib/fpending.c
+++ b/lib/fpending.c
@@ -17,7 +17,7 @@
 
 /* Written by Jim Meyering. */
 
-#include <config.h>
+#include "config.h"
 
 #include "fpending.h"
 
diff --git a/lib/fstatat.c b/lib/fstatat.c
index ebbecfd..ed6fa50 100644
--- a/lib/fstatat.c
+++ b/lib/fstatat.c
@@ -21,7 +21,7 @@
    the system's <sys/stat.h> here, so that orig_fstatat doesn't recurse to
    rpl_fstatat.  */
 #define __need_system_sys_stat_h
-#include <config.h>
+#include "config.h"
 
 /* Get the original definition of fstatat.  It might be defined as a macro.  */
 #include <sys/types.h>
diff --git a/lib/fsync.c b/lib/fsync.c
index 5df79ba..92e48ef 100644
--- a/lib/fsync.c
+++ b/lib/fsync.c
@@ -22,7 +22,7 @@
    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 "config.h"
 #include <unistd.h>
 
 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
diff --git a/lib/ftoastr.c b/lib/ftoastr.c
index e3a0138..1cd93ec 100644
--- a/lib/ftoastr.c
+++ b/lib/ftoastr.c
@@ -25,7 +25,7 @@
    This code relies on sprintf, strtod, etc. operating accurately;
    otherwise, the resulting strings could be inaccurate or too long.  */
 
-#include <config.h>
+#include "config.h"
 
 #include "ftoastr.h"
 
diff --git a/lib/get-permissions.c b/lib/get-permissions.c
index bf40dad..a1f6a18 100644
--- a/lib/get-permissions.c
+++ b/lib/get-permissions.c
@@ -17,7 +17,7 @@
 
    Written by Paul Eggert, Andreas Grünbacher, and Bruno Haible.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <string.h>
 #include "acl.h"
diff --git a/lib/getdtablesize.c b/lib/getdtablesize.c
index d234055..3ab27b6 100644
--- a/lib/getdtablesize.c
+++ b/lib/getdtablesize.c
@@ -15,7 +15,7 @@
    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 "config.h"
 
 /* Specification.  */
 #include <unistd.h>
diff --git a/lib/getgroups.c b/lib/getgroups.c
index b040505..ed0156c 100644
--- a/lib/getgroups.c
+++ b/lib/getgroups.c
@@ -17,7 +17,7 @@
 
 /* written by Jim Meyering */
 
-#include <config.h>
+#include "config.h"
 
 #include <unistd.h>
 
diff --git a/lib/getloadavg.c b/lib/getloadavg.c
index a7ffd06..57959ae 100644
--- a/lib/getloadavg.c
+++ b/lib/getloadavg.c
@@ -80,7 +80,7 @@
    We also #define LDAV_PRIVILEGED if a program will require
    special installation to be able to call getloadavg.  */
 
-#include <config.h>
+#include "config.h"
 
 /* Specification.  */
 #include <stdlib.h>
diff --git a/lib/gettime.c b/lib/gettime.c
index ea58eb0..0b8266d 100644
--- a/lib/gettime.c
+++ b/lib/gettime.c
@@ -17,7 +17,7 @@
 
 /* Written by Paul Eggert.  */
 
-#include <config.h>
+#include "config.h"
 
 #include "timespec.h"
 
diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c
index 224ca6a..860b623 100644
--- a/lib/gettimeofday.c
+++ b/lib/gettimeofday.c
@@ -17,7 +17,7 @@
 
 /* written by Jim Meyering */
 
-#include <config.h>
+#include "config.h"
 
 /* Specification.  */
 #include <sys/time.h>
diff --git a/lib/group-member.c b/lib/group-member.c
index 365e166..ee173a3 100644
--- a/lib/group-member.c
+++ b/lib/group-member.c
@@ -16,7 +16,7 @@
    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 "config.h"
 
 /* Specification.  */
 #include <unistd.h>
diff --git a/lib/lstat.c b/lib/lstat.c
index 03b0634..e76199f 100644
--- a/lib/lstat.c
+++ b/lib/lstat.c
@@ -21,7 +21,7 @@
    the system's <sys/stat.h> here, so that orig_lstat doesn't recurse to
    rpl_lstat.  */
 #define __need_system_sys_stat_h
-#include <config.h>
+#include "config.h"
 
 #if !HAVE_LSTAT
 /* On systems that lack symlinks, our replacement <sys/stat.h> already
diff --git a/lib/md5.c b/lib/md5.c
index 62d247e..223f864 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -19,7 +19,7 @@
 
 /* Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.  */
 
-#include <config.h>
+#include "config.h"
 
 #if HAVE_OPENSSL_MD5
 # define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
diff --git a/lib/openat-die.c b/lib/openat-die.c
index f09123e..e2f5f19 100644
--- a/lib/openat-die.c
+++ b/lib/openat-die.c
@@ -1,6 +1,6 @@
 /* Respond to a save- or restore-cwd failure.
    This should never happen with Emacs.  */
-#include <config.h>
+#include "config.h"
 #include "openat.h"
 void openat_save_fail (int errnum) { abort (); }
 void openat_restore_fail (int errnum) { abort (); }
diff --git a/lib/openat-proc.c b/lib/openat-proc.c
index 1712340..7950289 100644
--- a/lib/openat-proc.c
+++ b/lib/openat-proc.c
@@ -17,7 +17,7 @@
 
 /* Written by Paul Eggert.  */
 
-#include <config.h>
+#include "config.h"
 
 #include "openat-priv.h"
 
diff --git a/lib/pipe2.c b/lib/pipe2.c
index f8912f2..3926627 100644
--- a/lib/pipe2.c
+++ b/lib/pipe2.c
@@ -14,7 +14,7 @@
    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 "config.h"
 
 /* Specification.  */
 #include <unistd.h>
diff --git a/lib/pselect.c b/lib/pselect.c
index 56c2eb3..2870fe6 100644
--- a/lib/pselect.c
+++ b/lib/pselect.c
@@ -19,7 +19,7 @@
 
 /* written by Paul Eggert */
 
-#include <config.h>
+#include "config.h"
 
 #include <sys/select.h>
 
diff --git a/lib/pthread_sigmask.c b/lib/pthread_sigmask.c
index f67e442..1793033 100644
--- a/lib/pthread_sigmask.c
+++ b/lib/pthread_sigmask.c
@@ -14,7 +14,7 @@
    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 "config.h"
 
 /* Specification.  */
 #include <signal.h>
diff --git a/lib/putenv.c b/lib/putenv.c
index e67712d..90d686b 100644
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -17,7 +17,7 @@
    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 "config.h"
 
 /* Specification.  */
 #include <stdlib.h>
diff --git a/lib/qcopy-acl.c b/lib/qcopy-acl.c
index c7bdfbb..43377e5 100644
--- a/lib/qcopy-acl.c
+++ b/lib/qcopy-acl.c
@@ -17,7 +17,7 @@
 
    Written by Paul Eggert, Andreas Grünbacher, and Bruno Haible.  */
 
-#include <config.h>
+#include "config.h"
 
 #include "acl.h"
 
diff --git a/lib/readlink.c b/lib/readlink.c
index e6c3925..1151061 100644
--- a/lib/readlink.c
+++ b/lib/readlink.c
@@ -14,7 +14,7 @@
    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 "config.h"
 
 /* Specification.  */
 #include <unistd.h>
diff --git a/lib/readlinkat.c b/lib/readlinkat.c
index 7006db8..4b04f7e 100644
--- a/lib/readlinkat.c
+++ b/lib/readlinkat.c
@@ -16,7 +16,7 @@
 
 /* written by Eric Blake */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <unistd.h>
diff --git a/lib/save-cwd.c b/lib/save-cwd.c
index 1fa5d69..0c91345 100644
--- a/lib/save-cwd.c
+++ b/lib/save-cwd.c
@@ -22,7 +22,7 @@
    names.  This module replaces the Gnulib module by omitting the code
    that Emacs does not need.  */
 
-#include <config.h>
+#include "config.h"
 
 #include "save-cwd.h"
 
diff --git a/lib/secure_getenv.c b/lib/secure_getenv.c
index f359ab2..e524805 100644
--- a/lib/secure_getenv.c
+++ b/lib/secure_getenv.c
@@ -15,7 +15,7 @@
    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 "config.h"
 
 #include <stdlib.h>
 
diff --git a/lib/set-permissions.c b/lib/set-permissions.c
index 0730754..fd797d6 100644
--- a/lib/set-permissions.c
+++ b/lib/set-permissions.c
@@ -17,7 +17,7 @@
 
    Written by Paul Eggert, Andreas Grünbacher, and Bruno Haible.  */
 
-#include <config.h>
+#include "config.h"
 
 #include "acl.h"
 
diff --git a/lib/sha1.c b/lib/sha1.c
index 45f1cbe..e10ba18 100644
--- a/lib/sha1.c
+++ b/lib/sha1.c
@@ -21,7 +21,7 @@
       Robert Klep <robert@ilse.nl>  -- Expansion function fix
 */
 
-#include <config.h>
+#include "config.h"
 
 #if HAVE_OPENSSL_SHA1
 # define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
diff --git a/lib/sha256.c b/lib/sha256.c
index 0be8fd2..8fe7fc1 100644
--- a/lib/sha256.c
+++ b/lib/sha256.c
@@ -20,7 +20,7 @@
    Scott G. Miller's sha1.c
 */
 
-#include <config.h>
+#include "config.h"
 
 #if HAVE_OPENSSL_SHA256
 # define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
diff --git a/lib/sha512.c b/lib/sha512.c
index 5494dcb..68bdcb4 100644
--- a/lib/sha512.c
+++ b/lib/sha512.c
@@ -20,7 +20,7 @@
    Scott G. Miller's sha1.c
 */
 
-#include <config.h>
+#include "config.h"
 
 #if HAVE_OPENSSL_SHA512
 # define GL_OPENSSL_INLINE _GL_EXTERN_INLINE
diff --git a/lib/sig2str.c b/lib/sig2str.c
index ca8ac78..d649579 100644
--- a/lib/sig2str.c
+++ b/lib/sig2str.c
@@ -17,7 +17,7 @@
 
 /* Written by Paul Eggert.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <limits.h>
 #include <signal.h>
diff --git a/lib/stat-time.c b/lib/stat-time.c
index 81b83dd..aa8a440 100644
--- a/lib/stat-time.c
+++ b/lib/stat-time.c
@@ -1,3 +1,3 @@
-#include <config.h>
+#include "config.h"
 #define _GL_STAT_TIME_INLINE _GL_EXTERN_INLINE
 #include "stat-time.h"
diff --git a/lib/stat.c b/lib/stat.c
index 62e9e0b..6058191 100644
--- a/lib/stat.c
+++ b/lib/stat.c
@@ -20,7 +20,7 @@
    the system's <sys/stat.h> here, so that orig_stat doesn't recurse to
    rpl_stat.  */
 #define __need_system_sys_stat_h
-#include <config.h>
+#include "config.h"
 
 /* Get the original definition of stat.  It might be defined as a macro.  */
 #include <sys/types.h>
diff --git a/lib/stpcpy.c b/lib/stpcpy.c
index ec3996e..c181b70 100644
--- a/lib/stpcpy.c
+++ b/lib/stpcpy.c
@@ -18,7 +18,7 @@
    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 "config.h"
 
 #include <string.h>
 
diff --git a/lib/strtoimax.c b/lib/strtoimax.c
index 223412b..f5f209c 100644
--- a/lib/strtoimax.c
+++ b/lib/strtoimax.c
@@ -18,7 +18,7 @@
 
 /* Written by Paul Eggert. */
 
-#include <config.h>
+#include "config.h"
 
 /* Verify interface.  */
 #include <inttypes.h>
diff --git a/lib/symlink.c b/lib/symlink.c
index d8684b6..bd9a825 100644
--- a/lib/symlink.c
+++ b/lib/symlink.c
@@ -14,7 +14,7 @@
    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 "config.h"
 
 /* Specification.  */
 #include <unistd.h>
diff --git a/lib/time_r.c b/lib/time_r.c
index dc1e161..50538b8 100644
--- a/lib/time_r.c
+++ b/lib/time_r.c
@@ -17,7 +17,7 @@
 
 /* Written by Paul Eggert.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <time.h>
 
diff --git a/lib/time_rz.c b/lib/time_rz.c
index bc80127..f6f02d4 100644
--- a/lib/time_rz.c
+++ b/lib/time_rz.c
@@ -22,7 +22,7 @@
    library with a working timezone_t type, so that this module is not
    needed.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <time.h>
 
diff --git a/lib/timespec-add.c b/lib/timespec-add.c
index b093946..ba11b91 100644
--- a/lib/timespec-add.c
+++ b/lib/timespec-add.c
@@ -20,7 +20,7 @@
 /* Return the sum of two timespec values A and B.  On overflow, return
    an extremal value.  This assumes 0 <= tv_nsec < TIMESPEC_RESOLUTION.  */
 
-#include <config.h>
+#include "config.h"
 #include "timespec.h"
 
 #include "intprops.h"
diff --git a/lib/timespec-sub.c b/lib/timespec-sub.c
index 63cc142..99c4a8f 100644
--- a/lib/timespec-sub.c
+++ b/lib/timespec-sub.c
@@ -21,7 +21,7 @@
    overflow, return an extremal value.  This assumes 0 <= tv_nsec <
    TIMESPEC_RESOLUTION.  */
 
-#include <config.h>
+#include "config.h"
 #include "timespec.h"
 
 #include "intprops.h"
diff --git a/lib/timespec.c b/lib/timespec.c
index 2b6098e..03d26e9 100644
--- a/lib/timespec.c
+++ b/lib/timespec.c
@@ -1,3 +1,3 @@
-#include <config.h>
+#include "config.h"
 #define _GL_TIMESPEC_INLINE _GL_EXTERN_INLINE
 #include "timespec.h"
diff --git a/lib/u64.c b/lib/u64.c
index 1e3854d..cec85a1 100644
--- a/lib/u64.c
+++ b/lib/u64.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include "config.h"
 #define _GL_U64_INLINE _GL_EXTERN_INLINE
 #include "u64.h"
 typedef int dummy;
diff --git a/lib/unistd.c b/lib/unistd.c
index 72bad1c..f882908 100644
--- a/lib/unistd.c
+++ b/lib/unistd.c
@@ -1,4 +1,4 @@
-#include <config.h>
+#include "config.h"
 #define _GL_UNISTD_INLINE _GL_EXTERN_INLINE
 #include "unistd.h"
 typedef int dummy;
diff --git a/lib/unsetenv.c b/lib/unsetenv.c
index 7f1e65a..404b0db 100644
--- a/lib/unsetenv.c
+++ b/lib/unsetenv.c
@@ -19,7 +19,7 @@
    optimizes away the name == NULL test below.  */
 #define _GL_ARG_NONNULL(params)
 
-#include <config.h>
+#include "config.h"
 
 /* Specification.  */
 #include <stdlib.h>
diff --git a/lib/utimens.c b/lib/utimens.c
index ece9b07..d0a9876 100644
--- a/lib/utimens.c
+++ b/lib/utimens.c
@@ -19,7 +19,7 @@
 
 /* derived from a function in touch.c */
 
-#include <config.h>
+#include "config.h"
 
 #define _GL_UTIMENS_INLINE _GL_EXTERN_INLINE
 #include "utimens.h"
diff --git a/lwlib/lwlib-Xaw.c b/lwlib/lwlib-Xaw.c
index 9bd84ef..bd8e152 100644
--- a/lwlib/lwlib-Xaw.c
+++ b/lwlib/lwlib-Xaw.c
@@ -18,7 +18,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <setjmp.h>
diff --git a/lwlib/lwlib-Xlw.c b/lwlib/lwlib-Xlw.c
index f7713a1..f296cc8 100644
--- a/lwlib/lwlib-Xlw.c
+++ b/lwlib/lwlib-Xlw.c
@@ -18,7 +18,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <setjmp.h>
 #include <lisp.h>
diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index c92edd2..136c570 100644
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -18,7 +18,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <unistd.h>
 #include <stdio.h>
diff --git a/lwlib/lwlib-utils.c b/lwlib/lwlib-utils.c
index e2ff989..ccc3a21 100644
--- a/lwlib/lwlib-utils.c
+++ b/lwlib/lwlib-utils.c
@@ -18,7 +18,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <setjmp.h>
 #include <lisp.h>
diff --git a/lwlib/lwlib.c b/lwlib/lwlib.c
index c68cf77..6e1b3e6 100644
--- a/lwlib/lwlib.c
+++ b/lwlib/lwlib.c
@@ -18,7 +18,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <setjmp.h>
 #include <lisp.h>
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index 94f10f3..ff21326 100644
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -20,7 +20,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Created by devin@lucid.com */
 
-#include <config.h>
+#include "config.h"
 
 #include <setjmp.h>
 #include <lisp.h>
diff --git a/msdos/autogen/config.in b/msdos/autogen/config.in
index bcd51ce..e256a98 100644
--- a/msdos/autogen/config.in
+++ b/msdos/autogen/config.in
@@ -1818,7 +1818,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define as `fork' if `vfork' does not work. */
 #undef vfork
 
-#include <conf_post.h>
+#include "conf_post.h"
 
 #endif /* EMACS_CONFIG_H */
 
diff --git a/oldXMenu/XCrAssoc.c b/oldXMenu/XCrAssoc.c
index 9443481..0abf2e4 100644
--- a/oldXMenu/XCrAssoc.c
+++ b/oldXMenu/XCrAssoc.c
@@ -2,7 +2,7 @@
 #include "copyright.h"
 
 
-#include <config.h>
+#include "config.h"
 #include <X11/Xlib.h>
 #include <errno.h>
 #include "X10.h"
diff --git a/oldXMenu/XLookAssoc.c b/oldXMenu/XLookAssoc.c
index fad960d..7d6d23b 100644
--- a/oldXMenu/XLookAssoc.c
+++ b/oldXMenu/XLookAssoc.c
@@ -2,7 +2,7 @@
 
 #include "copyright.h"
 
-#include <config.h>
+#include "config.h"
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
 #include "X10.h"
diff --git a/oldXMenu/XMenuInt.h b/oldXMenu/XMenuInt.h
index 369b8c1..437abdf 100644
--- a/oldXMenu/XMenuInt.h
+++ b/oldXMenu/XMenuInt.h
@@ -17,7 +17,7 @@
 #ifndef _XMenuInternal_h_
 #define _XMenuInternal_h_
 
-#include <config.h>
+#include "config.h"
 
 /* Avoid warnings about redefining NULL by including <stdio.h> first;
    the other file which wants to define it (<stddef.h> on Ultrix
diff --git a/src/alloc.c b/src/alloc.c
index 5ee1cc3..f74e0b7 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -18,7 +18,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <limits.h>		/* For CHAR_BIT.  */
diff --git a/src/atimer.c b/src/atimer.c
index 8019560..0f4891a 100644
--- a/src/atimer.c
+++ b/src/atimer.c
@@ -16,7 +16,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 
 #include "lisp.h"
diff --git a/src/bidi.c b/src/bidi.c
index 9b71454..5a7d029 100644
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -237,7 +237,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    bidi_resolve_neutral, for one situation where such shortcut was
    necessary.  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 
 #include "lisp.h"
diff --git a/src/buffer.c b/src/buffer.c
index 98b61c3..919a91a 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -18,7 +18,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/bytecode.c b/src/bytecode.c
index 0befe65..526869f 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -33,7 +33,7 @@ by Hallvard:
   o  all conditionals now only do QUIT if they jump.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "lisp.h"
 #include "blockinput.h"
diff --git a/src/callint.c b/src/callint.c
index 3b23f22..04ea349 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 
 #include "lisp.h"
 #include "character.h"
diff --git a/src/callproc.c b/src/callproc.c
index 9ad7ef2..846e8cf 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 #include <errno.h>
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/src/casefiddle.c b/src/casefiddle.c
index 348215e..bd527b2 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 
 #include "lisp.h"
 #include "character.h"
diff --git a/src/casetab.c b/src/casetab.c
index 8327fbd..6f17193 100644
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -18,7 +18,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include "lisp.h"
 #include "buffer.h"
diff --git a/src/category.c b/src/category.c
index 61502f8..87bf1b6 100644
--- a/src/category.c
+++ b/src/category.c
@@ -28,7 +28,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Here we handle three objects: category, category set, and category
    table.  Read comments in the file category.h to understand them.  */
 
-#include <config.h>
+#include "config.h"
 
 #include "lisp.h"
 #include "character.h"
diff --git a/src/ccl.c b/src/ccl.c
index ef6cb98..4a846ae 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -23,7 +23,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <limits.h>
diff --git a/src/character.c b/src/character.c
index 4818748..deb6401 100644
--- a/src/character.c
+++ b/src/character.c
@@ -25,7 +25,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* At first, see the document in `character.h' to understand the code
    in this file.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 
diff --git a/src/charset.c b/src/charset.c
index f911e9e..9dedd5e 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -26,14 +26,14 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <stdio.h>
 #include <unistd.h>
 #include <limits.h>
 #include <sys/types.h>
-#include <c-ctype.h>
+#include "c-ctype.h"
 #include "lisp.h"
 #include "character.h"
 #include "charset.h"
diff --git a/src/chartab.c b/src/chartab.c
index ec618f3..6c47ef8 100644
--- a/src/chartab.c
+++ b/src/chartab.c
@@ -18,7 +18,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include "lisp.h"
 #include "character.h"
diff --git a/src/cm.c b/src/cm.c
index ec1545d..f5e4bd9 100644
--- a/src/cm.c
+++ b/src/cm.c
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 
 #include "lisp.h"
diff --git a/src/cmds.c b/src/cmds.c
index 3450003..88a9f71 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 
 #include "lisp.h"
 #include "commands.h"
diff --git a/src/coding.c b/src/coding.c
index f5fe52e..4a75a76 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -283,7 +283,7 @@ encode_coding_XXX (struct coding_system *coding)
 \f
 /*** 1. Preamble ***/
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 
 #ifdef HAVE_WCHAR_H
diff --git a/src/composite.c b/src/composite.c
index 43c909f..5f004ca 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -22,7 +22,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include "lisp.h"
 #include "character.h"
diff --git a/src/cygw32.h b/src/cygw32.h
index 58d8cd4..0d2d47a 100644
--- a/src/cygw32.h
+++ b/src/cygw32.h
@@ -18,7 +18,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef CYGW32_H
 #define CYGW32_H
-#include <config.h>
+#include "config.h"
 #include <windef.h>
 #include <sys/cygwin.h>
 #include <wchar.h>
diff --git a/src/data.c b/src/data.c
index 07f8724..a13aaae 100644
--- a/src/data.c
+++ b/src/data.c
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 
 #include <byteswap.h>
diff --git a/src/dbusbind.c b/src/dbusbind.c
index 5148c32..fe94c46 100644
--- a/src/dbusbind.c
+++ b/src/dbusbind.c
@@ -16,7 +16,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #ifdef HAVE_DBUS
 #include <stdio.h>
diff --git a/src/decompress.c b/src/decompress.c
index 8fb71b0..0d71779 100644
--- a/src/decompress.c
+++ b/src/decompress.c
@@ -16,7 +16,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #ifdef HAVE_ZLIB
 
diff --git a/src/dired.c b/src/dired.c
index 97fefae..38b6ca3 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <sys/types.h>
diff --git a/src/dispnew.c b/src/dispnew.c
index fe07f79..b5641a2 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -18,7 +18,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include "sysstdio.h"
 #include <unistd.h>
diff --git a/src/doc.c b/src/doc.c
index ae80791..5fbba6b 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <sys/types.h>
@@ -27,7 +27,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <fcntl.h>
 #include <unistd.h>
 
-#include <c-ctype.h>
+#include "c-ctype.h"
 
 #include "lisp.h"
 #include "character.h"
diff --git a/src/doprnt.c b/src/doprnt.c
index b0b92bf..cbdb613 100644
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -101,7 +101,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    specifier says how many decimal places to show; if zero, the decimal point
    itself is omitted.  For %s and %S, the precision specifier is ignored.  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <float.h>
 #include <unistd.h>
diff --git a/src/dosfns.c b/src/dosfns.c
index f507f41..6bf6ed9 100644
--- a/src/dosfns.c
+++ b/src/dosfns.c
@@ -18,7 +18,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #ifdef MSDOS
 /* The entire file is within this conditional */
diff --git a/src/dynlib.c b/src/dynlib.c
index c4647e6..c4ac51c 100644
--- a/src/dynlib.c
+++ b/src/dynlib.c
@@ -24,7 +24,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    If you think the abstraction is too leaky use libltdl (libtool),
    don't reinvent the wheel by fixing this one.  */
 
-#include <config.h>
+#include "config.h"
 
 #include "dynlib.h"
 
diff --git a/src/editfns.c b/src/editfns.c
index 2f46cfe..2c9fd24 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 #include <sys/types.h>
 #include <stdio.h>
 
diff --git a/src/emacs-module.c b/src/emacs-module.c
index 1176ca3..e039631 100644
--- a/src/emacs-module.c
+++ b/src/emacs-module.c
@@ -17,7 +17,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include "emacs-module.h"
 
diff --git a/src/emacs.c b/src/emacs.c
index a381da4..015c290 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define INLINE EXTERN_INLINE
-#include <config.h>
+#include "config.h"
 
 #include <errno.h>
 #include <fcntl.h>
diff --git a/src/emacsgtkfixed.c b/src/emacsgtkfixed.c
index 6795155..b272f62 100644
--- a/src/emacsgtkfixed.c
+++ b/src/emacsgtkfixed.c
@@ -18,7 +18,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include "lisp.h"
 #include "frame.h"
diff --git a/src/eval.c b/src/eval.c
index b6bf0e6..2fecd6f 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 #include <limits.h>
 #include <stdio.h>
 #include "lisp.h"
diff --git a/src/fileio.c b/src/fileio.c
index 0372f46..f74256f 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -17,7 +17,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 #include <limits.h>
 #include <fcntl.h>
 #include "sysstdio.h"
@@ -40,7 +40,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <sys/acl.h>
 #endif
 
-#include <c-ctype.h>
+#include "c-ctype.h"
 
 #include "lisp.h"
 #include "composite.h"
diff --git a/src/filelock.c b/src/filelock.c
index 1b32b93..70ea167 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -22,7 +22,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <signal.h>
@@ -42,7 +42,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <errno.h>
 
-#include <c-ctype.h>
+#include "c-ctype.h"
 
 #include "lisp.h"
 #include "buffer.h"
diff --git a/src/firstfile.c b/src/firstfile.c
index 68effeb..1ccf31b 100644
--- a/src/firstfile.c
+++ b/src/firstfile.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 
 #ifdef WINDOWSNT
 /* See comments in lastfile.c.  */
diff --git a/src/floatfns.c b/src/floatfns.c
index cf485b6..3ecaaf8 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -40,7 +40,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    scalbn, signbit, tgamma, trunc.
  */
 
-#include <config.h>
+#include "config.h"
 
 #include "lisp.h"
 
diff --git a/src/fns.c b/src/fns.c
index d314fcd..a20dbe2 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -18,7 +18,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <unistd.h>
 #include <filevercmp.h>
diff --git a/src/font.c b/src/font.c
index 039493b..c7c57ac 100644
--- a/src/font.c
+++ b/src/font.c
@@ -20,11 +20,11 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 #include <float.h>
 #include <stdio.h>
 
-#include <c-ctype.h>
+#include "c-ctype.h"
 
 #include "lisp.h"
 #include "character.h"
diff --git a/src/fontset.c b/src/fontset.c
index 0485f6b..735cf6d 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -24,7 +24,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 
 #include "lisp.h"
diff --git a/src/frame.c b/src/frame.c
index df473ae..4cfd65b 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -17,13 +17,13 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <errno.h>
 #include <limits.h>
 
-#include <c-ctype.h>
+#include "c-ctype.h"
 
 #include "lisp.h"
 
diff --git a/src/fringe.c b/src/fringe.c
index 597c666..994d9c8 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -17,7 +17,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 
 #include <byteswap.h>
diff --git a/src/ftcrfont.c b/src/ftcrfont.c
index f7b1e7d..5f69279 100644
--- a/src/ftcrfont.c
+++ b/src/ftcrfont.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <cairo-ft.h>
 
diff --git a/src/ftfont.c b/src/ftfont.c
index 505d508..9309559 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -19,7 +19,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <fontconfig/fontconfig.h>
 #include <fontconfig/fcfreetype.h>
diff --git a/src/ftxfont.c b/src/ftxfont.c
index adf0d29..be444e3 100644
--- a/src/ftxfont.c
+++ b/src/ftxfont.c
@@ -19,7 +19,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <X11/Xlib.h>
 
diff --git a/src/gfilenotify.c b/src/gfilenotify.c
index 62b4efb..b868f9e 100644
--- a/src/gfilenotify.c
+++ b/src/gfilenotify.c
@@ -16,7 +16,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #ifdef HAVE_GFILENOTIFY
 #include <stdio.h>
diff --git a/src/gmalloc.c b/src/gmalloc.c
index d795c13..74c3742 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -19,7 +19,7 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
    The author may be reached (Email) at the address mike@ai.mit.edu,
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
 
-#include <config.h>
+#include "config.h"
 
 #if defined HAVE_PTHREAD && !defined HYBRID_MALLOC
 #define USE_PTHREAD
diff --git a/src/gnutls.c b/src/gnutls.c
index 988c010..67b2d76 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -16,7 +16,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 #include <errno.h>
 #include <stdio.h>
 
diff --git a/src/gtkutil.c b/src/gtkutil.c
index 14b76ce..ccba580 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -17,13 +17,13 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #ifdef USE_GTK
 #include <float.h>
 #include <stdio.h>
 
-#include <c-ctype.h>
+#include "c-ctype.h"
 
 #include "lisp.h"
 #include "dispextern.h"
diff --git a/src/image.c b/src/image.c
index aa45b00..156ce48 100644
--- a/src/image.c
+++ b/src/image.c
@@ -17,7 +17,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <fcntl.h>
 #include <stdio.h>
@@ -30,7 +30,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #endif
 
 #include <setjmp.h>
-#include <c-ctype.h>
+#include "c-ctype.h"
 
 #include "lisp.h"
 #include "frame.h"
diff --git a/src/indent.c b/src/indent.c
index ee2e9c6..3677bf2 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -17,7 +17,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 
 #include "lisp.h"
diff --git a/src/inotify.c b/src/inotify.c
index e0619e5..73a64e3 100644
--- a/src/inotify.c
+++ b/src/inotify.c
@@ -17,7 +17,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #ifdef HAVE_INOTIFY
 
diff --git a/src/insdel.c b/src/insdel.c
index 05f37d6..9a79ce7 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 
 #include <intprops.h>
 
diff --git a/src/intervals.c b/src/intervals.c
index 29cc403..e2babd0 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -38,7 +38,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 */
 
 
-#include <config.h>
+#include "config.h"
 
 #include <intprops.h>
 #include "lisp.h"
diff --git a/src/keyboard.c b/src/keyboard.c
index 4d10727..dae55fb 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -18,7 +18,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <sys/stat.h>
 
diff --git a/src/keymap.c b/src/keymap.c
index 7928e62..7abda9a 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -39,7 +39,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
        start - removed <= visited <= start + added
  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 
 #include "lisp.h"
diff --git a/src/kqueue.c b/src/kqueue.c
index a69d06d..689865f 100644
--- a/src/kqueue.c
+++ b/src/kqueue.c
@@ -17,7 +17,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #ifdef HAVE_KQUEUE
 #include <stdio.h>
diff --git a/src/lastfile.c b/src/lastfile.c
index de4e4f4..54e401f 100644
--- a/src/lastfile.c
+++ b/src/lastfile.c
@@ -34,7 +34,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
  coming from libraries.
 */
 
-#include <config.h>
+#include "config.h"
 
 #include "lisp.h"
 
diff --git a/src/lread.c b/src/lread.c
index 25e3ff0..57eaef9 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -21,7 +21,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Tell globals.h to define tables needed by init_obarray.  */
 #define DEFINE_SYMBOLS
 
-#include <config.h>
+#include "config.h"
 #include "sysstdio.h"
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/macfont.m b/src/macfont.m
index 45830e0..1da2893 100644
--- a/src/macfont.m
+++ b/src/macfont.m
@@ -19,7 +19,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 Original author: YAMAMOTO Mitsuharu
 */
 
-#include <config.h>
+#include "config.h"
 
 #include "lisp.h"
 #include "dispextern.h"
diff --git a/src/macros.c b/src/macros.c
index 289f22b..3b24304 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 
 #include "lisp.h"
 #include "macros.h"
diff --git a/src/marker.c b/src/marker.c
index 9f53e9a..16f0c11 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 
 #include "lisp.h"
 #include "character.h"
diff --git a/src/menu.c b/src/menu.c
index cbddef3..d77b5d8 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -18,7 +18,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <limits.h> /* for INT_MAX */
 
diff --git a/src/minibuf.c b/src/minibuf.c
index 180668f..02fc7c8 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 #include <errno.h>
 #include <stdio.h>
 
diff --git a/src/msdos.c b/src/msdos.c
index b378cc2..e02d925 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -29,7 +29,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Note: some of the stuff here was taken from end of sysdep.c in demacs. */
 
-#include <config.h>
+#include "config.h"
 
 #ifdef MSDOS
 #include <setjmp.h>
diff --git a/src/nsfns.m b/src/nsfns.m
index eda94c4..c024493 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -28,7 +28,7 @@ GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu)
 
 /* This should be the first include, as it may set up #defines affecting
    interpretation of even the system includes. */
-#include <config.h>
+#include "config.h"
 
 #include <math.h>
 #include <c-strcase.h>
diff --git a/src/nsfont.m b/src/nsfont.m
index b46680b..d7b2152 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -22,7 +22,7 @@ Author: Adrian Robert (arobert@cogsci.ucsd.edu)
 
 /* This should be the first include, as it may set up #defines affecting
    interpretation of even the system includes. */
-#include <config.h>
+#include "config.h"
 
 #include "lisp.h"
 #include "dispextern.h"
diff --git a/src/nsimage.m b/src/nsimage.m
index b871448..8d14827 100644
--- a/src/nsimage.m
+++ b/src/nsimage.m
@@ -27,7 +27,7 @@ GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu)
 
 /* This should be the first include, as it may set up #defines affecting
    interpretation of even the system includes. */
-#include <config.h>
+#include "config.h"
 
 #include "lisp.h"
 #include "dispextern.h"
diff --git a/src/nsmenu.m b/src/nsmenu.m
index c6d6835..4f5ce76 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -23,7 +23,7 @@ Carbon version by Yamamoto Mitsuharu. */
 
 /* This should be the first include, as it may set up #defines affecting
    interpretation of even the system includes. */
-#include <config.h>
+#include "config.h"
 
 #include "lisp.h"
 #include "window.h"
diff --git a/src/nsselect.m b/src/nsselect.m
index 463f02b..decae1a 100644
--- a/src/nsselect.m
+++ b/src/nsselect.m
@@ -27,7 +27,7 @@ GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu)
 
 /* This should be the first include, as it may set up #defines affecting
    interpretation of even the system includes.  */
-#include <config.h>
+#include "config.h"
 
 #include "lisp.h"
 #include "nsterm.h"
diff --git a/src/nsterm.m b/src/nsterm.m
index 43d1377..5dfd184 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -28,7 +28,7 @@ GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu)
 
 /* This should be the first include, as it may set up #defines affecting
    interpretation of even the system includes. */
-#include <config.h>
+#include "config.h"
 
 #include <fcntl.h>
 #include <math.h>
@@ -38,7 +38,7 @@ GNUstep port and post-20 update by Adrian Robert (arobert@cogsci.ucsd.edu)
 #include <signal.h>
 #include <unistd.h>
 
-#include <c-ctype.h>
+#include "c-ctype.h"
 #include <c-strcase.h>
 #include <ftoastr.h>
 
diff --git a/src/print.c b/src/print.c
index 2ecc0f5..82d672d 100644
--- a/src/print.c
+++ b/src/print.c
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 #include "sysstdio.h"
 
 #include "lisp.h"
@@ -34,7 +34,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "blockinput.h"
 #include "xwidget.h"
 
-#include <c-ctype.h>
+#include "c-ctype.h"
 #include <float.h>
 #include <ftoastr.h>
 
diff --git a/src/process.c b/src/process.c
index 85a4885..dc79d28 100644
--- a/src/process.c
+++ b/src/process.c
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <errno.h>
@@ -83,7 +83,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <pty.h>
 #endif
 
-#include <c-ctype.h>
+#include "c-ctype.h"
 #include <sig2str.h>
 #include <verify.h>
 
diff --git a/src/profiler.c b/src/profiler.c
index 95f84fd..a35a14d 100644
--- a/src/profiler.c
+++ b/src/profiler.c
@@ -17,7 +17,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 #include "lisp.h"
 #include "syssignal.h"
 #include "systime.h"
diff --git a/src/ralloc.c b/src/ralloc.c
index d1a9e01..5a94d73 100644
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -22,7 +22,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    rather than all of them.  This means allowing for a possible
    hole between the first bloc and the end of malloc storage.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stddef.h>
 
diff --git a/src/regex.c b/src/regex.c
index d5c58ae..363b9c24 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -47,7 +47,7 @@
 # pragma GCC diagnostic ignored "-Wunused-but-set-variable"
 #endif
 
-#include <config.h>
+#include "config.h"
 
 #include <stddef.h>
 
diff --git a/src/region-cache.c b/src/region-cache.c
index 4ce7de8..800c7ae 100644
--- a/src/region-cache.c
+++ b/src/region-cache.c
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 
 #include "lisp.h"
diff --git a/src/scroll.c b/src/scroll.c
index 517cc68..a435969 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 
 #include "lisp.h"
diff --git a/src/search.c b/src/search.c
index 68b0121..73565f2 100644
--- a/src/search.c
+++ b/src/search.c
@@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 
 #include "lisp.h"
 #include "character.h"
diff --git a/src/sheap.c b/src/sheap.c
index fe905ca..a2a39f5 100644
--- a/src/sheap.c
+++ b/src/sheap.c
@@ -18,7 +18,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include "sheap.h"
 
diff --git a/src/sound.c b/src/sound.c
index 42f1fca..afdae49 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -35,7 +35,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   waveOutSetVolume which are exported by Winmm.dll.
 */
 
-#include <config.h>
+#include "config.h"
 
 #if defined HAVE_SOUND
 
diff --git a/src/syntax.c b/src/syntax.c
index 249d0d5..5623308 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 
 #include <sys/types.h>
 
diff --git a/src/sysdep.c b/src/sysdep.c
index a01bf1d..c4bb64e 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -17,7 +17,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <execinfo.h>
 #include "sysstdio.h"
@@ -28,7 +28,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <limits.h>
 #include <unistd.h>
 
-#include <c-ctype.h>
+#include "c-ctype.h"
 #include <utimens.h>
 
 #include "lisp.h"
diff --git a/src/term.c b/src/term.c
index 993928e..af9c1ed 100644
--- a/src/term.c
+++ b/src/term.c
@@ -19,7 +19,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* New redisplay, TTY faces by Gerd Moellmann <gerd@gnu.org>.  */
 
-#include <config.h>
+#include "config.h"
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
diff --git a/src/termcap.c b/src/termcap.c
index 3ecf19f..bf29944 100644
--- a/src/termcap.c
+++ b/src/termcap.c
@@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Emacs config.h may rename various library functions such as malloc.  */
-#include <config.h>
+#include "config.h"
 #include <sys/file.h>
 #include <fcntl.h>
 #include <unistd.h>
diff --git a/src/terminal.c b/src/terminal.c
index a557967..2a83ddf 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -16,7 +16,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 
diff --git a/src/terminfo.c b/src/terminfo.c
index b8b5f97..df59a83 100644
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -16,7 +16,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 #include "tparam.h"
 
 #include "lisp.h"
diff --git a/src/textprop.c b/src/textprop.c
index 70091b9..87530d8 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -17,7 +17,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include "lisp.h"
 #include "intervals.h"
diff --git a/src/tparam.c b/src/tparam.c
index d3ae491..8ec7044 100644
--- a/src/tparam.c
+++ b/src/tparam.c
@@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Emacs config.h may rename various library functions such as malloc.  */
-#include <config.h>
+#include "config.h"
 
 #include "lisp.h"		/* for xmalloc */
 #include "tparam.h"
diff --git a/src/undo.c b/src/undo.c
index 1cc9c98..9776660 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -18,7 +18,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 
 #include "lisp.h"
 #include "buffer.h"
diff --git a/src/unexaix.c b/src/unexaix.c
index eb51d28..c08b51d 100644
--- a/src/unexaix.c
+++ b/src/unexaix.c
@@ -40,7 +40,7 @@ what you give them.   Help stamp out software-hoarding!  */
  *
  */
 
-#include <config.h>
+#include "config.h"
 #include "unexec.h"
 #include "lisp.h"
 
diff --git a/src/unexcoff.c b/src/unexcoff.c
index cc0df30..6454c2c 100644
--- a/src/unexcoff.c
+++ b/src/unexcoff.c
@@ -50,7 +50,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
  * of Dell Computer Corporation.  james@bigtex.cactus.org.
  */
 
-#include <config.h>
+#include "config.h"
 #include "unexec.h"
 #include "lisp.h"
 
diff --git a/src/unexcw.c b/src/unexcw.c
index 6ebd8c6..a4db4d4 100644
--- a/src/unexcw.c
+++ b/src/unexcw.c
@@ -18,7 +18,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 #include "unexec.h"
 #include "lisp.h"
 #include <string.h>
diff --git a/src/unexelf.c b/src/unexelf.c
index e901994..99d1640 100644
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -44,7 +44,7 @@ what you give them.   Help stamp out software-hoarding!  */
 /* We do not use mmap because that fails with NFS.
    Instead we read the whole file, modify it, and write it out.  */
 
-#include <config.h>
+#include "config.h"
 #include "unexec.h"
 #include "lisp.h"
 
diff --git a/src/unexhp9k800.c b/src/unexhp9k800.c
index cbf1835..5976bbb 100644
--- a/src/unexhp9k800.c
+++ b/src/unexhp9k800.c
@@ -49,7 +49,7 @@
   sigsetreturn (_sigreturn);
 */
 \f
-#include <config.h>
+#include "config.h"
 #include "unexec.h"
 #include "lisp.h"
 
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index bfb8bd4..dc0a0ba 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -91,7 +91,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    warnings.  To prevent that, include stdlib.h before config.h.  */
 
 #include <stdlib.h>
-#include <config.h>
+#include "config.h"
 #undef malloc
 #undef realloc
 #undef free
diff --git a/src/unexsol.c b/src/unexsol.c
index 0f84099..f4bed09 100644
--- a/src/unexsol.c
+++ b/src/unexsol.c
@@ -1,6 +1,6 @@
 /* Trivial unexec for Solaris.  */
 
-#include <config.h>
+#include "config.h"
 #include "unexec.h"
 
 #include <dlfcn.h>
diff --git a/src/unexw32.c b/src/unexw32.c
index 460a39e..6874c5b 100644
--- a/src/unexw32.c
+++ b/src/unexw32.c
@@ -20,7 +20,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    Geoff Voelker (voelker@cs.washington.edu)                         8-12-94
 */
 
-#include <config.h>
+#include "config.h"
 #include "unexec.h"
 #include "lisp.h"
 #include "w32common.h"
diff --git a/src/vm-limit.c b/src/vm-limit.c
index 42f0470..96bd77e 100644
--- a/src/vm-limit.c
+++ b/src/vm-limit.c
@@ -16,7 +16,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 #include <unistd.h> /* for 'environ', on AIX */
 #include "lisp.h"
 
diff --git a/src/w16select.c b/src/w16select.c
index 48bb813..1ea734c 100644
--- a/src/w16select.c
+++ b/src/w16select.c
@@ -27,7 +27,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifdef MSDOS
 
-#include <config.h>
+#include "config.h"
 #include <dpmi.h>
 #include <go32.h>
 #include <sys/farptr.h>
diff --git a/src/w32.c b/src/w32.c
index 998f696..ee08a96 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -39,7 +39,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* must include CRT headers *before* config.h */
 
-#include <config.h>
+#include "config.h"
 #include <mbstring.h>	/* for _mbspbrk, _mbslwr, _mbsrchr, ... */
 
 #undef access
diff --git a/src/w32console.c b/src/w32console.c
index fdadd48..848ebd6 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -22,7 +22,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 */
 
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 #include <windows.h>
diff --git a/src/w32fns.c b/src/w32fns.c
index 10c8af7..28d2e61 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -19,7 +19,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Added by Kevin Gallo */
 
-#include <config.h>
+#include "config.h"
 /* Override API version to get the latest functionality.  */
 #undef _WIN32_WINNT
 #define _WIN32_WINNT 0x0600
@@ -32,7 +32,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <fcntl.h>
 #include <unistd.h>
 
-#include <c-ctype.h>
+#include "c-ctype.h"
 
 #include "lisp.h"
 #include "w32term.h"
diff --git a/src/w32font.c b/src/w32font.c
index 0c3efe2..4765dcb 100644
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -16,7 +16,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 #include <windows.h>
 #include <stdio.h>
 #include <math.h>
diff --git a/src/w32heap.c b/src/w32heap.c
index b908169..8343dab 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -45,7 +45,7 @@
       guarantee that the heap data structures are the same across all
       versions of their OS, even though the API is available since XP.  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <errno.h>
 
diff --git a/src/w32inevt.c b/src/w32inevt.c
index c7246c7..bb5a78f 100644
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -23,7 +23,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 */
 
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <windows.h>
 
diff --git a/src/w32menu.c b/src/w32menu.c
index d8c3dc1..c60e7a8 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -17,7 +17,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <signal.h>
 #include <stdio.h>
diff --git a/src/w32notify.c b/src/w32notify.c
index 71787c4..ffa82fc 100644
--- a/src/w32notify.c
+++ b/src/w32notify.c
@@ -85,7 +85,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <errno.h>
 
 /* must include CRT headers *before* config.h */
-#include <config.h>
+#include "config.h"
 
 #include <windows.h>
 
diff --git a/src/w32proc.c b/src/w32proc.c
index a89a985..5fa9e1b 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -36,7 +36,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <locale.h>
 
 /* must include CRT headers *before* config.h */
-#include <config.h>
+#include "config.h"
 
 #undef signal
 #undef wait
diff --git a/src/w32reg.c b/src/w32reg.c
index 7d1ccf8..872361d 100644
--- a/src/w32reg.c
+++ b/src/w32reg.c
@@ -19,7 +19,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Kevin Gallo */
 
-#include <config.h>
+#include "config.h"
 #include "lisp.h"
 #include "w32term.h"	/* for XrmDatabase, xrdb */
 #include "blockinput.h"
diff --git a/src/w32select.c b/src/w32select.c
index ce4ed69..a2537c6 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -72,7 +72,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
  * could be expanded to CF_HTML, CF_RTF and maybe other types.
  */
 
-#include <config.h>
+#include "config.h"
 #include "lisp.h"
 #include "w32common.h"	/* os_subtype */
 #include "w32term.h"	/* for all of the w32 includes */
diff --git a/src/w32term.c b/src/w32term.c
index 36a5021..7cd2df1 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -17,7 +17,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 #include <signal.h>
 #include <stdio.h>
 #include "lisp.h"
diff --git a/src/w32uniscribe.c b/src/w32uniscribe.c
index c5ba87b..8c48a7a 100644
--- a/src/w32uniscribe.c
+++ b/src/w32uniscribe.c
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 
-#include <config.h>
+#include "config.h"
 /* Override API version - Uniscribe is only available as standard
    since Windows 2000, though most users of older systems will have it
    since it installs with Internet Explorer 5.0 and other software.
diff --git a/src/w32xfns.c b/src/w32xfns.c
index 29636d1..8150e65 100644
--- a/src/w32xfns.c
+++ b/src/w32xfns.c
@@ -17,7 +17,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 #include <signal.h>
 #include <stdio.h>
 #include <windows.h>
diff --git a/src/widget.c b/src/widget.c
index a71de90..496a9eb 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -28,7 +28,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    site http://www.vtw.org/
    */
 
-#include <config.h>
+#include "config.h"
 #include "widget.h"
 
 #include <stdio.h>
diff --git a/src/window.c b/src/window.c
index be34c49..0133b6e 100644
--- a/src/window.c
+++ b/src/window.c
@@ -18,7 +18,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 
diff --git a/src/xdisp.c b/src/xdisp.c
index acb2754..38f2470 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -286,7 +286,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    that corresponds to certain pixel coordinates.  See
    buffer_posn_from_coords in dispnew.c for how this is handled.  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <limits.h>
 
diff --git a/src/xfaces.c b/src/xfaces.c
index 7762e0f..d85141a 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -199,7 +199,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    basic faces are realized for CHARSET_ASCII.  Frame parameters are
    used to fill in unspecified attributes of the default face.  */
 
-#include <config.h>
+#include "config.h"
 #include "sysstdio.h"
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -259,7 +259,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #endif /* HAVE_X_WINDOWS */
 
-#include <c-ctype.h>
+#include "c-ctype.h"
 
 /* True if face attribute ATTR is unspecified.  */
 
diff --git a/src/xfns.c b/src/xfns.c
index 2a50a5a..eeccedd 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -17,7 +17,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <math.h>
 #include <unistd.h>
diff --git a/src/xfont.c b/src/xfont.c
index 15a4b74..4a207d6 100644
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -19,7 +19,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <X11/Xlib.h>
 
diff --git a/src/xftfont.c b/src/xftfont.c
index 110f99a..a713518 100644
--- a/src/xftfont.c
+++ b/src/xftfont.c
@@ -19,7 +19,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include <X11/Xlib.h>
 #include <X11/Xft/Xft.h>
diff --git a/src/xgselect.c b/src/xgselect.c
index a61d46b..760c883 100644
--- a/src/xgselect.c
+++ b/src/xgselect.c
@@ -17,7 +17,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include "xgselect.h"
 
diff --git a/src/xmenu.c b/src/xmenu.c
index 1047b19..302bdf7 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -30,7 +30,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Rewritten for clarity and GC protection by rms in Feb 94.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <stdio.h>
 
diff --git a/src/xml.c b/src/xml.c
index 6c47a9d..9930d95 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -16,7 +16,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #ifdef HAVE_LIBXML2
 
diff --git a/src/xrdb.c b/src/xrdb.c
index 865acc9..0760597 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -20,7 +20,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <unistd.h>
 #include <errno.h>
diff --git a/src/xselect.c b/src/xselect.c
index 23b735e..f658e19 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -19,7 +19,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Rewritten by jwz */
 
-#include <config.h>
+#include "config.h"
 #include <limits.h>
 #include <stdio.h>      /* termhooks.h needs this */
 
diff --git a/src/xsettings.c b/src/xsettings.c
index 28075b5..193f168 100644
--- a/src/xsettings.c
+++ b/src/xsettings.c
@@ -17,7 +17,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include <float.h>
 #include <limits.h>
diff --git a/src/xsmfns.c b/src/xsmfns.c
index df5c46b..d56028e 100644
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -18,7 +18,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #ifdef HAVE_X_SM
 
diff --git a/src/xterm.c b/src/xterm.c
index 1f71afd..d18066a 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -20,7 +20,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* New display code by Gerd Moellmann <gerd@gnu.org>.  */
 /* Xt features made by Fred Pierresteguy.  */
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #ifdef USE_CAIRO
 #include <math.h>
diff --git a/src/xwidget.c b/src/xwidget.c
index f436e95..46f0e26 100644
--- a/src/xwidget.c
+++ b/src/xwidget.c
@@ -17,7 +17,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include "xwidget.h"
 
diff --git a/test/manual/etags/c-src/abbrev.c b/test/manual/etags/c-src/abbrev.c
index b7d137c..13b7510 100644
--- a/test/manual/etags/c-src/abbrev.c
+++ b/test/manual/etags/c-src/abbrev.c
@@ -20,7 +20,7 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
 
-#include <config.h>
+#include "config.h"
 #include <stdio.h>
 #include "lisp.h"
 #include "commands.h"
diff --git a/test/manual/etags/c-src/emacs/src/gmalloc.c b/test/manual/etags/c-src/emacs/src/gmalloc.c
index 683ee0c..245f7bd 100644
--- a/test/manual/etags/c-src/emacs/src/gmalloc.c
+++ b/test/manual/etags/c-src/emacs/src/gmalloc.c
@@ -19,7 +19,7 @@ License along with this library.  If not, see <http://www.gnu.org/licenses/>.
    The author may be reached (Email) at the address mike@ai.mit.edu,
    or (US mail) as Mike Haertel c/o Free Software Foundation.  */
 
-#include <config.h>
+#include "config.h"
 
 #if defined HAVE_PTHREAD && !defined HYBRID_MALLOC
 #define USE_PTHREAD
diff --git a/test/manual/etags/c-src/emacs/src/keyboard.c b/test/manual/etags/c-src/emacs/src/keyboard.c
index 077b147..6ac81b3 100644
--- a/test/manual/etags/c-src/emacs/src/keyboard.c
+++ b/test/manual/etags/c-src/emacs/src/keyboard.c
@@ -18,7 +18,7 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#include <config.h>
+#include "config.h"
 
 #include "sysstdio.h"
 #include <sys/stat.h>
diff --git a/test/manual/etags/c-src/etags.c b/test/manual/etags/c-src/etags.c
index 4465b83..cf4468b 100644
--- a/test/manual/etags/c-src/etags.c
+++ b/test/manual/etags/c-src/etags.c
@@ -88,7 +88,7 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
 #  define NDEBUG		/* disable assert */
 #endif
 
-#include <config.h>
+#include "config.h"
 
 #ifndef _GNU_SOURCE
 # define _GNU_SOURCE 1		/* enables some compiler checks on GNU */

^ permalink raw reply related	[flat|nested] 8+ messages in thread

* Re: Using " rather than < for header files in Emacs
  2016-03-02 22:30 Using " rather than < for header files in Emacs Wilfred Hughes
@ 2016-03-02 23:10 ` Paul Eggert
  2016-03-02 23:21   ` Herring, Davis
  0 siblings, 1 reply; 8+ messages in thread
From: Paul Eggert @ 2016-03-02 23:10 UTC (permalink / raw)
  To: Wilfred Hughes, emacs-devel

On 03/02/2016 02:30 PM, Wilfred Hughes wrote:
> I've noticed that it's common for Emacs C code to say:
>
> #include <config.h>
>
> or
>
> #include <c-ctype.h>
>
> even though these headers are from Emacs source, not system headers.
> Are we interested in fixing this?

I don't see why using " fixes anything. All these files have to compile 
with -I anyway, because builders don't need to build Emacs in the source 
directory.  We might actually be better off using '<' for all includes.



^ permalink raw reply	[flat|nested] 8+ messages in thread

* RE: Using " rather than < for header files in Emacs
  2016-03-02 23:10 ` Paul Eggert
@ 2016-03-02 23:21   ` Herring, Davis
  2016-03-05 13:09     ` Mathieu Lirzin
  0 siblings, 1 reply; 8+ messages in thread
From: Herring, Davis @ 2016-03-02 23:21 UTC (permalink / raw)
  To: Paul Eggert, Wilfred Hughes, emacs-devel

> I don't see why using " fixes anything. All these files have to compile
> with -I anyway, because builders don't need to build Emacs in the source
> directory.  We might actually be better off using '<' for all includes.

Except for generated headers, most of these could be relative includes, which is the usual meaning of #include"".

Davis



^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: Using " rather than < for header files in Emacs
  2016-03-02 23:21   ` Herring, Davis
@ 2016-03-05 13:09     ` Mathieu Lirzin
  2016-03-05 13:57       ` Herring, Davis
  0 siblings, 1 reply; 8+ messages in thread
From: Mathieu Lirzin @ 2016-03-05 13:09 UTC (permalink / raw)
  To: Herring, Davis; +Cc: Paul Eggert, emacs-devel, Wilfred Hughes

"Herring, Davis" <herring@lanl.gov> writes:

>> I don't see why using " fixes anything. All these files have to compile
>> with -I anyway, because builders don't need to build Emacs in the source
>> directory.  We might actually be better off using '<' for all includes.
>
> Except for generated headers, most of these could be relative includes, which is the usual meaning of #include"".

It will work for generated headers too.  Since '"' includes are a
superset of '<' includes as documented in GNU 'cpp' info manual.
However I don't know if this behavior is enforced by other c processors.

--8<---------------cut here---------------start------------->8---
Both user and system header files are included using the preprocessing
directive '#include'.  It has two variants:

'#include <FILE>'
     This variant is used for system header files.  It searches for a
     file named FILE in a standard list of system directories.  You can
     prepend directories to this list with the '-I' option (*note
     Invocation::).

'#include "FILE"'
     This variant is used for header files of your own program.  It
     searches for a file named FILE first in the directory containing
     the current file, then in the quote directories and then the same
     directories used for '<FILE>'.  You can prepend directories to the
     list of quote directories with the '-iquote' option.
--8<---------------cut here---------------end--------------->8---

I agree with Paul that this won't fix anything.  However I think keeping
using '"' includes have the semantic benefit of emphazing what headers
are part of Emacs which is helpful for people not familiar with the code
base.

In the case of config.h, using '"' could help emphasizing that is not a
system header but one can argue it could equally confuse people since it
is a generated file.  c-ctype.h is imported from Gnulib so should not be
considered part of Emacs so it would be better to keep using '<'.

-- 
Mathieu Lirzin



^ permalink raw reply	[flat|nested] 8+ messages in thread

* RE: Using " rather than < for header files in Emacs
  2016-03-05 13:09     ` Mathieu Lirzin
@ 2016-03-05 13:57       ` Herring, Davis
  2016-03-05 17:39         ` Paul Eggert
  0 siblings, 1 reply; 8+ messages in thread
From: Herring, Davis @ 2016-03-05 13:57 UTC (permalink / raw)
  To: Mathieu Lirzin; +Cc: Paul Eggert, emacs-devel, Wilfred Hughes

> It will work for generated headers too.  Since '"' includes are a
> superset of '<' includes as documented in GNU 'cpp' info manual.
> However I don't know if this behavior is enforced by other c processors.

It is defined by C (don't know as of which version off hand) that #include"x" can find what #include<x> finds (but may find something else first).

Davis


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: Using " rather than < for header files in Emacs
  2016-03-05 13:57       ` Herring, Davis
@ 2016-03-05 17:39         ` Paul Eggert
  2016-03-08 15:51           ` Mathieu Lirzin
  0 siblings, 1 reply; 8+ messages in thread
From: Paul Eggert @ 2016-03-05 17:39 UTC (permalink / raw)
  To: Herring, Davis, Mathieu Lirzin; +Cc: Wilfred Hughes, emacs-devel

Herring, Davis wrote:
> It is defined by C (don't know as of which version off hand) that #include"x" can find what #include<x> finds (but may find something else first).

Yes, a portable program can't assume that "..." will find files that <...> 
won't. In some C compilers, "..." looks in the working directory that the 
compiler is run in; in POSIX-compatible compilers (including GCC) "..." will 
first look in the directory containing the source file that has the "..."; in 
other C compilers (including Microsoft) "..." will also search in the 
directories of currently opened include files; and I assume there are other 
possibilities.

In theory, the "..." form could lead to including the wrong file. In practice, 
the way Emacs does it is harmless, but why add risk by using "..." more often?

(There was a reason in GCC before 3.0 to prefer angle brackets or double quotes, 
depending on whether you wanted -MM to generate dependency information, but that 
reason is obsolescent now.)



^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: Using " rather than < for header files in Emacs
  2016-03-05 17:39         ` Paul Eggert
@ 2016-03-08 15:51           ` Mathieu Lirzin
  2016-03-09  8:19             ` Paul Eggert
  0 siblings, 1 reply; 8+ messages in thread
From: Mathieu Lirzin @ 2016-03-08 15:51 UTC (permalink / raw)
  To: Paul Eggert; +Cc: Wilfred Hughes, emacs-devel

Paul Eggert <eggert@cs.ucla.edu> writes:

> Herring, Davis wrote:
>> It is defined by C (don't know as of which version off hand) that #include"x" can find what #include<x> finds (but may find something else first).
>
> Yes, a portable program can't assume that "..." will find files that
> <...> won't. In some C compilers, "..." looks in the working directory
> that the compiler is run in; in POSIX-compatible compilers (including
> GCC) "..." will first look in the directory containing the source file
> that has the "..."; in other C compilers (including Microsoft) "..."
> will also search in the directories of currently opened include files;
> and I assume there are other possibilities.

> In theory, the "..." form could lead to including the wrong file. In
> practice, the way Emacs does it is harmless, but why add risk by using
> "..." more often?

Could you give a concrete example of a possible include problem using
"..."?  It would help me understand the issue.

> (There was a reason in GCC before 3.0 to prefer angle brackets or
> double quotes, depending on whether you wanted -MM to generate
> dependency information, but that reason is obsolescent now.)

I didn't know about that.  Thanks for sharing your knowledge.  :)

-- 
Mathieu Lirzin



^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: Using " rather than < for header files in Emacs
  2016-03-08 15:51           ` Mathieu Lirzin
@ 2016-03-09  8:19             ` Paul Eggert
  0 siblings, 0 replies; 8+ messages in thread
From: Paul Eggert @ 2016-03-09  8:19 UTC (permalink / raw)
  To: Mathieu Lirzin; +Cc: Wilfred Hughes, emacs-devel

Mathieu Lirzin wrote:
>> >In theory, the "..." form could lead to including the wrong file. In
>> >practice, the way Emacs does it is harmless, but why add risk by using
>> >"..." more often?
> Could you give a concrete example of a possible include problem using
> "..."?  It would help me understand the issue.

Well, as I said I doubt whether Emacs has the problem, but it could be something 
like this:

a/x.h: #include "y.h"
b/z.h: #include <x.h>
b/y.h: int foo;
c/y.h: char foo;
c/f.c: #include <z.h>

cd c; cc -I../a -I../b f.c

With GNU, 'foo' is of type 'int'. With Microsoft C, it sounds like 'foo' is of 
type 'char'. I don't use Microsoft C so this example is untested there and may 
not be quite right, but I hope it gives you the idea.



^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2016-03-09  8:19 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-02 22:30 Using " rather than < for header files in Emacs Wilfred Hughes
2016-03-02 23:10 ` Paul Eggert
2016-03-02 23:21   ` Herring, Davis
2016-03-05 13:09     ` Mathieu Lirzin
2016-03-05 13:57       ` Herring, Davis
2016-03-05 17:39         ` Paul Eggert
2016-03-08 15:51           ` Mathieu Lirzin
2016-03-09  8:19             ` Paul Eggert

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).