diff --git a/vulkan/BUILD.gn b/vulkan/BUILD.gn
index c701763ea121f..5a94bf0e48963 100644
--- a/vulkan/BUILD.gn
+++ b/vulkan/BUILD.gn
@@ -11,7 +11,10 @@ config("vulkan_config") {
     include_dirs += [ "$fuchsia_sdk_root/vulkan/include" ]
     defines += [ "VK_USE_PLATFORM_FUCHSIA=1" ]
   } else {
-    include_dirs += [ "//third_party/vulkan/src" ]
+    include_dirs += [
+      "//third_party/vulkan/src",
+      "//third_party/vulkan/include",
+    ]
   }
 }
 
diff --git a/vulkan/vulkan_application.cc b/vulkan/vulkan_application.cc
index 0f645af051bf1..97012c49a6fbd 100644
--- a/vulkan/vulkan_application.cc
+++ b/vulkan/vulkan_application.cc
@@ -1,7 +1,6 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// FLUTTER_NOLINT
 
 #include "vulkan_application.h"
 
@@ -15,7 +14,7 @@
 namespace vulkan {
 
 VulkanApplication::VulkanApplication(
-    VulkanProcTable& p_vk,
+    VulkanProcTable& p_vk,  // NOLINT
     const std::string& application_name,
     std::vector<std::string> enabled_extensions,
     uint32_t application_version,
diff --git a/vulkan/vulkan_application.h b/vulkan/vulkan_application.h
index 3724929e0ff1b..eb1d23f26901a 100644
--- a/vulkan/vulkan_application.h
+++ b/vulkan/vulkan_application.h
@@ -24,7 +24,7 @@ class VulkanProcTable;
 /// create a VkInstance (with debug reporting optionally enabled).
 class VulkanApplication {
  public:
-  VulkanApplication(VulkanProcTable& vk,
+  VulkanApplication(VulkanProcTable& vk,  // NOLINT
                     const std::string& application_name,
                     std::vector<std::string> enabled_extensions,
                     uint32_t application_version = VK_MAKE_VERSION(1, 0, 0),
diff --git a/vulkan/vulkan_backbuffer.cc b/vulkan/vulkan_backbuffer.cc
index 15dfb39988d58..d8be29e51d3db 100644
--- a/vulkan/vulkan_backbuffer.cc
+++ b/vulkan/vulkan_backbuffer.cc
@@ -1,7 +1,6 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// FLUTTER_NOLINT
 
 #include "vulkan_backbuffer.h"
 
diff --git a/vulkan/vulkan_command_buffer.cc b/vulkan/vulkan_command_buffer.cc
index 54962bad6d346..c98a345fb3b75 100644
--- a/vulkan/vulkan_command_buffer.cc
+++ b/vulkan/vulkan_command_buffer.cc
@@ -1,7 +1,6 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// FLUTTER_NOLINT
 
 #include "vulkan_command_buffer.h"
 
diff --git a/vulkan/vulkan_debug_report.cc b/vulkan/vulkan_debug_report.cc
index f8a5f3e2ad6b7..1e5478753607b 100644
--- a/vulkan/vulkan_debug_report.cc
+++ b/vulkan/vulkan_debug_report.cc
@@ -1,7 +1,6 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// FLUTTER_NOLINT
 
 #include "vulkan_debug_report.h"
 
@@ -192,8 +191,9 @@ VulkanDebugReport::VulkanDebugReport(
   }
 
   VkDebugReportFlagsEXT flags = kVulkanErrorFlags;
-  if (ValidationLayerInfoMessagesEnabled())
+  if (ValidationLayerInfoMessagesEnabled()) {
     flags |= kVulkanInfoFlags;
+  }
   const VkDebugReportCallbackCreateInfoEXT create_info = {
       .sType = VK_STRUCTURE_TYPE_DEBUG_REPORT_CREATE_INFO_EXT,
       .pNext = nullptr,
diff --git a/vulkan/vulkan_device.cc b/vulkan/vulkan_device.cc
index 49a8e96e7fe85..b4e0071b7e64a 100644
--- a/vulkan/vulkan_device.cc
+++ b/vulkan/vulkan_device.cc
@@ -1,7 +1,6 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// FLUTTER_NOLINT
 
 #include "vulkan_device.h"
 
diff --git a/vulkan/vulkan_handle.cc b/vulkan/vulkan_handle.cc
index 375e9f9df0009..eb15d9ff13147 100644
--- a/vulkan/vulkan_handle.cc
+++ b/vulkan/vulkan_handle.cc
@@ -1,7 +1,6 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// FLUTTER_NOLINT
 
 #include "vulkan_handle.h"
 
diff --git a/vulkan/vulkan_image.cc b/vulkan/vulkan_image.cc
index 6ba6bc23113c7..7f3b5eb9cdde4 100644
--- a/vulkan/vulkan_image.cc
+++ b/vulkan/vulkan_image.cc
@@ -1,7 +1,6 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// FLUTTER_NOLINT
 
 #include "vulkan_image.h"
 
diff --git a/vulkan/vulkan_interface.cc b/vulkan/vulkan_interface.cc
index a1248061c33ff..5f0e67916e165 100644
--- a/vulkan/vulkan_interface.cc
+++ b/vulkan/vulkan_interface.cc
@@ -1,7 +1,6 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// FLUTTER_NOLINT
 
 #include "vulkan_interface.h"
 
diff --git a/vulkan/vulkan_native_surface.cc b/vulkan/vulkan_native_surface.cc
index 20aba0fd8d692..4d10bf4a35783 100644
--- a/vulkan/vulkan_native_surface.cc
+++ b/vulkan/vulkan_native_surface.cc
@@ -1,7 +1,6 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// FLUTTER_NOLINT
 
 #include "vulkan_native_surface.h"
 
diff --git a/vulkan/vulkan_proc_table.cc b/vulkan/vulkan_proc_table.cc
index 1fe6d1dc86192..9ed7c40b5c9ae 100644
--- a/vulkan/vulkan_proc_table.cc
+++ b/vulkan/vulkan_proc_table.cc
@@ -1,7 +1,6 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// FLUTTER_NOLINT
 
 #include "vulkan_proc_table.h"
 
diff --git a/vulkan/vulkan_surface.cc b/vulkan/vulkan_surface.cc
index ac4406289cc0d..f410d43f81719 100644
--- a/vulkan/vulkan_surface.cc
+++ b/vulkan/vulkan_surface.cc
@@ -1,7 +1,6 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// FLUTTER_NOLINT
 
 #include "vulkan_surface.h"
 
@@ -11,8 +10,8 @@
 namespace vulkan {
 
 VulkanSurface::VulkanSurface(
-    VulkanProcTable& p_vk,
-    VulkanApplication& application,
+    VulkanProcTable& p_vk,           // NOLINT
+    VulkanApplication& application,  // NOLINT
     std::unique_ptr<VulkanNativeSurface> native_surface)
     : vk(p_vk),
       application_(application),
diff --git a/vulkan/vulkan_utilities.cc b/vulkan/vulkan_utilities.cc
index 2ad904bdfe877..e6aa4180c69d3 100644
--- a/vulkan/vulkan_utilities.cc
+++ b/vulkan/vulkan_utilities.cc
@@ -1,7 +1,6 @@
 // Copyright 2013 The Flutter Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
-// FLUTTER_NOLINT
 
 #include "vulkan_utilities.h"
 #include "flutter/fml/build_config.h"