2 files changed, 3 insertions, 16 deletions

diff --git a/Makefile.am b/Makefile.am
index c40bb2e..f2695f1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,8 +4,9 @@ ACLOCAL_AMFLAGS = -I m4
 
 lib_LTLIBRARIES = libwinterop.la libmsi.la libpreload.la
 
-libwinterop_la_SOURCES = fake-winterop.c makecab.c readcab.c memory.c   \
-memory.h dupstr.c dupstr.h subproc.c subproc.h uchars.c uchars.h
+libwinterop_la_SOURCES = makecab.c readcab.c winterop-stubs.c           \
+memory.c memory.h dupstr.c dupstr.h subproc.c subproc.h uchars.c        \
+uchars.h
 
 libmsi_la_SOURCES = makemsi.c md5.c memory.c memory.h version.c \
 dupstr.c dupstr.h subproc.c subproc.h uchars.c uchars.h
diff --git a/fake-winterop.c b/winterop-stubs.c
index 70261e2..38792c5 100644
--- a/fake-winterop.c
+++ b/winterop-stubs.c
@@ -1,21 +1,7 @@
-#include <stdio.h>
-#include <stdlib.h>
 #include <stdint.h>
-#include <stdbool.h>
-#include <stdarg.h>
-#include <string.h>
 #include <uchar.h>
 #include <err.h>
 
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-#include "memory.h"
-#include "dupstr.h"
-#include "subproc.h"
-#include "uchars.h"
-
 uint32_t HashPublicKeyInfo(void *pCertContext,
                            void *rgbSubjectKeyIdentifier,
                            uint32_t *pcbSubjectKeyIndentifier)