diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e48adbda..42f81a772 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,22 +60,20 @@ IF (THREADSAFE)
 ENDIF()
 
 # Collect sourcefiles
-FILE(GLOB SRC src/*.c src/backends/*.c)
+FILE(GLOB SRC src/*.c)
 FILE(GLOB SRC_ZLIB deps/zlib/*.c)
-FILE(GLOB SRC_SHA1 src/block-sha1/*.c)
-FILE(GLOB SRC_PLAT src/unix/*.c)
 FILE(GLOB SRC_H include/git2/*.h)
 
 # On Windows use specific platform sources
 IF (WIN32 AND NOT CYGWIN)
     ADD_DEFINITIONS(-DWIN32 -D_DEBUG -D_LIB)
-    FILE(GLOB SRC_PLAT src/win32/*.c)
+	FILE(GLOB SRC src/*.c src/win32/*.c)
 ENDIF ()
 
 ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64)
 
 # Compile and link libgit2
-ADD_LIBRARY(git2 ${SRC} ${SRC_PLAT} ${SRC_SHA1} ${SRC_ZLIB})
+ADD_LIBRARY(git2 ${SRC} ${SRC_ZLIB})
 TARGET_LINK_LIBRARIES(git2 ${CMAKE_THREAD_LIBS_INIT})
 SET_TARGET_PROPERTIES(git2 PROPERTIES VERSION ${LIBGIT2_VERSION_STRING})
 SET_TARGET_PROPERTIES(git2 PROPERTIES SOVERSION ${LIBGIT2_VERSION_MAJOR})
@@ -97,7 +95,7 @@ IF (BUILD_TESTS)
     INCLUDE_DIRECTORIES(tests)
 	FILE(GLOB SRC_TEST tests/t??-*.c)
 
-	ADD_EXECUTABLE(libgit2_test tests/test_main.c tests/test_lib.c tests/test_helpers.c ${SRC} ${SRC_PLAT} ${SRC_SHA1} ${SRC_TEST} ${SRC_ZLIB})
+	ADD_EXECUTABLE(libgit2_test tests/test_main.c tests/test_lib.c tests/test_helpers.c ${SRC} ${SRC_TEST} ${SRC_ZLIB})
 	TARGET_LINK_LIBRARIES(libgit2_test ${CMAKE_THREAD_LIBS_INIT})
 
 	ENABLE_TESTING()
diff --git a/src/hash.c b/src/hash.c
index 775e4b4c1..b8b311bcb 100644
--- a/src/hash.c
+++ b/src/hash.c
@@ -28,10 +28,8 @@
 
 #if defined(PPC_SHA1)
 # include "ppc/sha1.h"
-#elif defined(OPENSSL_SHA1)
-# include <openssl/sha.h>
 #else
-# include "block-sha1/sha1.h"
+# include "sha1.h"
 #endif
 
 struct git_hash_ctx {
diff --git a/src/unix/map.c b/src/map_posix.c
similarity index 96%
rename from src/unix/map.c
rename to src/map_posix.c
index 9bc6178ed..1f50bcf2e 100644
--- a/src/unix/map.c
+++ b/src/map_posix.c
@@ -1,9 +1,11 @@
+#include <git2/common.h>
+
+#ifndef GIT_WIN32
 
 #include "map.h"
 #include <sys/mman.h>
 #include <errno.h>
 
-
 int git__mmap(git_map *out, size_t len, int prot, int flags, int fd, git_off_t offset)
 {
 	int mprot = 0;
@@ -58,4 +60,5 @@ int git__munmap(git_map *map)
 	return GIT_SUCCESS;
 }
 
+#endif
 
diff --git a/src/block-sha1/sha1.c b/src/sha1.c
similarity index 100%
rename from src/block-sha1/sha1.c
rename to src/sha1.c
diff --git a/src/block-sha1/sha1.h b/src/sha1.h
similarity index 100%
rename from src/block-sha1/sha1.h
rename to src/sha1.h