4 files changed, 5 insertions, 6 deletions

diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
index 08bce42..6213aeb 100644
--- a/apps/CMakeLists.txt
+++ b/apps/CMakeLists.txt
@@ -2,7 +2,6 @@ include_directories(
         .
         ../include
         ../include/compat
-        ./openssl
 )
 
 set(
@@ -63,8 +62,8 @@ if(CMAKE_HOST_UNIX)
 endif()
 
 if(CMAKE_HOST_WIN32)
-        set(OPENSSL_SRC ${OPENSSL_SRC} openssl/compat/apps_win.c)
-        set(OPENSSL_SRC ${OPENSSL_SRC} openssl/compat/certhash_win.c)
+        set(OPENSSL_SRC ${OPENSSL_SRC} openssl/apps_win.c)
+        set(OPENSSL_SRC ${OPENSSL_SRC} openssl/certhash_win.c)
         set(OPENSSL_SRC ${OPENSSL_SRC} openssl/compat/poll_win.c)
 endif()
 
diff --git a/apps/openssl/Makefile.am b/apps/openssl/Makefile.am
index 5a8d458..6ec3d62 100644
--- a/apps/openssl/Makefile.am
+++ b/apps/openssl/Makefile.am
@@ -60,11 +60,11 @@ openssl_SOURCES += x509.c
 if BUILD_CERTHASH
 openssl_SOURCES += certhash.c
 else
-openssl_SOURCES += compat/certhash_win.c
+openssl_SOURCES += certhash_win.c
 endif
 
 if HOST_WIN
-openssl_SOURCES += compat/apps_win.c
+openssl_SOURCES += apps_win.c
 else
 openssl_SOURCES += apps_posix.c
 endif
diff --git a/apps/openssl/compat/apps_win.c b/apps/openssl/apps_win.c
index bc999f6..37bfcc9 100644
--- a/apps/openssl/compat/apps_win.c
+++ b/apps/openssl/apps_win.c
@@ -10,7 +10,7 @@
 #include <io.h>
 #include <fcntl.h>
 
-#include <apps.h>
+#include "apps.h"
 
 double
 app_tminterval(int stop, int usertime)
diff --git a/apps/openssl/compat/certhash_win.c b/apps/openssl/certhash_win.c
index be57e2a..be57e2a 100644
--- a/apps/openssl/compat/certhash_win.c
+++ b/apps/openssl/certhash_win.c