diff --git a/src/ast/if_statement.h b/src/ast/if_statement.h
index f173de4..3ee40f8 100644
--- a/src/ast/if_statement.h
+++ b/src/ast/if_statement.h
@@ -1,4 +1,4 @@
-﻿// Copyright 2020 The Tint Authors.
+// Copyright 2020 The Tint Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
diff --git a/src/ast/variable.h b/src/ast/variable.h
index 6db32e4..b84ef82 100644
--- a/src/ast/variable.h
+++ b/src/ast/variable.h
@@ -1,4 +1,4 @@
-﻿// Copyright 2020 The Tint Authors.
+// Copyright 2020 The Tint Authors.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -55,7 +55,7 @@
 /// 3. A formal parameter to a function is a name for a typed value to
 ///    be passed into a function.  Example:
 ///
-///       fn twice(a: i32) -> i32 { // "a:i32" is the formal parameter
+///       fn twice(a: i32) -> i32 {  // "a:i32" is the formal parameter
 ///         return a + a;
 ///       }
 ///
diff --git a/src/reader/spirv/function.cc b/src/reader/spirv/function.cc
index 0f24f12..e6eb339 100644
--- a/src/reader/spirv/function.cc
+++ b/src/reader/spirv/function.cc
@@ -337,23 +337,23 @@
   // glsl.std.450 readonly function
 
   // Instructions:
-  // 	OpCopyObject
-  // 	OpUndef
-  // 	OpBitcast
-  // 	OpSatConvertSToU
-  // 	OpSatConvertUToS
-  // 	OpSatConvertFToS
-  // 	OpSatConvertFToU
-  // 	OpSatConvertSToF
-  // 	OpSatConvertUToF
-  // 	OpUConvert
-  // 	OpSConvert
-  // 	OpFConvert
-  // 	OpConvertPtrToU // Not in WebGPU
-  // 	OpConvertUToPtr // Not in WebGPU
-  // 	OpPtrCastToGeneric // Not in Vulkan
-  // 	OpGenericCastToPtr // Not in Vulkan
-  // 	OpGenericCastToPtrExplicit // Not in Vulkan
+  //    OpCopyObject
+  //    OpUndef
+  //    OpBitcast
+  //    OpSatConvertSToU
+  //    OpSatConvertUToS
+  //    OpSatConvertFToS
+  //    OpSatConvertFToU
+  //    OpSatConvertSToF
+  //    OpSatConvertUToF
+  //    OpUConvert
+  //    OpSConvert
+  //    OpFConvert
+  //    OpConvertPtrToU // Not in WebGPU
+  //    OpConvertUToPtr // Not in WebGPU
+  //    OpPtrCastToGeneric // Not in Vulkan
+  //    OpGenericCastToPtr // Not in Vulkan
+  //    OpGenericCastToPtrExplicit // Not in Vulkan
   //
   //    OpAccessChain
   //    OpInBoundsAccessChain
diff --git a/src/reader/spirv/function.h b/src/reader/spirv/function.h
index b5d5886..a22140c 100644
--- a/src/reader/spirv/function.h
+++ b/src/reader/spirv/function.h
@@ -16,6 +16,8 @@
 #define SRC_READER_SPIRV_FUNCTION_H_
 
 #include <memory>
+#include <unordered_map>
+#include <unordered_set>
 #include <vector>
 
 #include "source/opt/basic_block.h"