diff --git a/hecl-gui/CMakeLists.txt b/hecl-gui/CMakeLists.txt
index 7a9ee5794..9db2c9c40 100644
--- a/hecl-gui/CMakeLists.txt
+++ b/hecl-gui/CMakeLists.txt
@@ -34,8 +34,6 @@ file(GLOB QUAZIP_SRCS quazip/quazip/*.c quazip/quazip/*.cpp quazip/quazip/*.h)
 list(REMOVE_ITEM QUAZIP_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/quazip/quazip/quagzipfile.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/quazip/quazip/quagzipfile.h)
-include_directories(quazip/quazip)
-add_definitions(-DQUAZIP_STATIC=1)
 
 add_executable(hecl-gui WIN32 MACOSX_BUNDLE
     ArgumentEditor.ui ArgumentEditor.cpp ArgumentEditor.hpp
@@ -54,11 +52,18 @@ if(COMMAND add_sanitizers)
   add_sanitizers(hecl-gui)
 endif()
 
+if (NOT MSVC)
+  target_compile_options(hecl-gui PRIVATE -Wno-misleading-indentation)
+endif()
+
 set_target_properties(hecl-gui PROPERTIES
   MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/platforms/mac/Info.plist")
 
+target_include_directories(hecl-gui PRIVATE quazip/quazip)
+target_compile_definitions(hecl-gui PRIVATE QUAZIP_STATIC=1)
+
 target_link_libraries(hecl-gui ${PLAT_LIBS}
                       ${Qt5Widgets_LIBRARIES}
                       ${Qt5Network_LIBRARIES}
                       ${Qt5Xml_LIBRARIES}
-                      hecl-light logvisor zeus athena-core athena-libyaml xxhash z)
+                      hecl-light logvisor zeus athena-core xxhash z)
diff --git a/hecl-gui/platforms/freedesktop/CMakeLists.txt b/hecl-gui/platforms/freedesktop/CMakeLists.txt
index 00866479f..635f49a66 100644
--- a/hecl-gui/platforms/freedesktop/CMakeLists.txt
+++ b/hecl-gui/platforms/freedesktop/CMakeLists.txt
@@ -1,6 +1,6 @@
-include_directories(${LIBPNG_INCLUDE_DIR})
 add_executable(mkqticon mkqticon.c)
 target_link_libraries(mkqticon ${PNG_LIB} ${ZLIB_LIBRARIES})
+target_include_directories(mkqticon PRIVATE ${LIBPNG_INCLUDE_DIR})
 
 macro(declare_qticon_target)
 add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/hecl-gui/platforms/freedesktop/mainicon_qt.bin