diff --git a/libntfs/attrib.c b/libntfs/attrib.c
index 4e6f2bf0..536a7471 100644
--- a/libntfs/attrib.c
+++ b/libntfs/attrib.c
@@ -23,10 +23,18 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
 #include "compat.h"
 
diff --git a/libntfs/attrlist.c b/libntfs/attrlist.c
index c63bf8fc..530a0a36 100644
--- a/libntfs/attrlist.c
+++ b/libntfs/attrlist.c
@@ -23,8 +23,12 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
 #include "types.h"
 #include "layout.h"
diff --git a/libntfs/bitmap.c b/libntfs/bitmap.c
index 6f9252d8..9bae43eb 100644
--- a/libntfs/bitmap.c
+++ b/libntfs/bitmap.c
@@ -21,10 +21,18 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
 #include "types.h"
 #include "attrib.h"
diff --git a/libntfs/bootsect.c b/libntfs/bootsect.c
index 4230bcad..e9fb56f9 100644
--- a/libntfs/bootsect.c
+++ b/libntfs/bootsect.c
@@ -22,10 +22,18 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
 #include "compat.h"
 
diff --git a/libntfs/compress.c b/libntfs/compress.c
index 17d0981c..869e8de0 100644
--- a/libntfs/compress.c
+++ b/libntfs/compress.c
@@ -23,10 +23,18 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
 #include "attrib.h"
 #include "debug.h"
diff --git a/libntfs/device.c b/libntfs/device.c
index 6439b942..83da11c3 100644
--- a/libntfs/device.c
+++ b/libntfs/device.c
@@ -21,14 +21,30 @@
 
 #include "config.h"
 
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
 #ifdef HAVE_SYS_IOCTL_H
 #	include <sys/ioctl.h>
 #endif
diff --git a/libntfs/gnome-vfs-method.c b/libntfs/gnome-vfs-method.c
index 66839e66..49def0a7 100644
--- a/libntfs/gnome-vfs-method.c
+++ b/libntfs/gnome-vfs-method.c
@@ -34,7 +34,9 @@
 #include <glib/gmessages.h>
 #include "gnome-vfs-module.h"
 #include <glib/ghash.h>
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 #include <libgnomevfs/gnome-vfs-utils.h>
 
 #include "volume.h"
diff --git a/libntfs/index.c b/libntfs/index.c
index 06cf70c1..c93b8047 100644
--- a/libntfs/index.c
+++ b/libntfs/index.c
@@ -20,7 +20,9 @@
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
 
 #include "attrib.h"
 #include "collate.h"
diff --git a/libntfs/inode.c b/libntfs/inode.c
index b59a5216..352bc127 100644
--- a/libntfs/inode.c
+++ b/libntfs/inode.c
@@ -22,9 +22,15 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
 #include "compat.h"
 
diff --git a/libntfs/lcnalloc.c b/libntfs/lcnalloc.c
index 92a9da18..807e6537 100644
--- a/libntfs/lcnalloc.c
+++ b/libntfs/lcnalloc.c
@@ -22,9 +22,15 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
 #include "types.h"
 #include "attrib.h"
diff --git a/libntfs/logfile.c b/libntfs/logfile.c
index bfd67c06..703ea296 100644
--- a/libntfs/logfile.c
+++ b/libntfs/logfile.c
@@ -20,7 +20,9 @@
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
 
 #include "attrib.h"
 #include "debug.h"
diff --git a/libntfs/mft.c b/libntfs/mft.c
index 770868a6..ce4ed5fb 100644
--- a/libntfs/mft.c
+++ b/libntfs/mft.c
@@ -22,10 +22,18 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 #include <time.h>
 
 #include "compat.h"
diff --git a/libntfs/mst.c b/libntfs/mst.c
index 9b34cd34..72587d4c 100644
--- a/libntfs/mst.c
+++ b/libntfs/mst.c
@@ -22,7 +22,9 @@
 #include "config.h"
 
 #include "mst.h"
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
 /**
  * ntfs_mst_post_read_fixup - deprotect multi sector transfer protected data
diff --git a/libntfs/runlist.c b/libntfs/runlist.c
index fe0ed0e9..a6885314 100644
--- a/libntfs/runlist.c
+++ b/libntfs/runlist.c
@@ -23,10 +23,18 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
 #include "compat.h"
 
diff --git a/libntfs/security.c b/libntfs/security.c
index d04c563e..64f228a8 100644
--- a/libntfs/security.c
+++ b/libntfs/security.c
@@ -22,10 +22,18 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
 #include "types.h"
 #include "layout.h"
diff --git a/libntfs/unistr.c b/libntfs/unistr.c
index cb46dd2e..79103627 100644
--- a/libntfs/unistr.c
+++ b/libntfs/unistr.c
@@ -21,11 +21,21 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_WCHAR_H
 #include <wchar.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
 #include "types.h"
 #include "unistr.h"
diff --git a/libntfs/unix_io.c b/libntfs/unix_io.c
index 2e8fe5a8..196d6160 100644
--- a/libntfs/unix_io.c
+++ b/libntfs/unix_io.c
@@ -21,15 +21,33 @@
 
 #include "config.h"
 
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
+#endif
 #ifdef HAVE_LINUX_FD_H
 #	include <linux/fd.h>
 #endif
diff --git a/libntfs/volume.c b/libntfs/volume.c
index 9d06d695..984a06ae 100644
--- a/libntfs/volume.c
+++ b/libntfs/volume.c
@@ -22,14 +22,30 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
 
 #include "volume.h"
 #include "attrib.h"
diff --git a/libntfs/win32_io.c b/libntfs/win32_io.c
index f6406416..50d65efb 100644
--- a/libntfs/win32_io.c
+++ b/libntfs/win32_io.c
@@ -24,13 +24,23 @@
 
 #include "config.h"
 
+#ifdef HAVE_WINDOWS_H
 #include <windows.h>
+#endif
 #include <winioctl.h>
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_CTYPE_H
 #include <ctype.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
 
 /*
  * Cannot use "../include/types.h" since it conflicts with "wintypes.h".
diff --git a/ntfsprogs/cluster.c b/ntfsprogs/cluster.c
index ce83aa0d..775151f1 100644
--- a/ntfsprogs/cluster.c
+++ b/ntfsprogs/cluster.c
@@ -23,9 +23,15 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 
 #include "cluster.h"
 #include "utils.h"
diff --git a/ntfsprogs/mkntfs.c b/ntfsprogs/mkntfs.c
index 69574b65..4097a1b4 100644
--- a/ntfsprogs/mkntfs.c
+++ b/ntfsprogs/mkntfs.c
@@ -62,16 +62,24 @@
 #ifdef HAVE_ERRNO_H
 #	include <errno.h>
 #endif
+#ifdef HAVE_TIME_H
 #include <time.h>
+#endif
 #ifdef HAVE_GETOPT_H
 #	include <getopt.h>
 #else
 	extern char *optarg;
 	extern int optind;
 #endif
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
+#endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
 #ifdef HAVE_LINUX_MAJOR_H
 #	include <linux/major.h>
 #	ifndef MAJOR
@@ -110,7 +118,9 @@
 				(M) <= SCSI_DISK7_MAJOR))
 #	endif
 #endif
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
 
 #if defined(linux) && defined(_IO) && !defined(BLKSSZGET)
 #	define BLKSSZGET _IO(0x12,104) /* Get device sector size in bytes. */
diff --git a/ntfsprogs/ntfscat.c b/ntfsprogs/ntfscat.c
index ceef7868..809b17b2 100644
--- a/ntfsprogs/ntfscat.c
+++ b/ntfsprogs/ntfscat.c
@@ -24,10 +24,18 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 
 #include "types.h"
 #include "attrib.h"
diff --git a/ntfsprogs/ntfsclone.c b/ntfsprogs/ntfsclone.c
index 190dd7c2..db40b4d4 100644
--- a/ntfsprogs/ntfsclone.c
+++ b/ntfsprogs/ntfsclone.c
@@ -15,20 +15,42 @@
 
 #include "config.h"
 
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
+#endif
 #ifdef HAVE_SYS_VFS_H
 #	include <sys/vfs.h>
 #endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
+#ifdef HAVE_STDARG_H
 #include <stdarg.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
 
 #include "debug.h"
 #include "types.h"
diff --git a/ntfsprogs/ntfscluster.c b/ntfsprogs/ntfscluster.c
index 9bc60ee9..0c7b86f1 100644
--- a/ntfsprogs/ntfscluster.c
+++ b/ntfsprogs/ntfscluster.c
@@ -23,11 +23,21 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
 
 #include "ntfscluster.h"
 #include "types.h"
diff --git a/ntfsprogs/ntfscp.c b/ntfsprogs/ntfscp.c
index 35242ba2..676ae152 100644
--- a/ntfsprogs/ntfscp.c
+++ b/ntfsprogs/ntfscp.c
@@ -24,13 +24,25 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 #include <signal.h>
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 
 #include "types.h"
 #include "attrib.h"
diff --git a/ntfsprogs/ntfsdecrypt.c b/ntfsprogs/ntfsdecrypt.c
index b1bf40cc..72ce32e6 100644
--- a/ntfsprogs/ntfsdecrypt.c
+++ b/ntfsprogs/ntfsdecrypt.c
@@ -29,17 +29,39 @@
 #error A required header file is missing. Aborting.
 #endif
 
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_GCRYPT_H
 #include <gcrypt.h>
+#endif
+#ifdef HAVE_GNUTLS_PKCS12_H
 #include <gnutls/pkcs12.h>
+#endif
 
 #include "types.h"
 #include "attrib.h"
diff --git a/ntfsprogs/ntfsdump_logfile.c b/ntfsprogs/ntfsdump_logfile.c
index b6ef6802..38d7d7ba 100644
--- a/ntfsprogs/ntfsdump_logfile.c
+++ b/ntfsprogs/ntfsdump_logfile.c
@@ -32,15 +32,33 @@
 
 #include "config.h"
 
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_STDARG_H
 #include <stdarg.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
 
 #include "types.h"
 #include "endians.h"
diff --git a/ntfsprogs/ntfsfix.c b/ntfsprogs/ntfsfix.c
index cdc99c2f..835b07d1 100644
--- a/ntfsprogs/ntfsfix.c
+++ b/ntfsprogs/ntfsfix.c
@@ -45,13 +45,27 @@
 
 #include "config.h"
 
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
 
 #include "types.h"
 #include "attrib.h"
diff --git a/ntfsprogs/ntfsinfo.c b/ntfsprogs/ntfsinfo.c
index bef1d302..f1ada6ce 100644
--- a/ntfsprogs/ntfsinfo.c
+++ b/ntfsprogs/ntfsinfo.c
@@ -46,11 +46,21 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_TIME_H
 #include <time.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>
diff --git a/ntfsprogs/ntfslabel.c b/ntfsprogs/ntfslabel.c
index c4bc7e82..e8747cb5 100644
--- a/ntfsprogs/ntfslabel.c
+++ b/ntfsprogs/ntfslabel.c
@@ -25,12 +25,24 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_LOCALE_H
 #include <locale.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
 
 #include "debug.h"
 #include "mft.h"
diff --git a/ntfsprogs/ntfsls.c b/ntfsprogs/ntfsls.c
index 230ad3b7..d5cada66 100644
--- a/ntfsprogs/ntfsls.c
+++ b/ntfsprogs/ntfsls.c
@@ -26,11 +26,21 @@
  */
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_TIME_H
 #include <time.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 
 #include "types.h"
 #include "mft.h"
diff --git a/ntfsprogs/ntfsmftalloc.c b/ntfsprogs/ntfsmftalloc.c
index 3723a309..8ecb10b2 100644
--- a/ntfsprogs/ntfsmftalloc.c
+++ b/ntfsprogs/ntfsmftalloc.c
@@ -41,13 +41,17 @@
 #ifdef HAVE_ERRNO_H
 #	include <errno.h>
 #endif
+#ifdef HAVE_TIME_H
 #include <time.h>
+#endif
 #ifdef HAVE_GETOPT_H
 #	include <getopt.h>
 #else
 	extern int optind;
 #endif
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
 #ifndef LLONG_MAX
 #	define LLONG_MAX 9223372036854775807LL
 #endif
diff --git a/ntfsprogs/ntfsmount.c b/ntfsprogs/ntfsmount.c
index 0218a03e..3a73fcd6 100644
--- a/ntfsprogs/ntfsmount.c
+++ b/ntfsprogs/ntfsmount.c
@@ -24,15 +24,31 @@
 #include "config.h"
 
 #include <fuse.h>
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_LOCALE_H
 #include <locale.h>
+#endif
 #include <signal.h>
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
 #include <getopt.h>
 #include <time.h>
 
diff --git a/ntfsprogs/ntfsmove.c b/ntfsprogs/ntfsmove.c
index be52e0ec..ab05c0e2 100644
--- a/ntfsprogs/ntfsmove.c
+++ b/ntfsprogs/ntfsmove.c
@@ -24,10 +24,18 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 
 #include "types.h"
 #include "attrib.h"
diff --git a/ntfsprogs/ntfsresize.c b/ntfsprogs/ntfsresize.c
index e97cd35c..b4dbb7bd 100644
--- a/ntfsprogs/ntfsresize.c
+++ b/ntfsprogs/ntfsresize.c
@@ -29,13 +29,27 @@
 
 #include "config.h"
 
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STDARG_H
 #include <stdarg.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
 
 #include "debug.h"
 #include "types.h"
diff --git a/ntfsprogs/ntfsrm.c b/ntfsprogs/ntfsrm.c
index 8ba0167b..68a3070f 100644
--- a/ntfsprogs/ntfsrm.c
+++ b/ntfsprogs/ntfsrm.c
@@ -21,11 +21,21 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_TIME_H
 #include <time.h>
+#endif
 
 #include "utils.h"
 #include "ntfsrm.h"
diff --git a/ntfsprogs/ntfstruncate.c b/ntfsprogs/ntfstruncate.c
index e9942f16..75663989 100644
--- a/ntfsprogs/ntfstruncate.c
+++ b/ntfsprogs/ntfstruncate.c
@@ -42,14 +42,18 @@
 #ifdef HAVE_ERRNO_H
 #	include <errno.h>
 #endif
+#ifdef HAVE_TIME_H
 #include <time.h>
+#endif
 #ifdef HAVE_GETOPT_H
 #	include <getopt.h>
 #else
 	extern char *optarg;
 	extern int optind;
 #endif
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
 #ifndef LLONG_MAX
 #	define LLONG_MAX 9223372036854775807LL
 #endif
diff --git a/ntfsprogs/ntfsundelete.c b/ntfsprogs/ntfsundelete.c
index a0d0a72b..acc12661 100644
--- a/ntfsprogs/ntfsundelete.c
+++ b/ntfsprogs/ntfsundelete.c
@@ -28,20 +28,46 @@
 #ifdef HAVE_FEATURES_H
 #	include <features.h>
 #endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
+#ifdef HAVE_TIME_H
 #include <time.h>
+#endif
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
 #include <regex.h>
+#ifdef HAVE_STDARG_H
 #include <stdarg.h>
+#endif
+#ifdef HAVE_UTIME_H
 #include <utime.h>
+#endif
 
 #include "ntfsundelete.h"
 #include "bootsect.h"
diff --git a/ntfsprogs/ntfswipe.c b/ntfsprogs/ntfswipe.c
index 0557690d..07f34e97 100644
--- a/ntfsprogs/ntfswipe.c
+++ b/ntfsprogs/ntfswipe.c
@@ -24,13 +24,27 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_STDARG_H
 #include <stdarg.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 
 #include "ntfswipe.h"
 #include "types.h"
diff --git a/ntfsprogs/upcase.c b/ntfsprogs/upcase.c
index ec02a64b..08cdb0bb 100644
--- a/ntfsprogs/upcase.c
+++ b/ntfsprogs/upcase.c
@@ -24,7 +24,9 @@
 
 #include "config.h"
 
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 
 #include "types.h"
 
diff --git a/ntfsprogs/utils.c b/ntfsprogs/utils.c
index 363cfa5c..4218fb3d 100644
--- a/ntfsprogs/utils.c
+++ b/ntfsprogs/utils.c
@@ -25,20 +25,42 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STDARG_H
 #include <stdarg.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_LOCALE_H
 #include <locale.h>
+#endif
 #ifdef HAVE_LIBINTL_H
 #	include <libintl.h>
 #endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
+#ifdef HAVE_CTYPE_H
 #include <ctype.h>
+#endif
 
 #include "config.h"
 #include "utils.h"