diff --git a/libguile/libguile.h b/libguile/libguile.h
index 41a840db4..083b018c8 100644
--- a/libguile/libguile.h
+++ b/libguile/libguile.h
@@ -45,96 +45,82 @@
 
 
 
-#include <libguile/__scm.h>
+#include "libguile/__scm.h"
 
-#ifdef STDC_HEADERS
-# include <stdlib.h>
-# ifdef AMIGA
-#  include <stddef.h>
-# endif /* def AMIGA */
-# define scm_sizet size_t
-#else
-# ifdef _SIZE_T
-#  define scm_sizet size_t
-# else
-#  define scm_sizet unsigned int
-# endif /* def _SIZE_T */
-#endif /* def STDC_HEADERS */
+/* These files define typedefs used by later files, so they need to
+   come first.  */
+#include "libguile/smob.h"
+#include "libguile/pairs.h"
 
-#include <libguile/smob.h>
-
-
-
-#include <libguile/alist.h>
-#include <libguile/append.h>
-#include <libguile/arbiters.h>
-#include <libguile/async.h>
-#include <libguile/boolean.h>
-#include <libguile/chars.h>
-#include <libguile/continuations.h>
+#include "libguile/alist.h"
+#include "libguile/append.h"
+#include "libguile/arbiters.h"
+#include "libguile/async.h"
+#include "libguile/boolean.h"
+#include "libguile/chars.h"
+#include "libguile/continuations.h"
 #ifdef DEBUG_EXTENSIONS
-#include <libguile/debug.h>
+#include "libguile/debug.h"
 #endif
-#include <libguile/dynwind.h>
-#include <libguile/eq.h>
-#include <libguile/error.h>
-#include <libguile/eval.h>
-#include <libguile/extchrs.h>
-#include <libguile/fdsocket.h>
-#include <libguile/feature.h>
-#include <libguile/files.h>
-#include <libguile/filesys.h>
-#include <libguile/fports.h>
-#include <libguile/gc.h>
-#include <libguile/gdbint.h>
-#include <libguile/genio.h>
-#include <libguile/gsubr.h>
-#include <libguile/hash.h>
-#include <libguile/hashtab.h>
-#include <libguile/init.h>
-#include <libguile/ioext.h>
-#include <libguile/kw.h>
-#include <libguile/list.h>
-#include <libguile/load.h>
-#include <libguile/mallocs.h>
-#include <libguile/markers.h>
-#include <libguile/marksweep.h>
-#include <libguile/mbstrings.h>
-#include <libguile/numbers.h>
-#include <libguile/objprop.h>
-#include <libguile/options.h>
-#include <libguile/pairs.h>
-#include <libguile/params.h>
-#include <libguile/ports.h>
-#include <libguile/posix.h>
-#include <libguile/print.h>
-#include <libguile/procprop.h>
-#include <libguile/procs.h>
-#include <libguile/ramap.h>
-#include <libguile/read.h>
-#include <libguile/root.h>
-#include <libguile/scmsigs.h>
-#include <libguile/sequences.h>
-#include <libguile/simpos.h>
-#include <libguile/socket.h>
-#include <libguile/srcprop.h>
-#include <libguile/stackchk.h>
-#include <libguile/stime.h>
-#include <libguile/strings.h>
-#include <libguile/strop.h>
-#include <libguile/strorder.h>
-#include <libguile/strports.h>
-#include <libguile/struct.h>
-#include <libguile/symbols.h>
-#include <libguile/tag.h>
-#include <libguile/tags.h>
-#include <libguile/throw.h>
-#include <libguile/unif.h>
-#include <libguile/variable.h>
-#include <libguile/vectors.h>
-#include <libguile/version.h>
-#include <libguile/vports.h>
-#include <libguile/weaks.h>
+#include "libguile/dynwind.h"
+#include "libguile/eq.h"
+#include "libguile/error.h"
+#include "libguile/eval.h"
+#include "libguile/extchrs.h"
+#include "libguile/fdsocket.h"
+#include "libguile/feature.h"
+#include "libguile/files.h"
+#include "libguile/filesys.h"
+#include "libguile/fports.h"
+#include "libguile/gc.h"
+#include "libguile/gdbint.h"
+#include "libguile/genio.h"
+#include "libguile/gsubr.h"
+#include "libguile/hash.h"
+#include "libguile/hashtab.h"
+#include "libguile/init.h"
+#include "libguile/ioext.h"
+#include "libguile/kw.h"
+#include "libguile/list.h"
+#include "libguile/load.h"
+#include "libguile/mallocs.h"
+#include "libguile/markers.h"
+#include "libguile/marksweep.h"
+#include "libguile/mbstrings.h"
+#include "libguile/numbers.h"
+#include "libguile/objprop.h"
+#include "libguile/options.h"
+#include "libguile/params.h"
+#include "libguile/ports.h"
+#include "libguile/posix.h"
+#include "libguile/print.h"
+#include "libguile/procprop.h"
+#include "libguile/procs.h"
+#include "libguile/ramap.h"
+#include "libguile/read.h"
+#include "libguile/root.h"
+#include "libguile/scmsigs.h"
+#include "libguile/sequences.h"
+#include "libguile/simpos.h"
+#include "libguile/socket.h"
+#include "libguile/srcprop.h"
+#include "libguile/stackchk.h"
+#include "libguile/stime.h"
+#include "libguile/strings.h"
+#include "libguile/strop.h"
+#include "libguile/strorder.h"
+#include "libguile/strports.h"
+#include "libguile/struct.h"
+#include "libguile/symbols.h"
+#include "libguile/tag.h"
+#include "libguile/tags.h"
+#include "libguile/throw.h"
+#include "libguile/unif.h"
+#include "libguile/variable.h"
+#include "libguile/vectors.h"
+#include "libguile/version.h"
+#include "libguile/vports.h"
+#include "libguile/weaks.h"