diff --git a/ChangeLog b/ChangeLog
index 8998ca5f..f06987b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -105,6 +105,9 @@ CVS code -
 	  get_totals(); changes to write_marked(), do_int_spell_fix(),
 	  do_alt_speller(), handle_sigwinch(), and do_replace_loop().
 	  (DLR)
+	- Remove most redundant includes of sys/stat.h.  It's included
+	  in nano.h, so it doesn't need to be included in files that
+	  include nano.h. (DLR)
 - files.c:
   do_insertfile()
 	- Simplify by reusing variables whereever possible, and add a
diff --git a/src/color.c b/src/color.c
index 5d2ba8f4..3b60b6cf 100644
--- a/src/color.c
+++ b/src/color.c
@@ -25,7 +25,6 @@
 #include <string.h>
 #include <stdio.h>
 #include <errno.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include "proto.h"
 #include "nano.h"
diff --git a/src/files.c b/src/files.c
index 69f114f6..bb838a8f 100644
--- a/src/files.c
+++ b/src/files.c
@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/wait.h>
-#include <sys/stat.h>
 #include <utime.h>
 #include <fcntl.h>
 #include <errno.h>
diff --git a/src/global.c b/src/global.c
index a6ef0b62..8e539da9 100644
--- a/src/global.c
+++ b/src/global.c
@@ -23,7 +23,6 @@
 
 #include <stdlib.h>
 #include <assert.h>
-#include <sys/stat.h>
 #include "proto.h"
 #include "nano.h"
 
diff --git a/src/nano.c b/src/nano.c
index 25784f34..db601ada 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -28,7 +28,6 @@
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
-#include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <sys/param.h>
 #include <sys/wait.h>
diff --git a/src/proto.h b/src/proto.h
index 396a6dad..dd6e8e60 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -21,8 +21,8 @@
 
 /* Externs. */
 
-#include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #ifdef HAVE_REGEX_H
 #include <regex.h>
 #endif
diff --git a/src/rcfile.c b/src/rcfile.c
index c07162d4..f5130105 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -27,7 +27,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
-#include <sys/stat.h>
 #include <fcntl.h>
 #include <pwd.h>
 #include <ctype.h>