diff --git a/CMakeLists.txt b/CMakeLists.txt
index 907310f704..7e871381b8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -377,13 +377,18 @@ macro(commom_lib_settings lib write)
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/lib/basisu/zstd>
         $<INSTALL_INTERFACE:lib/basisu/zstd>
 
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/other_include>
-        $<INSTALL_INTERFACE:other_include>
-
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/utils>
         $<INSTALL_INTERFACE:utils>
     )
 
+    target_include_directories(
+        ${lib}
+        SYSTEM
+    PRIVATE
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/other_include>
+        $<INSTALL_INTERFACE:other_include>
+    )
+
     if( LIB_TYPE STREQUAL STATIC )
         target_compile_definitions(${lib} PUBLIC KHRONOS_STATIC)
     endif()
@@ -681,7 +686,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         # version. Also future proofing for when xcode catches up.
         set_source_files_properties(
             ${BASISU_ENCODER_CXX_SRC}
-            PROPERTIES COMPILE_OPTIONS "-Wno-sign-compare;-Wno-unused-variable;-Wno-unused-parameter"
+            PROPERTIES COMPILE_OPTIONS "-Wno-sign-compare;-Wno-unused-variable;-Wno-unused-parameter;-Wno-deprecated-copy-with-user-provided-copy"
         )
         set_source_files_properties(
             lib/basisu/transcoder/basisu_transcoder.cpp
@@ -935,6 +940,7 @@ else()
 endif()
 
 # FMT
+set(FMT_SYSTEM_HEADERS ON)
 add_subdirectory(other_projects/fmt)
 
 # Tools
diff --git a/cmake/cputypetest.cmake b/cmake/cputypetest.cmake
index 31d38882d7..d839d2d4cc 100644
--- a/cmake/cputypetest.cmake
+++ b/cmake/cputypetest.cmake
@@ -1,8 +1,6 @@
 # Copyright 2016, Simon Werta (@webmaster128).
 # SPDX-License-Identifier: Apache-2.0
 
-cmake_minimum_required(VERSION 2.8.12)
-
 set(cputypetest_code "
 //
 // https://gist.github.com/webmaster128/e08067641df1dd784eb195282fd0912f
diff --git a/utils/ktxapp.h b/utils/ktxapp.h
index cd71eb10bb..86c6bbbfe5 100644
--- a/utils/ktxapp.h
+++ b/utils/ktxapp.h
@@ -6,6 +6,12 @@
 
 #include "stdafx.h"
 
+#if defined (_WIN32)
+  #define _CRT_SECURE_NO_WARNINGS
+  #define WINDOWS_LEAN_AND_MEAN
+  #include <windows.h>
+#endif
+
 #include <stdarg.h>
 #if (_MSVC_LANG >= 201703L || __cplusplus >= 201703L)
 #include <algorithm>
@@ -87,8 +93,12 @@ class ktxApp {
     virtual int main(int argc, _TCHAR* argv[]) = 0;
     virtual void usage() {
         cerr <<
-          "  -h, --help    Print this usage message and exit.\n"
-          "  -v, --version Print the version number of this program and exit.\n";
+            "  -h, --help    Print this usage message and exit.\n"
+            "  -v, --version Print the version number of this program and exit.\n"
+#if defined(_WIN32) && defined(DEBUG)
+            "      --ld      Launch Visual Studio deugger at start up.\n"
+#endif
+            ;
     };
 
   protected:
@@ -97,8 +107,9 @@ class ktxApp {
         _tstring outfile;
         int test;
         int warn;
+        int launchDebugger;
 
-        commandOptions() : test(false), warn(1) { }
+        commandOptions() : test(false), warn(1), launchDebugger(0) { }
     };
 
     ktxApp(std::string& version, std::string& defaultVersion,
@@ -259,7 +270,7 @@ class ktxApp {
         listName.erase(0, relativize ? 2 : 1);
 
         FILE *lf = nullptr;
-#ifdef _WIN32
+#if defined(_WIN32)
         _tfopen_s(&lf, listName.c_str(), "r");
 #else
         lf = _tfopen(listName.c_str(), "r");
@@ -352,6 +363,10 @@ class ktxApp {
                 }
             }
         }
+#if defined(_WIN32) && defined(DEBUG)
+        if (options.launchDebugger)
+            launchDebugger();
+#endif
     }
 
     virtual bool processOption(argparser& parser, int opt) = 0;
@@ -366,6 +381,47 @@ class ktxApp {
         cerr << endl;
     }
 
+#if defined(_WIN32) && defined(DEBUG)
+    // For use when debugging stdin with Visual Studio which does not have a
+    // "wait for executable to be launched" choice in its debugger settings.
+    bool launchDebugger()
+    {
+        // Get System directory, typically c:\windows\system32
+        std::wstring systemDir(MAX_PATH + 1, '\0');
+        UINT nChars = GetSystemDirectoryW(&systemDir[0],
+                                static_cast<UINT>(systemDir.length()));
+        if (nChars == 0) return false; // failed to get system directory
+        systemDir.resize(nChars);
+
+        // Get process ID and create the command line
+        DWORD pid = GetCurrentProcessId();
+        std::wostringstream s;
+        s << systemDir << L"\\vsjitdebugger.exe -p " << pid;
+        std::wstring cmdLine = s.str();
+
+        // Start debugger process
+        STARTUPINFOW si;
+        ZeroMemory(&si, sizeof(si));
+        si.cb = sizeof(si);
+
+        PROCESS_INFORMATION pi;
+        ZeroMemory(&pi, sizeof(pi));
+
+        if (!CreateProcessW(NULL, &cmdLine[0], NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) return false;
+
+        // Close debugger process handles to eliminate resource leak
+        CloseHandle(pi.hThread);
+        CloseHandle(pi.hProcess);
+
+        // Wait for the debugger to attach
+        while (!IsDebuggerPresent()) Sleep(100);
+
+        // Stop execution so the debugger can take over
+        DebugBreak();
+        return true;
+    }
+#endif
+
     _tstring        name;
     _tstring&       version;
     _tstring&       defaultVersion;
@@ -378,6 +434,9 @@ class ktxApp {
         { "help", argparser::option::no_argument, NULL, 'h' },
         { "version", argparser::option::no_argument, NULL, 'v' },
         { "test", argparser::option::no_argument, &options.test, 1},
+#if defined(_WIN32) && defined(DEBUG)
+        { "ld", argparser::option::no_argument, &options.launchDebugger, 1},
+#endif
         // -NSDocumentRevisionsDebugMode YES is appended to the end
         // of the command by Xcode when debugging and "Allow debugging when
         // using document Versions Browser" is checked in the scheme. It
diff --git a/utils/stdafx.h b/utils/stdafx.h
index 568bdeb32b..b4e19c2f52 100644
--- a/utils/stdafx.h
+++ b/utils/stdafx.h
@@ -5,7 +5,12 @@
 
 #pragma once
 
-#define _CRT_SECURE_NO_WARNINGS // For _WIN32. Must be before <stdio.h>.
+#if defined(_WIN32)
+  // _CRT_SECURE_NO_WARNINGS must be defined before <windows.h>,
+  // <stdio.h> and and <iostream>
+  #define _CRT_SECURE_NO_WARNINGS
+#endif
+
 #include <assert.h>
 #include <stdio.h>
 #ifdef _WIN32