diff --git a/.appveyor.yml b/.appveyor.yml
index 268d9eb7..08139f1c 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -3,8 +3,6 @@ clone_depth: 5
 
 environment:
   matrix:
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      cmake_generator: "Visual Studio 14 2015 Win64"
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       cmake_generator: "Visual Studio 15 2017 Win64"
 
diff --git a/.travis.yml b/.travis.yml
index 2c19286d..b95544c2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,9 +10,8 @@ matrix:
           sources:
             - ubuntu-toolchain-r-test
           packages:
-            - gcc-6
-            - g++-6
-            - lib32stdc++6 # For CMake
+            - gcc-7
+            - g++-7
       install: ./.travis/deps-x86_64-linux.sh
       script: ./.travis/build-x86_64-linux.sh
     - os: osx
diff --git a/.travis/build-x86_64-linux.sh b/.travis/build-x86_64-linux.sh
index e1c5fc4f..5db4586f 100755
--- a/.travis/build-x86_64-linux.sh
+++ b/.travis/build-x86_64-linux.sh
@@ -3,8 +3,8 @@
 set -e
 set -x
 
-export CC=gcc-6
-export CXX=g++-6
+export CC=gcc-7
+export CXX=g++-7
 export PKG_CONFIG_PATH=$HOME/.local/lib/pkgconfig:$PKG_CONFIG_PATH
 
 mkdir build && cd build
diff --git a/.travis/deps-x86_64-linux.sh b/.travis/deps-x86_64-linux.sh
index 4d7231fd..18e2c243 100755
--- a/.travis/deps-x86_64-linux.sh
+++ b/.travis/deps-x86_64-linux.sh
@@ -5,9 +5,9 @@ set -x
 
 # TODO: This isn't ideal.
 cd externals
-git clone https://github.com/citra-emu/ext-boost
+git clone https://github.com/MerryMage/ext-boost
 cd ..
 
 mkdir -p $HOME/.local
-curl -L https://cmake.org/files/v3.4/cmake-3.4.1-Linux-i386.tar.gz \
+curl -L https://cmake.org/files/v3.8/cmake-3.8.0-Linux-x86_64.tar.gz \
     | tar -xz -C $HOME/.local --strip-components=1
diff --git a/.travis/deps-x86_64-macos.sh b/.travis/deps-x86_64-macos.sh
index 96bfc4a4..7fe44c7f 100755
--- a/.travis/deps-x86_64-macos.sh
+++ b/.travis/deps-x86_64-macos.sh
@@ -5,5 +5,5 @@ set -x
 
 # TODO: This isn't ideal.
 cd externals
-git clone https://github.com/citra-emu/ext-boost
+git clone https://github.com/MerryMage/ext-boost
 cd ..
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61be232f..2b9f4ce5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.2)
+cmake_minimum_required(VERSION 3.8)
 project(dynarmic CXX)
 
 # Determine if we're built as a subproject (using add_subdirectory)
@@ -21,7 +21,7 @@ if (NOT CMAKE_BUILD_TYPE)
 endif()
 
 # Set hard requirements for C++
-set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)