diff --git a/generator/vk_common/CMakeLists.txt b/generator/vk_common/CMakeLists.txt
index 327e476..247b795 100644
--- a/generator/vk_common/CMakeLists.txt
+++ b/generator/vk_common/CMakeLists.txt
@@ -36,6 +36,7 @@ target_include_directories(
 
 target_include_directories(
     ${LIB_BINARY} SYSTEM PRIVATE
-        ../../khronos/vulkan/include)
+        ../../khronos/vulkan/include
+        ../)
 
 lgl_set_build_options(${LIB_BINARY})
diff --git a/layer_example/source/layer_device_functions.cpp b/layer_example/source/layer_device_functions.cpp
index d1270b1..e097f0e 100644
--- a/layer_example/source/layer_device_functions.cpp
+++ b/layer_example/source/layer_device_functions.cpp
@@ -27,8 +27,6 @@
 #include <mutex>
 #include <thread>
 
-#include "framework/utils.hpp"
-
 #include "device.hpp"
 #include "layer_device_functions.hpp"
 
diff --git a/layer_example/source/layer_device_functions.hpp b/layer_example/source/layer_device_functions.hpp
index 56fb1c7..df321c2 100644
--- a/layer_example/source/layer_device_functions.hpp
+++ b/layer_example/source/layer_device_functions.hpp
@@ -23,17 +23,8 @@
  * ----------------------------------------------------------------------------
  */
 
-#include <memory>
-#include <mutex>
-#include <thread>
-
-#include "framework/device_functions.hpp"
 #include "framework/utils.hpp"
 
-#include "device.hpp"
-
-extern std::mutex g_vulkanLock;
-
 /* See Vulkan API for documentation. */
 template <>
 VKAPI_ATTR void VKAPI_CALL layer_vkCmdBeginRenderPass<user_tag>(
diff --git a/source_common/compiler_helper.cmake b/source_common/compiler_helper.cmake
index 351795e..b881389 100644
--- a/source_common/compiler_helper.cmake
+++ b/source_common/compiler_helper.cmake
@@ -52,11 +52,11 @@ macro(lgl_set_build_options BUILD_TARGET_NAME)
 
     target_compile_options(
         ${BUILD_TARGET_NAME} PRIVATE
-            # Minimized visibility warnings
+            # Minimize symbol visibility
             $<${is_gnu_fe}:-fvisibility=hidden>
             $<${is_gnu_fe}:-fvisibility-inlines-hidden>
 
-            # Strict warnings
+            # Enable stricter warnings
             $<${is_gnu_fe}:-Wall>
             $<${is_gnu_fe}:-Wextra>
             $<${is_gnu_fe}:-Wpedantic>
@@ -65,7 +65,10 @@ macro(lgl_set_build_options BUILD_TARGET_NAME)
             $<${is_gnu_fe}:-Wdouble-promotion>
             $<${is_clang}:-Wdocumentation>
 
-            # Feature disabled
+            # Disable warnings we don't want
+            $<${is_gnu_fe}:-Wno-unused-private-field>
+
+            # Disable features we don't want
             $<${is_gnu_fe}:-fno-exceptions>)
 
     target_compile_definitions(
diff --git a/source_common/framework/CMakeLists.txt b/source_common/framework/CMakeLists.txt
index 327e476..247b795 100644
--- a/source_common/framework/CMakeLists.txt
+++ b/source_common/framework/CMakeLists.txt
@@ -36,6 +36,7 @@ target_include_directories(
 
 target_include_directories(
     ${LIB_BINARY} SYSTEM PRIVATE
-        ../../khronos/vulkan/include)
+        ../../khronos/vulkan/include
+        ../)
 
 lgl_set_build_options(${LIB_BINARY})