Enable build/header_guard

This CL enables the build/header_guard lint check. The existing headers
which failed the check were updated, missing headers added. An exclusion
file for the generator templates was added as well.

Bug: dawn:1339
Change-Id: If572e460179ad501293d5d6cf01e0ea900daa979
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86207
Reviewed-by: Ben Clayton <bclayton@google.com>
Auto-Submit: Dan Sinclair <dsinclair@chromium.org>
Commit-Queue: Dan Sinclair <dsinclair@chromium.org>

generator/templates/CPPLINT.cfg

@@ -0,0 +1 @@
+exclude_files=.*

include/dawn/CPPLINT.cfg

@@ -1,4 +1,3 @@
-filter=-build/header_guard
 filter=-build/include_order
 filter=-readability/inheritance
 filter=-runtime/explicit

include/dawn/EnumClassBitmasks.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWN_ENUM_CLASS_BITMASKS_H_
+#ifndef INCLUDE_DAWN_ENUMCLASSBITMASKS_H_
-#define DAWN_ENUM_CLASS_BITMASKS_H_
+#define INCLUDE_DAWN_ENUMCLASSBITMASKS_H_
 
 #include <type_traits>
 
@@ -153,4 +153,4 @@ namespace dawn {
 
 }  // namespace dawn
 
-#endif  // DAWN_ENUM_CLASS_BITMASKS_H_
+#endif  // INCLUDE_DAWN_ENUMCLASSBITMASKS_H_

include/dawn/dawn_proc.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWN_DAWN_PROC_H_
+#ifndef INCLUDE_DAWN_DAWN_PROC_H_
-#define DAWN_DAWN_PROC_H_
+#define INCLUDE_DAWN_DAWN_PROC_H_
 
 #include "dawn/dawn_proc_table.h"
 #include "dawn/webgpu.h"
@@ -33,4 +33,4 @@ WGPU_EXPORT void dawnProcSetProcs(const DawnProcTable* procs);
 }  // extern "C"
 #endif
 
-#endif  // DAWN_DAWN_PROC_H_
+#endif  // INCLUDE_DAWN_DAWN_PROC_H_

include/dawn/dawn_thread_dispatch_proc.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWN_DAWN_THREAD_DISPATCH_PROC_H_
+#ifndef INCLUDE_DAWN_DAWN_THREAD_DISPATCH_PROC_H_
-#define DAWN_DAWN_THREAD_DISPATCH_PROC_H_
+#define INCLUDE_DAWN_DAWN_THREAD_DISPATCH_PROC_H_
 
 #include "dawn/dawn_proc.h"
 
@@ -30,4 +30,4 @@ WGPU_EXPORT void dawnProcSetPerThreadProcs(const DawnProcTable* procs);
 }  // extern "C"
 #endif
 
-#endif  // DAWN_DAWN_THREAD_DISPATCH_PROC_H_
+#endif  // INCLUDE_DAWN_DAWN_THREAD_DISPATCH_PROC_H_

include/dawn/dawn_wsi.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWN_DAWN_WSI_H_
+#ifndef INCLUDE_DAWN_DAWN_WSI_H_
-#define DAWN_DAWN_WSI_H_
+#define INCLUDE_DAWN_DAWN_WSI_H_
 
 #include <dawn/webgpu.h>
 
@@ -83,4 +83,4 @@ typedef struct {
 } DawnWSIContextVulkan;
 #endif
 
-#endif  // DAWN_DAWN_WSI_H
+#endif  // INCLUDE_DAWN_DAWN_WSI_H_

include/dawn/native/D3D12Backend.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_D3D12BACKEND_H_
+#ifndef INCLUDE_DAWN_NATIVE_D3D12BACKEND_H_
-#define DAWNNATIVE_D3D12BACKEND_H_
+#define INCLUDE_DAWN_NATIVE_D3D12BACKEND_H_
 
 #include <dawn/dawn_wsi.h>
 #include <dawn/native/DawnNative.h>
@@ -108,4 +108,4 @@ namespace dawn::native::d3d12 {
 
 }  // namespace dawn::native::d3d12
 
-#endif  // DAWNNATIVE_D3D12BACKEND_H_
+#endif  // INCLUDE_DAWN_NATIVE_D3D12BACKEND_H_

include/dawn/native/DawnNative.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_DAWNNATIVE_H_
+#ifndef INCLUDE_DAWN_NATIVE_DAWNNATIVE_H_
-#define DAWNNATIVE_DAWNNATIVE_H_
+#define INCLUDE_DAWN_NATIVE_DAWNNATIVE_H_
 
 #include <dawn/dawn_proc_table.h>
 #include <dawn/native/dawn_native_export.h>
@@ -258,4 +258,4 @@ namespace dawn::native {
 // TODO(dawn:824): Remove once the deprecation period is passed.
 namespace dawn_native = dawn::native;
 
-#endif  // DAWNNATIVE_DAWNNATIVE_H_
+#endif  // INCLUDE_DAWN_NATIVE_DAWNNATIVE_H_

include/dawn/native/MetalBackend.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_METALBACKEND_H_
+#ifndef INCLUDE_DAWN_NATIVE_METALBACKEND_H_
-#define DAWNNATIVE_METALBACKEND_H_
+#define INCLUDE_DAWN_NATIVE_METALBACKEND_H_
 
 #include <dawn/dawn_wsi.h>
 #include <dawn/native/DawnNative.h>
@@ -70,4 +70,4 @@ namespace dawn::native::metal {
 
 #pragma clang diagnostic pop
 
-#endif  // DAWNNATIVE_METALBACKEND_H_
+#endif  // INCLUDE_DAWN_NATIVE_METALBACKEND_H_

include/dawn/native/NullBackend.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_NULLBACKEND_H_
+#ifndef INCLUDE_DAWN_NATIVE_NULLBACKEND_H_
-#define DAWNNATIVE_NULLBACKEND_H_
+#define INCLUDE_DAWN_NATIVE_NULLBACKEND_H_
 
 #include <dawn/dawn_wsi.h>
 #include <dawn/native/DawnNative.h>
@@ -22,4 +22,4 @@ namespace dawn::native::null {
     DAWN_NATIVE_EXPORT DawnSwapChainImplementation CreateNativeSwapChainImpl();
 }  // namespace dawn::native::null
 
-#endif  // DAWNNATIVE_NULLBACKEND_H_
+#endif  // INCLUDE_DAWN_NATIVE_NULLBACKEND_H_

include/dawn/native/OpenGLBackend.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_OPENGLBACKEND_H_
+#ifndef INCLUDE_DAWN_NATIVE_OPENGLBACKEND_H_
-#define DAWNNATIVE_OPENGLBACKEND_H_
+#define INCLUDE_DAWN_NATIVE_OPENGLBACKEND_H_
 
 typedef void* EGLImage;
 
@@ -52,4 +52,4 @@ namespace dawn::native::opengl {
 
 }  // namespace dawn::native::opengl
 
-#endif  // DAWNNATIVE_OPENGLBACKEND_H_
+#endif  // INCLUDE_DAWN_NATIVE_OPENGLBACKEND_H_

include/dawn/native/VulkanBackend.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_VULKANBACKEND_H_
+#ifndef INCLUDE_DAWN_NATIVE_VULKANBACKEND_H_
-#define DAWNNATIVE_VULKANBACKEND_H_
+#define INCLUDE_DAWN_NATIVE_VULKANBACKEND_H_
 
 #include <dawn/dawn_wsi.h>
 #include <dawn/native/DawnNative.h>
@@ -137,4 +137,4 @@ namespace dawn::native::vulkan {
 
 }  // namespace dawn::native::vulkan
 
-#endif  // DAWNNATIVE_VULKANBACKEND_H_
+#endif  // INCLUDE_DAWN_NATIVE_VULKANBACKEND_H_

include/dawn/native/dawn_native_export.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_EXPORT_H_
+#ifndef INCLUDE_DAWN_NATIVE_DAWN_NATIVE_EXPORT_H_
-#define DAWNNATIVE_EXPORT_H_
+#define INCLUDE_DAWN_NATIVE_DAWN_NATIVE_EXPORT_H_
 
 #if defined(DAWN_NATIVE_SHARED_LIBRARY)
 #    if defined(_WIN32)
@@ -33,4 +33,4 @@
 #    define DAWN_NATIVE_EXPORT
 #endif  // defined(DAWN_NATIVE_SHARED_LIBRARY)
 
-#endif  // DAWNNATIVE_EXPORT_H_
+#endif  // INCLUDE_DAWN_NATIVE_DAWN_NATIVE_EXPORT_H_

include/dawn/platform/DawnPlatform.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNPLATFORM_DAWNPLATFORM_H_
+#ifndef INCLUDE_DAWN_PLATFORM_DAWNPLATFORM_H_
-#define DAWNPLATFORM_DAWNPLATFORM_H_
+#define INCLUDE_DAWN_PLATFORM_DAWNPLATFORM_H_
 
 #include "dawn/platform/dawn_platform_export.h"
 
@@ -116,4 +116,4 @@ namespace dawn::platform {
 // TODO(dawn:824): Remove once the deprecation period is passed.
 namespace dawn_platform = dawn::platform;
 
-#endif  // DAWNPLATFORM_DAWNPLATFORM_H_
+#endif  // INCLUDE_DAWN_PLATFORM_DAWNPLATFORM_H_

include/dawn/platform/dawn_platform_export.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNPLATFORM_EXPORT_H_
+#ifndef INCLUDE_DAWN_PLATFORM_DAWN_PLATFORM_EXPORT_H_
-#define DAWNPLATFORM_EXPORT_H_
+#define INCLUDE_DAWN_PLATFORM_DAWN_PLATFORM_EXPORT_H_
 
 #if defined(DAWN_PLATFORM_SHARED_LIBRARY)
 #    if defined(_WIN32)
@@ -33,4 +33,4 @@
 #    define DAWN_PLATFORM_EXPORT
 #endif  // defined(DAWN_PLATFORM_SHARED_LIBRARY)
 
-#endif  // DAWNPLATFORM_EXPORT_H_
+#endif  // INCLUDE_DAWN_PLATFORM_DAWN_PLATFORM_EXPORT_H_

include/dawn/wire/Wire.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNWIRE_WIRE_H_
+#ifndef INCLUDE_DAWN_WIRE_WIRE_H_
-#define DAWNWIRE_WIRE_H_
+#define INCLUDE_DAWN_WIRE_WIRE_H_
 
 #include <cstdint>
 #include <limits>
@@ -76,4 +76,4 @@ namespace dawn::wire {
 // TODO(dawn:824): Remove once the deprecation period is passed.
 namespace dawn_wire = dawn::wire;
 
-#endif  // DAWNWIRE_WIRE_H_
+#endif  // INCLUDE_DAWN_WIRE_WIRE_H_

include/dawn/wire/WireClient.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNWIRE_WIRECLIENT_H_
+#ifndef INCLUDE_DAWN_WIRE_WIRECLIENT_H_
-#define DAWNWIRE_WIRECLIENT_H_
+#define INCLUDE_DAWN_WIRE_WIRECLIENT_H_
 
 #include "dawn/dawn_proc_table.h"
 #include "dawn/wire/Wire.h"
@@ -180,4 +180,4 @@ namespace dawn::wire {
     }  // namespace client
 }  // namespace dawn::wire
 
-#endif  // DAWNWIRE_WIRECLIENT_H_
+#endif  // INCLUDE_DAWN_WIRE_WIRECLIENT_H_

include/dawn/wire/WireServer.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNWIRE_WIRESERVER_H_
+#ifndef INCLUDE_DAWN_WIRE_WIRESERVER_H_
-#define DAWNWIRE_WIRESERVER_H_
+#define INCLUDE_DAWN_WIRE_WIRESERVER_H_
 
 #include <memory>
 
@@ -147,4 +147,4 @@ namespace dawn::wire {
 
 }  // namespace dawn::wire
 
-#endif  // DAWNWIRE_WIRESERVER_H_
+#endif  // INCLUDE_DAWN_WIRE_WIRESERVER_H_

include/dawn/wire/dawn_wire_export.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNWIRE_EXPORT_H_
+#ifndef INCLUDE_DAWN_WIRE_DAWN_WIRE_EXPORT_H_
-#define DAWNWIRE_EXPORT_H_
+#define INCLUDE_DAWN_WIRE_DAWN_WIRE_EXPORT_H_
 
 #if defined(DAWN_WIRE_SHARED_LIBRARY)
 #    if defined(_WIN32)
@@ -33,4 +33,4 @@
 #    define DAWN_WIRE_EXPORT
 #endif  // defined(DAWN_WIRE_SHARED_LIBRARY)
 
-#endif  // DAWNWIRE_EXPORT_H_
+#endif  // INCLUDE_DAWN_WIRE_DAWN_WIRE_EXPORT_H_

include/webgpu/CPPLINT.cfg

@@ -1,2 +1 @@
-filter=-build/header_guard
 filter=-legal/copyright

include/webgpu/webgpu.h

@@ -1 +1,6 @@
+#ifndef INCLUDE_WEBGPU_WEBGPU_H_
+#define INCLUDE_WEBGPU_WEBGPU_H_
+
 #include "dawn/webgpu.h"
+
+#endif  // INCLUDE_WEBGPU_WEBGPU_H_

include/webgpu/webgpu_cpp.h

@@ -1 +1,6 @@
+#ifndef INCLUDE_WEBGPU_WEBGPU_CPP_H_
+#define INCLUDE_WEBGPU_WEBGPU_CPP_H_
+
 #include <dawn/webgpu_cpp.h>
+
+#endif  // INCLUDE_WEBGPU_WEBGPU_CPP_H_

src/dawn/CPPLINT.cfg

@@ -1,4 +1,3 @@
-filter=-build/header_guard
 filter=-build/include_order
 filter=-build/include_what_you_use
 filter=-build/namespaces

src/dawn/common/Alloc.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_ALLOC_H_
+#ifndef SRC_DAWN_COMMON_ALLOC_H_
-#define COMMON_ALLOC_H_
+#define SRC_DAWN_COMMON_ALLOC_H_
 
 #include <cstddef>
 #include <new>
@@ -30,4 +30,4 @@ T* AllocNoThrow(size_t count) {
     return new (std::nothrow) T[count];
 }
 
-#endif  // COMMON_ALLOC_H_
+#endif  // SRC_DAWN_COMMON_ALLOC_H_

src/dawn/common/Assert.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_ASSERT_H_
+#ifndef SRC_DAWN_COMMON_ASSERT_H_
-#define COMMON_ASSERT_H_
+#define SRC_DAWN_COMMON_ASSERT_H_
 
 #include "dawn/common/Compiler.h"
 
@@ -77,4 +77,4 @@ void HandleAssertionFailure(const char* file,
                             int line,
                             const char* condition);
 
-#endif  // COMMON_ASSERT_H_
+#endif  // SRC_DAWN_COMMON_ASSERT_H_

src/dawn/common/BitSetIterator.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_BITSETITERATOR_H_
+#ifndef SRC_DAWN_COMMON_BITSETITERATOR_H_
-#define COMMON_BITSETITERATOR_H_
+#define SRC_DAWN_COMMON_BITSETITERATOR_H_
 
 #include "dawn/common/Assert.h"
 #include "dawn/common/Math.h"
@@ -136,4 +136,4 @@ BitSetIterator<N, uint32_t> IterateBitSet(const std::bitset<N>& bitset) {
     return BitSetIterator<N, uint32_t>(bitset);
 }
 
-#endif  // COMMON_BITSETITERATOR_H_
+#endif  // SRC_DAWN_COMMON_BITSETITERATOR_H_

src/dawn/common/Compiler.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_COMPILER_H_
+#ifndef SRC_DAWN_COMMON_COMPILER_H_
-#define COMMON_COMPILER_H_
+#define SRC_DAWN_COMMON_COMPILER_H_
 
 // Defines macros for compiler-specific functionality
 //  - DAWN_COMPILER_[CLANG|GCC|MSVC]: Compiler detection
@@ -94,4 +94,4 @@ extern void __cdecl __debugbreak(void);
 #    define DAWN_NOINLINE
 #endif
 
-#endif  // COMMON_COMPILER_H_
+#endif  // SRC_DAWN_COMMON_COMPILER_H_

src/dawn/common/ConcurrentCache.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_CONCURRENT_CACHE_H_
+#ifndef SRC_DAWN_COMMON_CONCURRENTCACHE_H_
-#define COMMON_CONCURRENT_CACHE_H_
+#define SRC_DAWN_COMMON_CONCURRENTCACHE_H_
 
 #include "dawn/common/NonCopyable.h"
 
@@ -51,4 +51,4 @@ class ConcurrentCache : public NonMovable {
     std::unordered_set<T*, typename T::HashFunc, typename T::EqualityFunc> mCache;
 };
 
-#endif
+#endif  // SRC_DAWN_COMMON_CONCURRENTCACHE_H_

src/dawn/common/Constants.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_CONSTANTS_H_
+#ifndef SRC_DAWN_COMMON_CONSTANTS_H_
-#define COMMON_CONSTANTS_H_
+#define SRC_DAWN_COMMON_CONSTANTS_H_
 
 #include <cstdint>
 
@@ -65,4 +65,4 @@ static constexpr uint8_t kUniformsPerExternalTexture = 1u;
 // A spec defined constant but that doesn't have a name.
 static constexpr uint32_t kMaxBindingNumber = 65535;
 
-#endif  // COMMON_CONSTANTS_H_
+#endif  // SRC_DAWN_COMMON_CONSTANTS_H_

src/dawn/common/CoreFoundationRef.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_COREFOUNDATIONREF_H_
+#ifndef SRC_DAWN_COMMON_COREFOUNDATIONREF_H_
-#define COMMON_COREFOUNDATIONREF_H_
+#define SRC_DAWN_COMMON_COREFOUNDATIONREF_H_
 
 #include "dawn/common/RefBase.h"
 
@@ -43,4 +43,4 @@ CFRef<T> AcquireCFRef(T pointee) {
     return ref;
 }
 
-#endif  // COMMON_COREFOUNDATIONREF_H_
+#endif  // SRC_DAWN_COMMON_COREFOUNDATIONREF_H_

src/dawn/common/DynamicLib.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_DYNAMICLIB_H_
+#ifndef SRC_DAWN_COMMON_DYNAMICLIB_H_
-#define COMMON_DYNAMICLIB_H_
+#define SRC_DAWN_COMMON_DYNAMICLIB_H_
 
 #include "dawn/common/Assert.h"
 
@@ -51,4 +51,4 @@ class DynamicLib {
     void* mHandle = nullptr;
 };
 
-#endif  // COMMON_DYNAMICLIB_H_
+#endif  // SRC_DAWN_COMMON_DYNAMICLIB_H_

src/dawn/common/GPUInfo.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_GPUINFO_H
+#ifndef SRC_DAWN_COMMON_GPUINFO_H_
-#define COMMON_GPUINFO_H
+#define SRC_DAWN_COMMON_GPUINFO_H_
 
 #include <array>
 #include <cstdint>
@@ -63,4 +63,4 @@ namespace gpu_info {
     bool IsCoffeelake(PCIDeviceID deviceId);
 
 }  // namespace gpu_info
-#endif  // COMMON_GPUINFO_H
+#endif  // SRC_DAWN_COMMON_GPUINFO_H_

src/dawn/common/HashUtils.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_HASHUTILS_H_
+#ifndef SRC_DAWN_COMMON_HASHUTILS_H_
-#define COMMON_HASHUTILS_H_
+#define SRC_DAWN_COMMON_HASHUTILS_H_
 
 #include "dawn/common/Platform.h"
 #include "dawn/common/TypedInteger.h"
@@ -98,4 +98,4 @@ namespace std {
     };
 }  // namespace std
 
-#endif  // COMMON_HASHUTILS_H_
+#endif  // SRC_DAWN_COMMON_HASHUTILS_H_

src/dawn/common/IOKitRef.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_IOKITREF_H_
+#ifndef SRC_DAWN_COMMON_IOKITREF_H_
-#define COMMON_IOKITREF_H_
+#define SRC_DAWN_COMMON_IOKITREF_H_
 
 #include "dawn/common/RefBase.h"
 
@@ -43,4 +43,4 @@ IORef<T> AcquireIORef(T pointee) {
     return ref;
 }
 
-#endif  // COMMON_IOKITREF_H_
+#endif  // SRC_DAWN_COMMON_IOKITREF_H_

src/dawn/common/LinkedList.h

@@ -8,8 +8,8 @@
 //   - Added in list check before removing node to prevent segfault, now returns true iff removed
 //   - Added MoveInto functionality for moving list elements to another list
 
-#ifndef COMMON_LINKED_LIST_H
+#ifndef SRC_DAWN_COMMON_LINKEDLIST_H_
-#define COMMON_LINKED_LIST_H
+#define SRC_DAWN_COMMON_LINKEDLIST_H_
 
 #include "dawn/common/Assert.h"
 
@@ -271,4 +271,4 @@ LinkedListIterator<T> end(LinkedList<T>& l) {
     return LinkedListIterator<T>(l.tail()->next());
 }
 
-#endif  // COMMON_LINKED_LIST_H
+#endif  // SRC_DAWN_COMMON_LINKEDLIST_H_

src/dawn/common/Log.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_LOG_H_
+#ifndef SRC_DAWN_COMMON_LOG_H_
-#define COMMON_LOG_H_
+#define SRC_DAWN_COMMON_LOG_H_
 
 // Dawn targets shouldn't use iostream or printf directly for several reasons:
 //  - iostream adds static initializers which we want to avoid.
@@ -92,4 +92,4 @@ namespace dawn {
 
 }  // namespace dawn
 
-#endif  // COMMON_LOG_H_
+#endif  // SRC_DAWN_COMMON_LOG_H_

src/dawn/common/Math.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_MATH_H_
+#ifndef SRC_DAWN_COMMON_MATH_H_
-#define COMMON_MATH_H_
+#define SRC_DAWN_COMMON_MATH_H_
 
 #include "dawn/common/Assert.h"
 
@@ -104,4 +104,4 @@ constexpr bool IsSubset(T1 subset, T2 set) {
     return bitsAlsoInSet == subset;
 }
 
-#endif  // COMMON_MATH_H_
+#endif  // SRC_DAWN_COMMON_MATH_H_

src/dawn/common/NSRef.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_NSREF_H_
+#ifndef SRC_DAWN_COMMON_NSREF_H_
-#define COMMON_NSREF_H_
+#define SRC_DAWN_COMMON_NSREF_H_
 
 #include "dawn/common/RefBase.h"
 
@@ -120,4 +120,4 @@ NSPRef<T> AcquireNSPRef(T pointee) {
     return ref;
 }
 
-#endif  // COMMON_NSREF_H_
+#endif  // SRC_DAWN_COMMON_NSREF_H_

src/dawn/common/NonCopyable.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_NONCOPYABLE_H_
+#ifndef SRC_DAWN_COMMON_NONCOPYABLE_H_
-#define COMMON_NONCOPYABLE_H_
+#define SRC_DAWN_COMMON_NONCOPYABLE_H_
 
 // A base class to make a class non-copyable.
 class NonCopyable {
@@ -40,4 +40,4 @@ class NonMovable : NonCopyable {
     void operator=(NonMovable&&) = delete;
 };
 
-#endif
+#endif  // SRC_DAWN_COMMON_NONCOPYABLE_H_

src/dawn/common/PlacementAllocated.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_PLACEMENTALLOCATED_H_
+#ifndef SRC_DAWN_COMMON_PLACEMENTALLOCATED_H_
-#define COMMON_PLACEMENTALLOCATED_H_
+#define SRC_DAWN_COMMON_PLACEMENTALLOCATED_H_
 
 #include <cstddef>
 
@@ -39,4 +39,4 @@ class PlacementAllocated {
     }
 };
 
-#endif  // COMMON_PLACEMENTALLOCATED_H_
+#endif  // SRC_DAWN_COMMON_PLACEMENTALLOCATED_H_

src/dawn/common/Platform.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_PLATFORM_H_
+#ifndef SRC_DAWN_COMMON_PLATFORM_H_
-#define COMMON_PLATFORM_H_
+#define SRC_DAWN_COMMON_PLATFORM_H_
 
 #if defined(_WIN32) || defined(_WIN64)
 #    include <winapifamily.h>
@@ -79,4 +79,4 @@ static_assert(sizeof(sizeof(char)) == 4, "Expect sizeof(size_t) == 4");
 #    error "Unsupported platform"
 #endif
 
-#endif  // COMMON_PLATFORM_H_
+#endif  // SRC_DAWN_COMMON_PLATFORM_H_

src/dawn/common/Preprocessor.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_PREPROCESSOR_H_
+#ifndef SRC_DAWN_COMMON_PREPROCESSOR_H_
-#define COMMON_PREPROCESSOR_H_
+#define SRC_DAWN_COMMON_PREPROCESSOR_H_
 
 // DAWN_PP_GET_HEAD: get the first element of a __VA_ARGS__ without triggering empty
 // __VA_ARGS__ warnings.
@@ -67,4 +67,4 @@
 #define DAWN_PP_FOR_EACH(func, ...) \
     DAWN_PP_FOR_EACH_(DAWN_PP_FOR_EACH_NARG(__VA_ARGS__), func, __VA_ARGS__)
 
-#endif  // COMMON_PREPROCESSOR_H_
+#endif  // SRC_DAWN_COMMON_PREPROCESSOR_H_

src/dawn/common/RefBase.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_REFBASE_H_
+#ifndef SRC_DAWN_COMMON_REFBASE_H_
-#define COMMON_REFBASE_H_
+#define SRC_DAWN_COMMON_REFBASE_H_
 
 #include "dawn/common/Assert.h"
 #include "dawn/common/Compiler.h"
@@ -180,4 +180,4 @@ class RefBase {
     T mValue;
 };
 
-#endif  // COMMON_REFBASE_H_
+#endif  // SRC_DAWN_COMMON_REFBASE_H_

src/dawn/common/RefCounted.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_REFCOUNTED_H_
+#ifndef SRC_DAWN_COMMON_REFCOUNTED_H_
-#define COMMON_REFCOUNTED_H_
+#define SRC_DAWN_COMMON_REFCOUNTED_H_
 
 #include "dawn/common/RefBase.h"
 
@@ -66,4 +66,4 @@ Ref<T> AcquireRef(T* pointee) {
     return ref;
 }
 
-#endif  // COMMON_REFCOUNTED_H_
+#endif  // SRC_DAWN_COMMON_REFCOUNTED_H_

src/dawn/common/Result.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_RESULT_H_
+#ifndef SRC_DAWN_COMMON_RESULT_H_
-#define COMMON_RESULT_H_
+#define SRC_DAWN_COMMON_RESULT_H_
 
 #include "dawn/common/Assert.h"
 #include "dawn/common/Compiler.h"
@@ -523,4 +523,4 @@ std::unique_ptr<E> Result<T, E>::AcquireError() {
     return std::move(mError);
 }
 
-#endif  // COMMON_RESULT_H_
+#endif  // SRC_DAWN_COMMON_RESULT_H_

src/dawn/common/SerialMap.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_SERIALMAP_H_
+#ifndef SRC_DAWN_COMMON_SERIALMAP_H_
-#define COMMON_SERIALMAP_H_
+#define SRC_DAWN_COMMON_SERIALMAP_H_
 
 #include "dawn/common/SerialStorage.h"
 
@@ -73,4 +73,4 @@ void SerialMap<Serial, Value>::Enqueue(std::vector<Value>&& values, Serial seria
     }
 }
 
-#endif  // COMMON_SERIALMAP_H_
+#endif  // SRC_DAWN_COMMON_SERIALMAP_H_

src/dawn/common/SerialQueue.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_SERIALQUEUE_H_
+#ifndef SRC_DAWN_COMMON_SERIALQUEUE_H_
-#define COMMON_SERIALQUEUE_H_
+#define SRC_DAWN_COMMON_SERIALQUEUE_H_
 
 #include "dawn/common/SerialStorage.h"
 
@@ -82,4 +82,4 @@ void SerialQueue<Serial, Value>::Enqueue(std::vector<Value>&& values, Serial ser
     this->mStorage.emplace_back(serial, values);
 }
 
-#endif  // COMMON_SERIALQUEUE_H_
+#endif  // SRC_DAWN_COMMON_SERIALQUEUE_H_

src/dawn/common/SerialStorage.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_SERIALSTORAGE_H_
+#ifndef SRC_DAWN_COMMON_SERIALSTORAGE_H_
-#define COMMON_SERIALSTORAGE_H_
+#define SRC_DAWN_COMMON_SERIALSTORAGE_H_
 
 #include "dawn/common/Assert.h"
 
@@ -319,4 +319,4 @@ const typename SerialStorage<Derived>::Value& SerialStorage<Derived>::ConstItera
     return *mSerialIterator;
 }
 
-#endif  // COMMON_SERIALSTORAGE_H_
+#endif  // SRC_DAWN_COMMON_SERIALSTORAGE_H_

src/dawn/common/SlabAllocator.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_SLABALLOCATOR_H_
+#ifndef SRC_DAWN_COMMON_SLABALLOCATOR_H_
-#define COMMON_SLABALLOCATOR_H_
+#define SRC_DAWN_COMMON_SLABALLOCATOR_H_
 
 #include "dawn/common/PlacementAllocated.h"
 
@@ -181,4 +181,4 @@ class SlabAllocator : public SlabAllocatorImpl {
     }
 };
 
-#endif  // COMMON_SLABALLOCATOR_H_
+#endif  // SRC_DAWN_COMMON_SLABALLOCATOR_H_

src/dawn/common/StackContainer.h

@@ -4,8 +4,8 @@
 
 // This file is a modified copy of Chromium's /src/base/containers/stack_container.h
 
-#ifndef COMMON_STACKCONTAINER_H_
+#ifndef SRC_DAWN_COMMON_STACKCONTAINER_H_
-#define COMMON_STACKCONTAINER_H_
+#define SRC_DAWN_COMMON_STACKCONTAINER_H_
 
 #include "dawn/common/Compiler.h"
 
@@ -259,4 +259,4 @@ class StackVector
     StackVector& operator=(StackVector&& rhs) = delete;
 };
 
-#endif  // COMMON_STACKCONTAINER_H_
+#endif  // SRC_DAWN_COMMON_STACKCONTAINER_H_

src/dawn/common/SwapChainUtils.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_SWAPCHAINUTILS_H_
+#ifndef SRC_DAWN_COMMON_SWAPCHAINUTILS_H_
-#define COMMON_SWAPCHAINUTILS_H_
+#define SRC_DAWN_COMMON_SWAPCHAINUTILS_H_
 
 #include "dawn/dawn_wsi.h"
 
@@ -37,4 +37,4 @@ DawnSwapChainImplementation CreateSwapChainImplementation(T* swapChain) {
     return impl;
 }
 
-#endif  // COMMON_SWAPCHAINUTILS_H_
+#endif  // SRC_DAWN_COMMON_SWAPCHAINUTILS_H_

src/dawn/common/SystemUtils.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_SYSTEMUTILS_H_
+#ifndef SRC_DAWN_COMMON_SYSTEMUTILS_H_
-#define COMMON_SYSTEMUTILS_H_
+#define SRC_DAWN_COMMON_SYSTEMUTILS_H_
 
 #include "dawn/common/Platform.h"
 
@@ -54,4 +54,4 @@ class ScopedEnvironmentVar {
     bool mIsSet = false;
 };
 
-#endif  // COMMON_SYSTEMUTILS_H_
+#endif  // SRC_DAWN_COMMON_SYSTEMUTILS_H_

src/dawn/common/TypeTraits.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_TYPETRAITS_H_
+#ifndef SRC_DAWN_COMMON_TYPETRAITS_H_
-#define COMMON_TYPETRAITS_H_
+#define SRC_DAWN_COMMON_TYPETRAITS_H_
 
 #include <type_traits>
 
@@ -31,4 +31,4 @@ struct HasEqualityOperator<
     static constexpr const bool value = true;
 };
 
-#endif  // COMMON_TYPE_TRAITS_H_
+#endif  // SRC_DAWN_COMMON_TYPETRAITS_H_

src/dawn/common/TypedInteger.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_TYPEDINTEGER_H_
+#ifndef SRC_DAWN_COMMON_TYPEDINTEGER_H_
-#define COMMON_TYPEDINTEGER_H_
+#define SRC_DAWN_COMMON_TYPEDINTEGER_H_
 
 #include "dawn/common/Assert.h"
 #include "dawn/common/UnderlyingType.h"
@@ -259,4 +259,4 @@ namespace ityp {
 
 }  // namespace ityp
 
-#endif  // COMMON_TYPEDINTEGER_H_
+#endif  // SRC_DAWN_COMMON_TYPEDINTEGER_H_

src/dawn/common/UnderlyingType.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_UNDERLYINGTYPE_H_
+#ifndef SRC_DAWN_COMMON_UNDERLYINGTYPE_H_
-#define COMMON_UNDERLYINGTYPE_H_
+#define SRC_DAWN_COMMON_UNDERLYINGTYPE_H_
 
 #include <type_traits>
 
@@ -48,4 +48,4 @@ namespace detail {
 template <typename T>
 using UnderlyingType = typename detail::UnderlyingTypeImpl<T>::type;
 
-#endif  // COMMON_UNDERLYINGTYPE_H_
+#endif  // SRC_DAWN_COMMON_UNDERLYINGTYPE_H_

src/dawn/common/WindowsUtils.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_WINDOWSUTILS_H_
+#ifndef SRC_DAWN_COMMON_WINDOWSUTILS_H_
-#define COMMON_WINDOWSUTILS_H_
+#define SRC_DAWN_COMMON_WINDOWSUTILS_H_
 
 #include <string>
 
@@ -21,4 +21,4 @@ std::string WCharToUTF8(const wchar_t* input);
 
 std::wstring UTF8ToWStr(const char* input);
 
-#endif  // COMMON_WINDOWSUTILS_H_
+#endif  // SRC_DAWN_COMMON_WINDOWSUTILS_H_

src/dawn/common/ityp_array.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_ITYP_ARRAY_H_
+#ifndef SRC_DAWN_COMMON_ITYP_ARRAY_H_
-#define COMMON_ITYP_ARRAY_H_
+#define SRC_DAWN_COMMON_ITYP_ARRAY_H_
 
 #include "dawn/common/TypedInteger.h"
 #include "dawn/common/UnderlyingType.h"
@@ -95,4 +95,4 @@ namespace ityp {
 
 }  // namespace ityp
 
-#endif  // COMMON_ITYP_ARRAY_H_
+#endif  // SRC_DAWN_COMMON_ITYP_ARRAY_H_

src/dawn/common/ityp_bitset.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_ITYP_BITSET_H_
+#ifndef SRC_DAWN_COMMON_ITYP_BITSET_H_
-#define COMMON_ITYP_BITSET_H_
+#define SRC_DAWN_COMMON_ITYP_BITSET_H_
 
 #include "dawn/common/BitSetIterator.h"
 #include "dawn/common/TypedInteger.h"
@@ -185,4 +185,4 @@ Index GetHighestBitIndexPlusOne(const ityp::bitset<Index, N>& bitset) {
 #endif  // defined(DAWN_COMPILER_MSVC)
 }
 
-#endif  // COMMON_ITYP_BITSET_H_
+#endif  // SRC_DAWN_COMMON_ITYP_BITSET_H_

src/dawn/common/ityp_span.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_ITYP_SPAN_H_
+#ifndef SRC_DAWN_COMMON_ITYP_SPAN_H_
-#define COMMON_ITYP_SPAN_H_
+#define SRC_DAWN_COMMON_ITYP_SPAN_H_
 
 #include "dawn/common/TypedInteger.h"
 #include "dawn/common/UnderlyingType.h"
@@ -100,4 +100,4 @@ namespace ityp {
 
 }  // namespace ityp
 
-#endif  // COMMON_ITYP_SPAN_H_
+#endif  // SRC_DAWN_COMMON_ITYP_SPAN_H_

src/dawn/common/ityp_stack_vec.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_ITYP_STACK_VEC_H_
+#ifndef SRC_DAWN_COMMON_ITYP_STACK_VEC_H_
-#define COMMON_ITYP_STACK_VEC_H_
+#define SRC_DAWN_COMMON_ITYP_STACK_VEC_H_
 
 #include "dawn/common/Assert.h"
 #include "dawn/common/StackContainer.h"
@@ -100,4 +100,4 @@ namespace ityp {
 
 }  // namespace ityp
 
-#endif  // COMMON_ITYP_STACK_VEC_H_
+#endif  // SRC_DAWN_COMMON_ITYP_STACK_VEC_H_

src/dawn/common/ityp_vector.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_ITYP_VECTOR_H_
+#ifndef SRC_DAWN_COMMON_ITYP_VECTOR_H_
-#define COMMON_ITYP_VECTOR_H_
+#define SRC_DAWN_COMMON_ITYP_VECTOR_H_
 
 #include "dawn/common/TypedInteger.h"
 #include "dawn/common/UnderlyingType.h"
@@ -105,4 +105,4 @@ namespace ityp {
 
 }  // namespace ityp
 
-#endif  // COMMON_ITYP_VECTOR_H_
+#endif  // SRC_DAWN_COMMON_ITYP_VECTOR_H_

src/dawn/common/vulkan_platform.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_VULKANPLATFORM_H_
+#ifndef SRC_DAWN_COMMON_VULKAN_PLATFORM_H_
-#define COMMON_VULKANPLATFORM_H_
+#define SRC_DAWN_COMMON_VULKAN_PLATFORM_H_
 
 #if !defined(DAWN_ENABLE_BACKEND_VULKAN)
 #    error "vulkan_platform.h included without the Vulkan backend enabled"
@@ -203,4 +203,4 @@ static constexpr uint64_t VK_NULL_HANDLE = 0;
 #    error "Unsupported platform"
 #endif
 
-#endif  // COMMON_VULKANPLATFORM_H_
+#endif  // SRC_DAWN_COMMON_VULKAN_PLATFORM_H_

src/dawn/common/windows_with_undefs.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_WINDOWS_WITH_UNDEFS_H_
+#ifndef SRC_DAWN_COMMON_WINDOWS_WITH_UNDEFS_H_
-#define COMMON_WINDOWS_WITH_UNDEFS_H_
+#define SRC_DAWN_COMMON_WINDOWS_WITH_UNDEFS_H_
 
 #include "dawn/common/Platform.h"
 
@@ -35,4 +35,4 @@
 // Macro defined as an alias of GetTickCount
 #undef GetCurrentTime
 
-#endif  // COMMON_WINDOWS_WITH_UNDEFS_H_
+#endif  // SRC_DAWN_COMMON_WINDOWS_WITH_UNDEFS_H_

src/dawn/common/xlib_with_undefs.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef COMMON_XLIB_WITH_UNDEFS_H_
+#ifndef SRC_DAWN_COMMON_XLIB_WITH_UNDEFS_H_
-#define COMMON_XLIB_WITH_UNDEFS_H_
+#define SRC_DAWN_COMMON_XLIB_WITH_UNDEFS_H_
 
 #include "dawn/common/Platform.h"
 
@@ -37,4 +37,4 @@
 
 using XErrorHandler = int (*)(Display*, XErrorEvent*);
 
-#endif  // COMMON_XLIB_WITH_UNDEFS_H_
+#endif  // SRC_DAWN_COMMON_XLIB_WITH_UNDEFS_H_

src/dawn/fuzzers/DawnWireServerFuzzer.h

@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifndef SRC_DAWN_FUZZERS_DAWNWIRESERVERFUZZER_H_
+#define SRC_DAWN_FUZZERS_DAWNWIRESERVERFUZZER_H_
+
 #include "dawn/webgpu_cpp.h"
 
 #include <cstdint>
@@ -32,3 +35,5 @@ namespace DawnWireServerFuzzer {
     int Run(const uint8_t* data, size_t size, MakeDeviceFn MakeDevice, bool supportsErrorInjection);
 
 }  // namespace DawnWireServerFuzzer
+
+#endif  // SRC_DAWN_FUZZERS_DAWNWIRESERVERFUZZER_H_

src/dawn/native/Adapter.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_ADAPTER_H_
+#ifndef SRC_DAWN_NATIVE_ADAPTER_H_
-#define DAWNNATIVE_ADAPTER_H_
+#define SRC_DAWN_NATIVE_ADAPTER_H_
 
 #include "dawn/native/DawnNative.h"
 
@@ -96,4 +96,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_ADAPTER_H_
+#endif  // SRC_DAWN_NATIVE_ADAPTER_H_

src/dawn/native/AsyncTask.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_ASYC_TASK_H_
+#ifndef SRC_DAWN_NATIVE_ASYNCTASK_H_
-#define DAWNNATIVE_ASYC_TASK_H_
+#define SRC_DAWN_NATIVE_ASYNCTASK_H_
 
 #include <functional>
 #include <memory>
@@ -62,4 +62,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif
+#endif  // SRC_DAWN_NATIVE_ASYNCTASK_H_

src/dawn/native/AttachmentState.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_ATTACHMENTSTATE_H_
+#ifndef SRC_DAWN_NATIVE_ATTACHMENTSTATE_H_
-#define DAWNNATIVE_ATTACHMENTSTATE_H_
+#define SRC_DAWN_NATIVE_ATTACHMENTSTATE_H_
 
 #include "dawn/common/Constants.h"
 #include "dawn/common/ityp_array.h"
@@ -80,4 +80,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_ATTACHMENTSTATE_H_
+#endif  // SRC_DAWN_NATIVE_ATTACHMENTSTATE_H_

src/dawn/native/BackendConnection.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_BACKENDCONNECTION_H_
+#ifndef SRC_DAWN_NATIVE_BACKENDCONNECTION_H_
-#define DAWNNATIVE_BACKENDCONNECTION_H_
+#define SRC_DAWN_NATIVE_BACKENDCONNECTION_H_
 
 #include "dawn/native/Adapter.h"
 #include "dawn/native/DawnNative.h"
@@ -47,4 +47,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_BACKENDCONNECTION_H_
+#endif  // SRC_DAWN_NATIVE_BACKENDCONNECTION_H_

src/dawn/native/BindGroup.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_BINDGROUP_H_
+#ifndef SRC_DAWN_NATIVE_BINDGROUP_H_
-#define DAWNNATIVE_BINDGROUP_H_
+#define SRC_DAWN_NATIVE_BINDGROUP_H_
 
 #include "dawn/common/Constants.h"
 #include "dawn/common/Math.h"
@@ -93,4 +93,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_BINDGROUP_H_
+#endif  // SRC_DAWN_NATIVE_BINDGROUP_H_

src/dawn/native/BindGroupLayout.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_BINDGROUPLAYOUT_H_
+#ifndef SRC_DAWN_NATIVE_BINDGROUPLAYOUT_H_
-#define DAWNNATIVE_BINDGROUPLAYOUT_H_
+#define SRC_DAWN_NATIVE_BINDGROUPLAYOUT_H_
 
 #include "dawn/common/Constants.h"
 #include "dawn/common/Math.h"
@@ -167,4 +167,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_BINDGROUPLAYOUT_H_
+#endif  // SRC_DAWN_NATIVE_BINDGROUPLAYOUT_H_

src/dawn/native/BindGroupTracker.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_BINDGROUPTRACKER_H_
+#ifndef SRC_DAWN_NATIVE_BINDGROUPTRACKER_H_
-#define DAWNNATIVE_BINDGROUPTRACKER_H_
+#define SRC_DAWN_NATIVE_BINDGROUPTRACKER_H_
 
 #include "dawn/common/Constants.h"
 #include "dawn/native/BindGroupLayout.h"
@@ -139,4 +139,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_BINDGROUPTRACKER_H_
+#endif  // SRC_DAWN_NATIVE_BINDGROUPTRACKER_H_

src/dawn/native/BindingInfo.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_BINDINGINFO_H_
+#ifndef SRC_DAWN_NATIVE_BINDINGINFO_H_
-#define DAWNNATIVE_BINDINGINFO_H_
+#define SRC_DAWN_NATIVE_BINDINGINFO_H_
 
 #include "dawn/common/Constants.h"
 #include "dawn/common/ityp_array.h"
@@ -95,4 +95,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_BINDINGINFO_H_
+#endif  // SRC_DAWN_NATIVE_BINDINGINFO_H_

src/dawn/native/BuddyAllocator.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_BUDDYALLOCATOR_H_
+#ifndef SRC_DAWN_NATIVE_BUDDYALLOCATOR_H_
-#define DAWNNATIVE_BUDDYALLOCATOR_H_
+#define SRC_DAWN_NATIVE_BUDDYALLOCATOR_H_
 
 #include <cstddef>
 #include <cstdint>
@@ -114,4 +114,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_BUDDYALLOCATOR_H_
+#endif  // SRC_DAWN_NATIVE_BUDDYALLOCATOR_H_

src/dawn/native/BuddyMemoryAllocator.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_BUDDYMEMORYALLOCATOR_H_
+#ifndef SRC_DAWN_NATIVE_BUDDYMEMORYALLOCATOR_H_
-#define DAWNNATIVE_BUDDYMEMORYALLOCATOR_H_
+#define SRC_DAWN_NATIVE_BUDDYMEMORYALLOCATOR_H_
 
 #include "dawn/native/BuddyAllocator.h"
 #include "dawn/native/Error.h"
@@ -71,4 +71,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_BUDDYMEMORYALLOCATOR_H_
+#endif  // SRC_DAWN_NATIVE_BUDDYMEMORYALLOCATOR_H_

src/dawn/native/Buffer.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_BUFFER_H_
+#ifndef SRC_DAWN_NATIVE_BUFFER_H_
-#define DAWNNATIVE_BUFFER_H_
+#define SRC_DAWN_NATIVE_BUFFER_H_
 
 #include "dawn/native/Error.h"
 #include "dawn/native/Forward.h"
@@ -132,4 +132,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_BUFFER_H_
+#endif  // SRC_DAWN_NATIVE_BUFFER_H_

src/dawn/native/CacheKey.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_CACHE_KEY_H_
+#ifndef SRC_DAWN_NATIVE_CACHEKEY_H_
-#define DAWNNATIVE_CACHE_KEY_H_
+#define SRC_DAWN_NATIVE_CACHEKEY_H_
 
 #include <iostream>
 #include <limits>
@@ -131,4 +131,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_CACHE_KEY_H_
+#endif  // SRC_DAWN_NATIVE_CACHEKEY_H_

src/dawn/native/CachedObject.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_CACHED_OBJECT_H_
+#ifndef SRC_DAWN_NATIVE_CACHEDOBJECT_H_
-#define DAWNNATIVE_CACHED_OBJECT_H_
+#define SRC_DAWN_NATIVE_CACHEDOBJECT_H_
 
 #include "dawn/native/CacheKey.h"
 #include "dawn/native/Forward.h"
@@ -62,4 +62,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_CACHED_OBJECT_H_
+#endif  // SRC_DAWN_NATIVE_CACHEDOBJECT_H_

src/dawn/native/CallbackTaskManager.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_CALLBACK_TASK_MANAGER_H_
+#ifndef SRC_DAWN_NATIVE_CALLBACKTASKMANAGER_H_
-#define DAWNNATIVE_CALLBACK_TASK_MANAGER_H_
+#define SRC_DAWN_NATIVE_CALLBACKTASKMANAGER_H_
 
 #include <memory>
 #include <mutex>
@@ -42,4 +42,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif
+#endif  // SRC_DAWN_NATIVE_CALLBACKTASKMANAGER_H_

src/dawn/native/CommandAllocator.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_COMMAND_ALLOCATOR_H_
+#ifndef SRC_DAWN_NATIVE_COMMANDALLOCATOR_H_
-#define DAWNNATIVE_COMMAND_ALLOCATOR_H_
+#define SRC_DAWN_NATIVE_COMMANDALLOCATOR_H_
 
 #include "dawn/common/Assert.h"
 #include "dawn/common/Math.h"
@@ -270,4 +270,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_COMMAND_ALLOCATOR_H_
+#endif  // SRC_DAWN_NATIVE_COMMANDALLOCATOR_H_

src/dawn/native/CommandBuffer.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_COMMANDBUFFER_H_
+#ifndef SRC_DAWN_NATIVE_COMMANDBUFFER_H_
-#define DAWNNATIVE_COMMANDBUFFER_H_
+#define SRC_DAWN_NATIVE_COMMANDBUFFER_H_
 
 #include "dawn/native/dawn_platform.h"
 
@@ -73,4 +73,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_COMMANDBUFFER_H_
+#endif  // SRC_DAWN_NATIVE_COMMANDBUFFER_H_

src/dawn/native/CommandBufferStateTracker.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_COMMANDBUFFERSTATETRACKER_H
+#ifndef SRC_DAWN_NATIVE_COMMANDBUFFERSTATETRACKER_H_
-#define DAWNNATIVE_COMMANDBUFFERSTATETRACKER_H
+#define SRC_DAWN_NATIVE_COMMANDBUFFERSTATETRACKER_H_
 
 #include "dawn/common/Constants.h"
 #include "dawn/common/ityp_array.h"
@@ -83,4 +83,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_COMMANDBUFFERSTATETRACKER_H
+#endif  // SRC_DAWN_NATIVE_COMMANDBUFFERSTATETRACKER_H_

src/dawn/native/CommandEncoder.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_COMMANDENCODER_H_
+#ifndef SRC_DAWN_NATIVE_COMMANDENCODER_H_
-#define DAWNNATIVE_COMMANDENCODER_H_
+#define SRC_DAWN_NATIVE_COMMANDENCODER_H_
 
 #include "dawn/native/dawn_platform.h"
 
@@ -119,4 +119,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_COMMANDENCODER_H_
+#endif  // SRC_DAWN_NATIVE_COMMANDENCODER_H_

src/dawn/native/CommandValidation.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_COMMANDVALIDATION_H_
+#ifndef SRC_DAWN_NATIVE_COMMANDVALIDATION_H_
-#define DAWNNATIVE_COMMANDVALIDATION_H_
+#define SRC_DAWN_NATIVE_COMMANDVALIDATION_H_
 
 #include "dawn/native/CommandAllocator.h"
 #include "dawn/native/Error.h"
@@ -87,4 +87,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_COMMANDVALIDATION_H_
+#endif  // SRC_DAWN_NATIVE_COMMANDVALIDATION_H_

src/dawn/native/Commands.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_COMMANDS_H_
+#ifndef SRC_DAWN_NATIVE_COMMANDS_H_
-#define DAWNNATIVE_COMMANDS_H_
+#define SRC_DAWN_NATIVE_COMMANDS_H_
 
 #include "dawn/common/Constants.h"
 
@@ -299,4 +299,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_COMMANDS_H_
+#endif  // SRC_DAWN_NATIVE_COMMANDS_H_

src/dawn/native/CompilationMessages.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_COMPILATIONMESSAGES_H_
+#ifndef SRC_DAWN_NATIVE_COMPILATIONMESSAGES_H_
-#define DAWNNATIVE_COMPILATIONMESSAGES_H_
+#define SRC_DAWN_NATIVE_COMPILATIONMESSAGES_H_
 
 #include "dawn/native/dawn_platform.h"
 
@@ -59,4 +59,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_COMPILATIONMESSAGES_H_
+#endif  // SRC_DAWN_NATIVE_COMPILATIONMESSAGES_H_

src/dawn/native/ComputePassEncoder.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_COMPUTEPASSENCODER_H_
+#ifndef SRC_DAWN_NATIVE_COMPUTEPASSENCODER_H_
-#define DAWNNATIVE_COMPUTEPASSENCODER_H_
+#define SRC_DAWN_NATIVE_COMPUTEPASSENCODER_H_
 
 #include "dawn/native/CommandBufferStateTracker.h"
 #include "dawn/native/Error.h"
@@ -95,4 +95,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_COMPUTEPASSENCODER_H_
+#endif  // SRC_DAWN_NATIVE_COMPUTEPASSENCODER_H_

src/dawn/native/ComputePipeline.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_COMPUTEPIPELINE_H_
+#ifndef SRC_DAWN_NATIVE_COMPUTEPIPELINE_H_
-#define DAWNNATIVE_COMPUTEPIPELINE_H_
+#define SRC_DAWN_NATIVE_COMPUTEPIPELINE_H_
 
 #include "dawn/common/NonCopyable.h"
 #include "dawn/native/Forward.h"
@@ -52,4 +52,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_COMPUTEPIPELINE_H_
+#endif  // SRC_DAWN_NATIVE_COMPUTEPIPELINE_H_

src/dawn/native/CopyTextureForBrowserHelper.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_COPYTEXTUREFORBROWSERHELPER_H_
+#ifndef SRC_DAWN_NATIVE_COPYTEXTUREFORBROWSERHELPER_H_
-#define DAWNNATIVE_COPYTEXTUREFORBROWSERHELPER_H_
+#define SRC_DAWN_NATIVE_COPYTEXTUREFORBROWSERHELPER_H_
 
 #include "dawn/native/Error.h"
 #include "dawn/native/ObjectBase.h"
@@ -38,4 +38,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_COPYTEXTUREFORBROWSERHELPER_H_
+#endif  // SRC_DAWN_NATIVE_COPYTEXTUREFORBROWSERHELPER_H_

src/dawn/native/CreatePipelineAsyncTask.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_CREATEPIPELINEASYNCTASK_H_
+#ifndef SRC_DAWN_NATIVE_CREATEPIPELINEASYNCTASK_H_
-#define DAWNNATIVE_CREATEPIPELINEASYNCTASK_H_
+#define SRC_DAWN_NATIVE_CREATEPIPELINEASYNCTASK_H_
 
 #include "dawn/common/RefCounted.h"
 #include "dawn/native/CallbackTaskManager.h"
@@ -105,4 +105,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_CREATEPIPELINEASYNCTASK_H_
+#endif  // SRC_DAWN_NATIVE_CREATEPIPELINEASYNCTASK_H_

src/dawn/native/Device.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_DEVICE_H_
+#ifndef SRC_DAWN_NATIVE_DEVICE_H_
-#define DAWNNATIVE_DEVICE_H_
+#define SRC_DAWN_NATIVE_DEVICE_H_
 
 #include "dawn/native/Commands.h"
 #include "dawn/native/ComputePipeline.h"
@@ -552,4 +552,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_DEVICE_H_
+#endif  // SRC_DAWN_NATIVE_DEVICE_H_

src/dawn/native/DynamicUploader.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_DYNAMICUPLOADER_H_
+#ifndef SRC_DAWN_NATIVE_DYNAMICUPLOADER_H_
-#define DAWNNATIVE_DYNAMICUPLOADER_H_
+#define SRC_DAWN_NATIVE_DYNAMICUPLOADER_H_
 
 #include "dawn/native/Forward.h"
 #include "dawn/native/IntegerTypes.h"
@@ -63,4 +63,4 @@ namespace dawn::native {
     };
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_DYNAMICUPLOADER_H_
+#endif  // SRC_DAWN_NATIVE_DYNAMICUPLOADER_H_

src/dawn/native/EncodingContext.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_ENCODINGCONTEXT_H_
+#ifndef SRC_DAWN_NATIVE_ENCODINGCONTEXT_H_
-#define DAWNNATIVE_ENCODINGCONTEXT_H_
+#define SRC_DAWN_NATIVE_ENCODINGCONTEXT_H_
 
 #include "dawn/native/CommandAllocator.h"
 #include "dawn/native/Error.h"
@@ -179,4 +179,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_ENCODINGCONTEXT_H_
+#endif  // SRC_DAWN_NATIVE_ENCODINGCONTEXT_H_

src/dawn/native/EnumClassBitmasks.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_ENUMCLASSBITMASK_H_
+#ifndef SRC_DAWN_NATIVE_ENUMCLASSBITMASKS_H_
-#define DAWNNATIVE_ENUMCLASSBITMASK_H_
+#define SRC_DAWN_NATIVE_ENUMCLASSBITMASKS_H_
 
 #include "dawn/EnumClassBitmasks.h"
 
@@ -36,4 +36,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_ENUMCLASSBITMASK_H_
+#endif  // SRC_DAWN_NATIVE_ENUMCLASSBITMASKS_H_

src/dawn/native/EnumMaskIterator.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_ENUMMASKITERATOR_H_
+#ifndef SRC_DAWN_NATIVE_ENUMMASKITERATOR_H_
-#define DAWNNATIVE_ENUMMASKITERATOR_H_
+#define SRC_DAWN_NATIVE_ENUMMASKITERATOR_H_
 
 #include "dawn/common/BitSetIterator.h"
 #include "dawn/native/EnumClassBitmasks.h"
@@ -79,4 +79,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_ENUMMASKITERATOR_H_
+#endif  // SRC_DAWN_NATIVE_ENUMMASKITERATOR_H_

src/dawn/native/Error.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_ERROR_H_
+#ifndef SRC_DAWN_NATIVE_ERROR_H_
-#define DAWNNATIVE_ERROR_H_
+#define SRC_DAWN_NATIVE_ERROR_H_
 
 #include "absl/strings/str_format.h"
 #include "dawn/common/Result.h"
@@ -191,4 +191,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_ERROR_H_
+#endif  // SRC_DAWN_NATIVE_ERROR_H_

src/dawn/native/ErrorData.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_ERRORDATA_H_
+#ifndef SRC_DAWN_NATIVE_ERRORDATA_H_
-#define DAWNNATIVE_ERRORDATA_H_
+#define SRC_DAWN_NATIVE_ERRORDATA_H_
 
 #include "dawn/common/Compiler.h"
 
@@ -67,4 +67,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_ERRORDATA_H_
+#endif  // SRC_DAWN_NATIVE_ERRORDATA_H_

src/dawn/native/ErrorInjector.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_ERRORINJECTOR_H_
+#ifndef SRC_DAWN_NATIVE_ERRORINJECTOR_H_
-#define DAWNNATIVE_ERRORINJECTOR_H_
+#define SRC_DAWN_NATIVE_ERRORINJECTOR_H_
 
 #include <stdint.h>
 #include <type_traits>
@@ -65,4 +65,4 @@ namespace dawn::native {
 
 #endif
 
-#endif  // DAWNNATIVE_ERRORINJECTOR_H_
+#endif  // SRC_DAWN_NATIVE_ERRORINJECTOR_H_

src/dawn/native/ErrorScope.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_ERRORSCOPE_H_
+#ifndef SRC_DAWN_NATIVE_ERRORSCOPE_H_
-#define DAWNNATIVE_ERRORSCOPE_H_
+#define SRC_DAWN_NATIVE_ERRORSCOPE_H_
 
 #include "dawn/native/dawn_platform.h"
 
@@ -54,4 +54,4 @@ namespace dawn::native {
 
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_ERRORSCOPE_H_
+#endif  // SRC_DAWN_NATIVE_ERRORSCOPE_H_

src/dawn/native/ExternalTexture.h

@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DAWNNATIVE_EXTERNALTEXTURE_H_
+#ifndef SRC_DAWN_NATIVE_EXTERNALTEXTURE_H_
-#define DAWNNATIVE_EXTERNALTEXTURE_H_
+#define SRC_DAWN_NATIVE_EXTERNALTEXTURE_H_
 
 #include "dawn/native/Error.h"
 #include "dawn/native/Forward.h"
@@ -74,4 +74,4 @@ namespace dawn::native {
     };
 }  // namespace dawn::native
 
-#endif  // DAWNNATIVE_EXTERNALTEXTURE_H_
+#endif  // SRC_DAWN_NATIVE_EXTERNALTEXTURE_H_