diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93f06c284e..ae13bd80be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -292,7 +292,7 @@ if (STATIC)
 	if (NOT DISABLE_TTF)
 		# FreeType is required by SDL2_ttf, but not wired up properly in package
 		PKG_CHECK_MODULES(FREETYPE REQUIRED freetype2)
-	endif (DISABLE_TTF)
+	endif (NOT DISABLE_TTF)
 	SET(SDL2LIBS ${SDL2_STATIC_LIBRARIES} ${SDL2_TTF_STATIC_LIBRARIES} ${FREETYPE_STATIC_LIBRARIES})
 else (STATIC)
 	SET(SDL2LIBS ${SDL2_LIBRARIES} ${SDL2_TTF_LIBRARIES})
diff --git a/src/openrct2/platform/platform.h b/src/openrct2/platform/platform.h
index 27c999e03f..27cc648cfb 100644
--- a/src/openrct2/platform/platform.h
+++ b/src/openrct2/platform/platform.h
@@ -19,6 +19,8 @@
 
 #include "../common.h"
 
+#include <SDL.h>
+
 #ifdef __WINDOWS__
 #include "../rct2.h"
 	#ifndef HAVE_MATH_H
@@ -26,8 +28,6 @@
 	#endif
 #endif // __WINDOWS__
 
-#include <SDL.h>
-
 #include "../core/textinputbuffer.h"
 #include "../drawing/font.h"
 
diff --git a/src/openrct2/platform/windows.c b/src/openrct2/platform/windows.c
index 57dd016076..4c90cb9b64 100644
--- a/src/openrct2/platform/windows.c
+++ b/src/openrct2/platform/windows.c
@@ -1141,6 +1141,7 @@ static bool windows_setup_file_association(
 	wchar_t szIconW[MAX_PATH];
 	printResult = swprintf_s(szIconW, MAX_PATH, L"\"%s\",%d", dllPathW, iconIndex);
 	assert(printResult >= 0);
+	UNUSED(printResult);
 	if (RegSetValueW(hKey, L"DefaultIcon", REG_SZ, szIconW, 0) != ERROR_SUCCESS) {
 		goto fail;
 	}
@@ -1158,6 +1159,7 @@ static bool windows_setup_file_association(
 	// [hRootKey\OpenRCT2.sv6\shell\open\command]
 	wchar_t szCommandW[MAX_PATH];
 	printResult = swprintf_s(szCommandW, MAX_PATH, L"\"%s\" %s", exePathW, commandArgsW);
+	UNUSED(printResult);
 	assert(printResult >= 0);
 	if (RegSetValueW(hKey, L"shell\\open\\command", REG_SZ, szCommandW, 0) != ERROR_SUCCESS) {
 		goto fail;