diff --git a/3rdparty/pthreads/dll/x64/pthreadGC2.dll b/3rdparty/pthreads/bin/pthreadGC2.dll
similarity index 100%
rename from 3rdparty/pthreads/dll/x64/pthreadGC2.dll
rename to 3rdparty/pthreads/bin/pthreadGC2.dll
diff --git a/3rdparty/pthreads/dll/x64/pthreadVC2.dll b/3rdparty/pthreads/bin/pthreadVC2.dll
similarity index 100%
rename from 3rdparty/pthreads/dll/x64/pthreadVC2.dll
rename to 3rdparty/pthreads/bin/pthreadVC2.dll
diff --git a/3rdparty/pthreads/dll/x86/pthreadGC2.dll b/3rdparty/pthreads/dll/x86/pthreadGC2.dll
deleted file mode 100644
index 67b9289dfd9..00000000000
Binary files a/3rdparty/pthreads/dll/x86/pthreadGC2.dll and /dev/null differ
diff --git a/3rdparty/pthreads/dll/x86/pthreadGCE2.dll b/3rdparty/pthreads/dll/x86/pthreadGCE2.dll
deleted file mode 100644
index 9e18ea24b8b..00000000000
Binary files a/3rdparty/pthreads/dll/x86/pthreadGCE2.dll and /dev/null differ
diff --git a/3rdparty/pthreads/dll/x86/pthreadVC2.dll b/3rdparty/pthreads/dll/x86/pthreadVC2.dll
deleted file mode 100644
index fcb5d9dcc1c..00000000000
Binary files a/3rdparty/pthreads/dll/x86/pthreadVC2.dll and /dev/null differ
diff --git a/3rdparty/pthreads/dll/x86/pthreadVCE2.dll b/3rdparty/pthreads/dll/x86/pthreadVCE2.dll
deleted file mode 100644
index 9d148cc0dae..00000000000
Binary files a/3rdparty/pthreads/dll/x86/pthreadVCE2.dll and /dev/null differ
diff --git a/3rdparty/pthreads/dll/x86/pthreadVSE2.dll b/3rdparty/pthreads/dll/x86/pthreadVSE2.dll
deleted file mode 100644
index 8129116fd41..00000000000
Binary files a/3rdparty/pthreads/dll/x86/pthreadVSE2.dll and /dev/null differ
diff --git a/3rdparty/pthreads/lib/x64/libpthreadGC2.a b/3rdparty/pthreads/lib/libpthreadGC2.a
similarity index 100%
rename from 3rdparty/pthreads/lib/x64/libpthreadGC2.a
rename to 3rdparty/pthreads/lib/libpthreadGC2.a
diff --git a/3rdparty/pthreads/lib/x64/pthreadVC2.lib b/3rdparty/pthreads/lib/pthreadVC2.lib
similarity index 100%
rename from 3rdparty/pthreads/lib/x64/pthreadVC2.lib
rename to 3rdparty/pthreads/lib/pthreadVC2.lib
diff --git a/3rdparty/pthreads/lib/x86/libpthreadGC2.a b/3rdparty/pthreads/lib/x86/libpthreadGC2.a
deleted file mode 100644
index df211759f80..00000000000
Binary files a/3rdparty/pthreads/lib/x86/libpthreadGC2.a and /dev/null differ
diff --git a/3rdparty/pthreads/lib/x86/libpthreadGCE2.a b/3rdparty/pthreads/lib/x86/libpthreadGCE2.a
deleted file mode 100644
index 9c56202c582..00000000000
Binary files a/3rdparty/pthreads/lib/x86/libpthreadGCE2.a and /dev/null differ
diff --git a/3rdparty/pthreads/lib/x86/pthreadVC2.lib b/3rdparty/pthreads/lib/x86/pthreadVC2.lib
deleted file mode 100644
index c20ee200db3..00000000000
Binary files a/3rdparty/pthreads/lib/x86/pthreadVC2.lib and /dev/null differ
diff --git a/3rdparty/pthreads/lib/x86/pthreadVCE2.lib b/3rdparty/pthreads/lib/x86/pthreadVCE2.lib
deleted file mode 100644
index 7f05317ba28..00000000000
Binary files a/3rdparty/pthreads/lib/x86/pthreadVCE2.lib and /dev/null differ
diff --git a/3rdparty/pthreads/lib/x86/pthreadVSE2.lib b/3rdparty/pthreads/lib/x86/pthreadVSE2.lib
deleted file mode 100644
index 3f3335d4698..00000000000
Binary files a/3rdparty/pthreads/lib/x86/pthreadVSE2.lib and /dev/null differ
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c6c38a612a..d902e82fee4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,7 +76,7 @@ if(USE_INTEGRATED_LIBS)
   set(PThreads_windows_DIR ${CMAKE_CURRENT_LIST_DIR}/3rdparty/pthreads CACHE PATH "Path where pthreads for windows can be located")
   add_definitions(-D_TIMESPEC_DEFINED)
 endif()
-set(Stb_DIR ${CMAKE_CURRENT_LIST_DIR}/3rdparty/stb/include CACHE PATH "Path where Stb image library can be located")
+set(Stb_DIR ${CMAKE_CURRENT_LIST_DIR}/3rdparty/stb CACHE PATH "Path where Stb image library can be located")
 
 set(CMAKE_DEBUG_POSTFIX d)
 add_definitions(-DUSE_CMAKE_LIBS)
diff --git a/cmake/Modules/FindPThreads_windows.cmake b/cmake/Modules/FindPThreads_windows.cmake
index 2012cd1d463..29c10941fca 100644
--- a/cmake/Modules/FindPThreads_windows.cmake
+++ b/cmake/Modules/FindPThreads_windows.cmake
@@ -26,13 +26,13 @@ include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
 include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake)
 
 if(NOT PThreads_windows_INCLUDE_DIR)
-  find_path(PThreads_windows_INCLUDE_DIR NAMES pthread.h)
+  find_path(PThreads_windows_INCLUDE_DIR NAMES pthread.h PATHS ${PThreads_windows_DIR} PATH_SUFFIXES include)
 endif()
 
 # Allow libraries to be set manually
 if(NOT PThreads_windows_LIBRARY)
-  find_library(PThreads_windows_LIBRARY_RELEASE NAMES pthreadsVC2 pthreadVC2)
-  find_library(PThreads_windows_LIBRARY_DEBUG NAMES pthreadsVC2d pthreadVC2d)
+  find_library(PThreads_windows_LIBRARY_RELEASE NAMES pthreadsVC2 pthreadVC2 PATHS ${PThreads_windows_DIR} PATH_SUFFIXES lib)
+  find_library(PThreads_windows_LIBRARY_DEBUG NAMES pthreadsVC2d pthreadVC2d PATHS ${PThreads_windows_DIR} PATH_SUFFIXES lib)
   select_library_configurations(PThreads_windows)
 endif()
 
diff --git a/cmake/Modules/FindStb.cmake b/cmake/Modules/FindStb.cmake
index 33ec81da632..1db213a6578 100755
--- a/cmake/Modules/FindStb.cmake
+++ b/cmake/Modules/FindStb.cmake
@@ -23,7 +23,7 @@ include(${CMAKE_ROOT}/Modules/FindPackageHandleStandardArgs.cmake)
 include(${CMAKE_ROOT}/Modules/SelectLibraryConfigurations.cmake)
 
 if(NOT Stb_INCLUDE_DIR)
-  find_path(Stb_INCLUDE_DIR NAMES stb_image.h PATHS ${Stb_DIR})
+  find_path(Stb_INCLUDE_DIR NAMES stb_image.h PATHS ${Stb_DIR} PATH_SUFFIXES include)
 endif()
 
 find_package_handle_standard_args(Stb DEFAULT_MSG Stb_INCLUDE_DIR)