9 files changed, 3 insertions, 18 deletions
diff --git a/Makefile b/Makefile
index ee5e9ca9..d7fb0717 100644
--- a/Makefile
+++ b/Makefile
@@ -68,6 +68,8 @@ $(PROGRAM): $(OBJS)
 	$(CC) $(LDFLAGS) -o $(PROGRAM) $(OBJS) $(LIBS) $(FEATURE_LIBS)
 
 FEATURE_CFLAGS = $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-D'FT2232_SPI_SUPPORT=1'")
+# Always enable serprog for now. Needs to be disabled on Windows.
+FEATURE_CFLAGS += -D'SERPROG_SUPPORT=1'
 
 FEATURE_LIBS = $(shell LC_ALL=C grep -q "FTDISUPPORT := yes" .features && printf "%s" "-lftdi")
 
diff --git a/cbtable.c b/cbtable.c
index 10fe4948..9d7e7583 100644
--- a/cbtable.c
+++ b/cbtable.c
@@ -22,11 +22,8 @@
  */
 
 #include <stdlib.h>
-#include <fcntl.h>
 #include <sys/types.h>
 #include <string.h>
-#include <errno.h>
-#include <sys/mman.h>
 #include "flash.h"
 #include "coreboot_tables.h"
 
diff --git a/chipset_enable.c b/chipset_enable.c
index 6452f823..b859be8c 100644
--- a/chipset_enable.c
+++ b/chipset_enable.c
@@ -29,7 +29,6 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <sys/mman.h>
 #include <fcntl.h>
 #include "flash.h"
 
@@ -968,7 +967,7 @@ static int get_flashbase_sc520(struct pci_dev *dev, const char *name)
 	}
 
 	/* 4. Clean up */
-	munmap(mmcr, getpagesize());
+	physunmap(mmcr, getpagesize());
 	return 0;
 }
 
diff --git a/dummyflasher.c b/dummyflasher.c
index 1b51032e..4cd96589 100644
--- a/dummyflasher.c
+++ b/dummyflasher.c
@@ -21,10 +21,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include <fcntl.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
 #include "flash.h"
 
 char *dummytype = NULL;
diff --git a/ichspi.c b/ichspi.c
index 5d2e40f6..831dd9d7 100644
--- a/ichspi.c
+++ b/ichspi.c
@@ -33,7 +33,6 @@
  */
 
 #include <string.h>
-#include <sys/mman.h>
 #include "flash.h"
 #include "spi.h"
 
diff --git a/pcidev.c b/pcidev.c
index bc8dbc7a..1de2bf57 100644
--- a/pcidev.c
+++ b/pcidev.c
@@ -20,10 +20,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <fcntl.h>
 #include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
 #include "flash.h"
 
 uint32_t io_base_addr;
diff --git a/sb600spi.c b/sb600spi.c
index 2088b08d..5f2cf980 100644
--- a/sb600spi.c
+++ b/sb600spi.c
@@ -21,7 +21,6 @@
  */
 
 #include <string.h>
-#include <sys/mman.h>
 #include "flash.h"
 #include "spi.h"
 
diff --git a/serprog.c b/serprog.c
index 81ef130a..04e15a84 100644
--- a/serprog.c
+++ b/serprog.c
@@ -39,8 +39,6 @@
 
 char *serprog_param = NULL;
 
-#define SERPROG_SUPPORT 1
-
 #if SERPROG_SUPPORT == 1
 
 #define MSGHEADER "serprog:"
diff --git a/sst49lfxxxc.c b/sst49lfxxxc.c
index 3c4405d4..848ccde2 100644
--- a/sst49lfxxxc.c
+++ b/sst49lfxxxc.c
@@ -19,9 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/mman.h>
 #include <stdlib.h>
 #include "flash.h"