Minimized includes in windows.h and linux.h

- Removed unneeded includes.
- Added gethostname support to nvme/unistd.h

Author: bgoing-micron-oss

libnvme/src/nvme/unistd.h

@@ -17,6 +17,9 @@
 
 #if defined(_WIN32) || defined(_WIN64)
 
+#define WIN32_LEAN_AND_MEAN	/* keeps windows.h from including winsock.*/
+#include <winsock2.h>	/* for gethostname */
+
 #include <sysinfoapi.h>
 
 /* unistd.h POSIX compatibility */

libnvme/src/nvme/util.c

@@ -33,6 +33,8 @@
 #include <ccan/endian/endian.h>
 #include <ccan/minmax/minmax.h>
 
+#include <nvme/unistd.h>
+
 #include <libnvme.h>
 
 #include "cleanup.h"

libnvme/src/platform/linux.h

@@ -8,29 +8,6 @@
 
 #pragma once
 
-/* Linux-specific includes */
-#include <dirent.h>
-#include <endian.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <poll.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <syslog.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/param.h>
-#include <sys/socket.h>
-#include <sys/stat.h>
-#include <sys/uio.h>
-
-#include <arpa/inet.h>
-#include <ifaddrs.h>
-#include <netdb.h>
-#include <netinet/in.h>
-
-
 typedef int libnvme_fd_t;
 #define TEST_FD 0xFD
 #define INIT_FD -1

libnvme/src/platform/windows.h

@@ -8,23 +8,12 @@
 
 #pragma once
 
-/* Windows-specific includes - winsock2 before windows.h to avoid warnings */
-#define WIN32_LEAN_AND_MEAN
-#include <winsock2.h>
-#include <ws2tcpip.h>
+/* Windows-specific includes */
+#define WIN32_LEAN_AND_MEAN	/* keeps windows.h from including winsock.*/
 #include <windows.h>
-#undef WIN32_LEAN_AND_MEAN
 
-#include <bcrypt.h>
-#include <direct.h>
-#include <errno.h>
 #include <fcntl.h>
-#include <io.h>
-#include <process.h>
-#include <signal.h>
 #include <stdio.h>
-#include <sys/stat.h>
-#include <time.h>
 
 
 /* Platform compatibility helper types and methods */