further include file fixups

edit/editdraw.c

@@ -32,9 +32,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
+#include <unistd.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>

edit/editmenu.c

@@ -32,9 +32,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
+#include <unistd.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>

edit/editoptions.c

@@ -32,9 +32,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
+#include <unistd.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>

edit/editwidget.c

@@ -32,9 +32,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
+#include <unistd.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>

edit/wordproc.c

@@ -29,9 +29,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#    include <unistd.h>
-#endif
+#include <unistd.h>
 #include <string.h>
 #include <ctype.h>
 #include <errno.h>

src/fs.h

@@ -9,9 +9,7 @@
 #define MC_FS_H
 
 #include <sys/types.h>
-#ifdef HAVE_UNISTD_H
-#   include <unistd.h>
-#endif
+#include <unistd.h>
 #include <sys/stat.h>
 
 
@@ -54,30 +52,9 @@
 #endif
 
 /* unistd.h defines _POSIX_VERSION on POSIX.1 systems. */
-#ifdef HAVE_DIRENT_H
-#   include <dirent.h>
-#   define NLENGTH(dirent) (strlen ((dirent)->d_name))
-#   define DIRENT_LENGTH_COMPUTED 1
-#elif defined(_MSC_VER)
-/* dirent provided by glib */
-#   define NLENGTH(dirent) (strlen ((dirent)->d_name))
-#   define DIRENT_LENGTH_COMPUTED 1
-#else
-#   define dirent direct
-#   define NLENGTH(dirent) ((dirent)->d_namlen)
-
-#   ifdef HAVE_SYS_NDIR_H
-#       include <sys/ndir.h>
-#   endif /* HAVE_SYS_NDIR_H */
-
-#   ifdef HAVE_SYS_DIR_H
-#       include <sys/dir.h>
-#   endif /* HAVE_SYS_DIR_H */
-
-#   ifdef HAVE_NDIR_H
-#       include <ndir.h>
-#   endif /* HAVE_NDIR_H */
-#endif /* not (HAVE_DIRENT_H or _POSIX_VERSION) */
+#include <dirent.h>
+#define NLENGTH(dirent) (strlen ((dirent)->d_name))
+#define DIRENT_LENGTH_COMPUTED 1
 
 static inline void
 compute_namelen (struct dirent *dent __attribute__ ((unused)))

src/global.h

@@ -9,8 +9,6 @@
 #ifndef MC_GLOBAL_H
 #define MC_GLOBAL_H
 
-#include <stdlib.h>	/* for free() and other useful routins */
-
 #if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
 #  include <string.h>
    /* An ANSI string.h and pre-ANSI memory.h might conflict */
@@ -27,10 +25,6 @@
 #  include <sys/param.h>
 #endif
 
-#ifdef HAVE_FCNTL_H
-#  include <fcntl.h>
-#endif
-
 /* The O_BINARY definition was taken from gettext */
 #if !defined O_BINARY && defined _O_BINARY
   /* For MSC-compatible compilers.  */
@@ -45,7 +39,6 @@
 #  define O_BINARY 0
 #endif
 
-
 /* Replacement for O_NONBLOCK */
 #ifndef O_NONBLOCK
 #ifdef O_NDELAY /* SYSV */
@@ -55,51 +48,10 @@
 #endif /* !O_NDELAY */
 #endif /* !O_NONBLOCK */
 
-
-#ifdef HAVE_SYS_TIMEB_H
-#  include <sys/timeb.h>
-#endif
-
-#ifdef TIME_WITH_SYS_TIME
-#  include <sys/time.h>
-#  include <time.h>
-#else
-#  ifdef HAVE_SYS_TIME_H
-#    include <sys/time.h>
-#  else
-#    include <time.h>
-#  endif
-#endif
-
-#if !defined(HAVE_SYS_TIME_H)
-struct timeval {
-    long int tv_sec;  /* seconds */
-    long int tv_usec; /* microseconds */
-};
-#endif /* !HAVE_SYS_TIME_H */
-
-#ifdef HAVE_UTIME_H
-#  include <utime.h>
-#elif defined(HAVE_SYS_UTIME_H)
-#  include <sys/utime.h>
-#endif
-
-#ifdef HAVE_SYS_WAIT_H
-#  include <sys/wait.h>
-#endif
-
 #ifdef HAVE_SYS_SELECT_H
 #  include <sys/select.h>
 #endif
 
-#ifdef HAVE_GRP_H
-#  include <grp.h>
-#endif
-
-#ifdef HAVE_PWD_H
-#  include <pwd.h>
-#endif
-
 #if defined(__QNX__) && !defined(__QNXNTO__)
 /* exec*() from <process.h> */
 #  include <unix.h>

src/popt.c

@@ -17,9 +17,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-#endif
+#include <unistd.h>
 
 #include "global.h"
 #include "findme.h"

vfs/samba/include/includes.h

@@ -46,37 +46,25 @@
 #endif
 
 #include <sys/types.h>
-
-#ifdef TIME_WITH_SYS_TIME
+#include <fcntl.h>
+#include <sys/stat.h>
 #include <sys/time.h>
 #include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#endif
+#include <unistd.h>
+#include <stdio.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <signal.h>
+#include <sys/wait.h>
 
 #ifdef HAVE_SYS_RESOURCE_H
 #include <sys/resource.h>
 #endif
 
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#include <stdio.h>
-#include <stddef.h>
-
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
 
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
@@ -107,16 +95,6 @@
 #endif
 #endif
 
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#else
-#ifdef HAVE_SYS_FCNTL_H
-#include <sys/fcntl.h>
-#endif
-#endif
-
-#include <sys/stat.h>
-
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
@@ -129,11 +107,7 @@
 #include <sys/filio.h>
 #endif
 
-#include <signal.h>
 
-#ifdef HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
 #ifdef HAVE_CTYPE_H
 #include <ctype.h>
 #endif
@@ -210,22 +184,7 @@
 #include <sys/termio.h>
 #endif
 
-#if HAVE_DIRENT_H
 # include <dirent.h>
-# define NAMLEN(dirent) strlen((dirent)->d_name)
-#else
-# define dirent direct
-# define NAMLEN(dirent) (dirent)->d_namlen
-# if HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif
-# if HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif
-# if HAVE_NDIR_H
-#  include <ndir.h>
-# endif
-#endif
 
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>

vfs/samba/lib/netmask.c

@@ -237,9 +237,7 @@ this should cover most of the rest of systems
 #elif defined(HAVE_NETMASK_AIX)
 
 #include <stdio.h>
-#ifdef	HAVE_UNISTD_H
 #include <unistd.h>	/* close() declaration for gcc in fussy mode */
-#endif
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>