From dbd439fa2cbda41abbc2edc8d03c8a03a00710b8 Mon Sep 17 00:00:00 2001
From: Pete Batard <pbatard@gmail.com>
Date: Wed, 24 Feb 2010 22:05:40 +0000
Subject: includes simplification and cleanup (core)

---
 examples/lsusb.c    | 1 -
 examples/xusb.c     | 2 --
 libusb/core.c       | 4 +---
 libusb/descriptor.c | 2 +-
 libusb/io.c         | 8 ++------
 libusb/libusb.h     | 4 ++--
 libusb/libusbi.h    | 1 -
 libusb/sync.c       | 3 +--
 8 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/examples/lsusb.c b/examples/lsusb.c
index 58d58fe..c6561f9 100644
--- a/examples/lsusb.c
+++ b/examples/lsusb.c
@@ -18,7 +18,6 @@
  */
 
 #include <stdio.h>
-#include <sys/types.h>
 
 #include <libusb/libusb.h>
 
diff --git a/examples/xusb.c b/examples/xusb.c
index 74735ef..5000059 100644
--- a/examples/xusb.c
+++ b/examples/xusb.c
@@ -24,7 +24,6 @@
 
 #include <config.h>
 #include <stdio.h>
-#include <sys/types.h>
 #include <inttypes.h>
 #include <stdlib.h>
 #include <string.h>
@@ -33,7 +32,6 @@
 #include <libusb/libusb.h>
 
 #ifdef OS_WINDOWS
-#include <windows.h>
 #define msleep(msecs) Sleep(msecs)
 #else
 #include <unistd.h>
diff --git a/libusb/core.c b/libusb/core.c
index e45aba1..2daa0c3 100644
--- a/libusb/core.c
+++ b/libusb/core.c
@@ -24,13 +24,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
 #ifndef OS_WINDOWS
 #include "os/unistd_posix.h"
 #endif
 
-#include "libusb.h"
-#include "libusbi.h"
+#include <libusbi.h>
 
 #if defined(OS_LINUX)
 const struct usbi_os_backend * const usbi_backend = &linux_usbfs_backend;
diff --git a/libusb/descriptor.c b/libusb/descriptor.c
index da4dbbe..b66d2b3 100644
--- a/libusb/descriptor.c
+++ b/libusb/descriptor.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "libusbi.h"
+#include <libusbi.h>
 
 #define DESC_HEADER_LENGTH		2
 #define DEVICE_DESC_LENGTH		18
diff --git a/libusb/io.c b/libusb/io.c
index 98dd4b2..894d514 100644
--- a/libusb/io.c
+++ b/libusb/io.c
@@ -21,13 +21,9 @@
 #include <config.h>
 #include <errno.h>
 #include <signal.h>
-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
-#if !defined(_MSC_VER)
-#include <sys/time.h>
-#endif
-#include <time.h>
+
 #ifndef OS_WINDOWS
 #include "os/unistd_posix.h"
 #endif
@@ -36,7 +32,7 @@
 #include <sys/timerfd.h>
 #endif
 
-#include "libusbi.h"
+#include <libusbi.h>
 
 /**
  * \page io Synchronous and asynchronous device I/O
diff --git a/libusb/libusb.h b/libusb/libusb.h
index 0127d9f..62ee63c 100644
--- a/libusb/libusb.h
+++ b/libusb/libusb.h
@@ -22,14 +22,14 @@
 #define __LIBUSB_H__
 
 #include <stdint.h>
+#include <limits.h>
+#include <time.h>
 #ifdef _MSC_VER
 #define inline __inline
 #else
 #include <sys/time.h>
 #endif
 #include <sys/types.h>
-#include <time.h>
-#include <limits.h>
 
 /* 'interface' might be defined as a macro on Windows, so we need to
  * undefine it so as not to break the current libusb API, because 
diff --git a/libusb/libusbi.h b/libusb/libusbi.h
index 3dfcfd0..33b642c 100644
--- a/libusb/libusbi.h
+++ b/libusb/libusbi.h
@@ -23,7 +23,6 @@
 
 #include <config.h>
 #include <stddef.h>
-#include <time.h>
 #if !defined(OS_WINDOWS) || defined(__CYGWIN__)
 #include <poll.h>
 #endif
diff --git a/libusb/sync.c b/libusb/sync.c
index bd4d970..e43b18e 100644
--- a/libusb/sync.c
+++ b/libusb/sync.c
@@ -19,11 +19,10 @@
 
 #include <config.h>
 #include <errno.h>
-#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "libusbi.h"
+#include <libusbi.h>
 
 /**
  * @defgroup syncio Synchronous device I/O
-- 
cgit v1.2.1