diff --git a/atahpt.c b/atahpt.c
index 35044074f..f1e129648 100644
--- a/atahpt.c
+++ b/atahpt.c
@@ -20,7 +20,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
 #include "flash.h"
 #include "programmer.h"
 
diff --git a/bitbang_spi.c b/bitbang_spi.c
index fe85b6091..fb404acc2 100644
--- a/bitbang_spi.c
+++ b/bitbang_spi.c
@@ -18,7 +18,6 @@
  */
 
 #include <stdio.h>
-#include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/buspirate_spi.c b/buspirate_spi.c
index 9890d4829..d24f890b7 100644
--- a/buspirate_spi.c
+++ b/buspirate_spi.c
@@ -18,7 +18,6 @@
  */
 
 #include <stdio.h>
-#include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/cbtable.c b/cbtable.c
index 9aa9e84c8..2b02e719d 100644
--- a/cbtable.c
+++ b/cbtable.c
@@ -25,7 +25,6 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <sys/types.h>
 #include <string.h>
 #include "flash.h"
 #include "programmer.h"
diff --git a/chipset_enable.c b/chipset_enable.c
index 58bddaa50..9967070ff 100644
--- a/chipset_enable.c
+++ b/chipset_enable.c
@@ -29,7 +29,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
 #include <unistd.h>
 #include "flash.h"
 #include "programmer.h"
diff --git a/cli_classic.c b/cli_classic.c
index 09504d7fb..979a82209 100644
--- a/cli_classic.c
+++ b/cli_classic.c
@@ -23,7 +23,6 @@
 
 #include <stdio.h>
 #include <fcntl.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/dummyflasher.c b/dummyflasher.c
index a356d514c..9b8bb5393 100644
--- a/dummyflasher.c
+++ b/dummyflasher.c
@@ -21,7 +21,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include <sys/types.h>
 #include "flash.h"
 #include "chipdrivers.h"
 #include "programmer.h"
diff --git a/ft2232_spi.c b/ft2232_spi.c
index 30eff4285..9c6b017bc 100644
--- a/ft2232_spi.c
+++ b/ft2232_spi.c
@@ -21,7 +21,6 @@
 #if CONFIG_FT2232_SPI == 1
 
 #include <stdio.h>
-#include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
diff --git a/gfxnvidia.c b/gfxnvidia.c
index b0bf79b96..782538085 100644
--- a/gfxnvidia.c
+++ b/gfxnvidia.c
@@ -20,7 +20,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
 #include "flash.h"
 #include "programmer.h"
 
diff --git a/hwaccess.h b/hwaccess.h
index 45629d248..9bf37f253 100644
--- a/hwaccess.h
+++ b/hwaccess.h
@@ -252,7 +252,6 @@ cpu_to_be(64)
       #define iopl amd64_iopl
     #endif
 #endif
-  #include <stdint.h>
 
 static inline void outb(uint8_t value, uint16_t port)
 {
diff --git a/internal.c b/internal.c
index b9b5a4bf8..c96db9904 100644
--- a/internal.c
+++ b/internal.c
@@ -18,10 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
-#include <sys/types.h>
 #include "flash.h"
 #include "programmer.h"
 
diff --git a/mcp6x_spi.c b/mcp6x_spi.c
index 97c0a1c57..0e0d311f1 100644
--- a/mcp6x_spi.c
+++ b/mcp6x_spi.c
@@ -25,7 +25,6 @@
 
 #if defined(__i386__) || defined(__x86_64__)
 
-#include <stdint.h>
 #include <stdlib.h>
 #include <ctype.h>
 #include "flash.h"
diff --git a/pcidev.c b/pcidev.c
index f7048e7dc..6fc4e4568 100644
--- a/pcidev.c
+++ b/pcidev.c
@@ -20,7 +20,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <sys/types.h>
 #include "flash.h"
 #include "programmer.h"
 
diff --git a/physmap.c b/physmap.c
index d5948aee2..4641e8ec3 100644
--- a/physmap.c
+++ b/physmap.c
@@ -22,7 +22,6 @@
 
 #include <unistd.h>
 #include <stdio.h>
-#include <sys/types.h>
 #include <stdlib.h>
 #include <string.h>
 #include "flash.h"
@@ -135,8 +134,6 @@ void cleanup_cpu_msr(void)
 }
 #elif defined(__DARWIN__)
 
-#include <DirectIO/darwinio.h>
-
 #define MEM_DEV "DirectIO"
 
 static void *sys_physmap(unsigned long phys_addr, size_t len)
diff --git a/serial.c b/serial.c
index 9957fb462..053b09a33 100644
--- a/serial.c
+++ b/serial.c
@@ -25,7 +25,6 @@
 #include <string.h>
 #include <ctype.h>
 #include <fcntl.h>
-#include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <inttypes.h>
diff --git a/serprog.c b/serprog.c
index 8354f54ab..2cdfea66c 100644
--- a/serprog.c
+++ b/serprog.c
@@ -25,7 +25,6 @@
 #include <string.h>
 #include <ctype.h>
 #include <fcntl.h>
-#include <sys/types.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>