diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5511d5a..88e6880 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,20 +8,7 @@ cmake_policy(SET CMP0057 NEW)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
     ${CMAKE_SOURCE_DIR}/CMakeModules)
 
-if (CMAKE_CONFIGURATION_TYPES)
-  set(CMAKE_CONFIGURATION_TYPES Debug Release)
-endif (CMAKE_CONFIGURATION_TYPES)
-
-#
-# Required packages
-find_package(Git REQUIRED)
-find_package(DepotTools REQUIRED)
-
-if (WIN32)
-  set(PYTHON_EXECUTABLE ${DEPOTTOOLS_PATH}/python.bat)
-else (WIN32)
-  find_package(PythonInterp 2.7 REQUIRED)
-endif (WIN32)
+include(FindLibraries)
 
 #
 # Set the project's version
diff --git a/CMakeModules/FindLibraries.cmake b/CMakeModules/FindLibraries.cmake
new file mode 100644
index 0000000..9b2bdb6
--- /dev/null
+++ b/CMakeModules/FindLibraries.cmake
@@ -0,0 +1,32 @@
+#
+# Find required packages
+
+find_package(Git REQUIRED)
+find_package(DepotTools REQUIRED)
+find_package(PythonInterp REQUIRED)
+
+set(THREADS_PREFER_PTHREAD_FLAG ON)
+find_package(Threads REQUIRED)
+
+list(APPEND LIBWEBRTC_LIBRARIES Threads::Threads)
+
+if (UNIX AND NOT APPLE)
+  find_package(X11 REQUIRED)
+  list(APPEND LIBWEBRTC_LIBRARIES ${X11_LIBRARIES} ${CMAKE_DL_LIBS})
+endif (UNIX AND NOT APPLE)
+
+if (APPLE)
+  find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
+  find_library(COREAUDIO_LIBRARY CoreAudio)
+  find_library(COREFOUNDATION_LIBRARY CoreFoundation)
+  find_library(COREGRAPHICS_LIBRARY CoreGraphics)
+  find_library(FOUNDATION_LIBRARY Foundation)
+
+  list(APPEND LIBWEBRTC_LIBRARIES ${AUDIOTOOLBOX_LIBRARY} ${COREAUDIO_LIBRARY}
+       ${COREFOUNDATION_LIBRARY} ${COREGRAPHICS_LIBRARY} ${FOUNDATION_LIBRARY})
+endif (APPLE)
+
+if (WIN32)
+  list(APPEND LIBWEBRTC_LIBRARIES msdmo.lib wmcodecdspuuid.lib dmoguids.lib
+       ole32.lib secur32.lib)
+endif (WIN32)
diff --git a/CMakeModules/UseLibWebRTC.cmake b/CMakeModules/UseLibWebRTC.cmake
index 3b7cda2..28d83ac 100644
--- a/CMakeModules/UseLibWebRTC.cmake
+++ b/CMakeModules/UseLibWebRTC.cmake
@@ -12,32 +12,6 @@ set(LIBWEBRTC_USE_FILE_INCLUDED 1)
 # Update CMAKE_MODULE_PATH so includes work.
 list(APPEND CMAKE_MODULE_PATH ${LIBWEBRTC_CMAKE_DIR})
 
-set(THREADS_PREFER_PTHREAD_FLAG ON)
-find_package(Threads REQUIRED)
-
-list(APPEND LIBWEBRTC_LIBRARIES Threads::Threads)
-
-if (UNIX AND NOT APPLE)
-  find_package(X11 REQUIRED)
-  list(APPEND LIBWEBRTC_LIBRARIES ${X11_LIBRARIES} ${CMAKE_DL_LIBS})
-endif (UNIX AND NOT APPLE)
-
-if (APPLE)
-  find_library(AUDIOTOOLBOX_LIBRARY AudioToolbox)
-  find_library(COREAUDIO_LIBRARY CoreAudio)
-  find_library(COREFOUNDATION_LIBRARY CoreFoundation)
-  find_library(COREGRAPHICS_LIBRARY CoreGraphics)
-  find_library(FOUNDATION_LIBRARY Foundation)
-
-  list(APPEND LIBWEBRTC_LIBRARIES ${AUDIOTOOLBOX_LIBRARY} ${COREAUDIO_LIBRARY}
-       ${COREFOUNDATION_LIBRARY} ${COREGRAPHICS_LIBRARY} ${FOUNDATION_LIBRARY})
-endif (APPLE)
-
-if (WIN32)
-  list(APPEND LIBWEBRTC_LIBRARIES msdmo.lib wmcodecdspuuid.lib dmoguids.lib
-       ole32.lib secur32.lib winmm.lib ws2_32.lib)
-endif (WIN32)
-
 # Add compiler flags needed to use LibWebRTC.
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LIBWEBRTC_REQUIRED_C_FLAGS}")
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} ${LIBWEBRTC_REQUIRED_C_FLAGS_DEBUG}")