X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=h%2Fnmh.h;h=19549e43e5e597324f82cf69d478511f6828a922;hp=896786f54cbf0d8ed82e04340e8b3bc07837259c;hb=768b5edd9623b7238e12ec8dfc409b82a1ed9e2d;hpb=b6fbaae87d9cf00b74d94050c10ba3e700545178

diff --git a/h/nmh.h b/h/nmh.h
index 896786f..19549e4 100644
--- a/h/nmh.h
+++ b/h/nmh.h
@@ -4,11 +4,7 @@
 
 #include <config.h>
 
-#ifdef HAVE_UNISTD_H
-# include <sys/types.h>
-# include <unistd.h>
-#endif
-
+#include <unistd.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <sys/stat.h>
@@ -30,34 +26,16 @@
 # endif
 #endif
 
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
-
+#include <stdlib.h>
 #include <stdarg.h>
-
-#if STDC_HEADERS || HAVE_STRING_H
-# include <string.h>
-/* An ANSI string.h and pre-ANSI memory.h might conflict.  */
-# if !STDC_HEADERS && HAVE_MEMORY_H
-#  include <memory.h>
-# endif /* not STDC_HEADERS and HAVE_MEMORY_H */
-#else   /* not STDC_HEADERS and not HAVE_STRING_H */
-# include <strings.h>
-/* memory.h and strings.h conflict on some systems.  */
-#endif /* not STDC_HEADERS and not HAVE_STRING_H */
+#include <string.h>
 
 #ifdef HAVE_SYS_PARAM_H
 # include <sys/param.h>
 #endif
 
-#ifdef HAVE_LOCALE_H
-# include <locale.h>
-#endif
-
-#ifdef HAVE_LIMITS_H
-# include <limits.h>
-#endif
+#include <locale.h>
+#include <limits.h>
 
 /*
 ** symbolic constants for lseek and fseek