diff --git a/src/reader/spirv/parser_impl_test.cc b/src/reader/spirv/parser_impl_test.cc
index fa35918aaf..4d4138f6fc 100644
--- a/src/reader/spirv/parser_impl_test.cc
+++ b/src/reader/spirv/parser_impl_test.cc
@@ -206,7 +206,7 @@ TEST_F(SpvParserTest, Impl_Source_InvalidId) {
 }
 
 TEST_F(SpvParserTest, Impl_IsValidIdentifier) {
-  EXPECT_FALSE(ParserImpl::IsValidIdentifier(""));     // empty
+  EXPECT_FALSE(ParserImpl::IsValidIdentifier(""));  // empty
   EXPECT_FALSE(
       ParserImpl::IsValidIdentifier("_"));  // leading underscore, but ok later
   EXPECT_FALSE(
diff --git a/src/validator_impl.cc b/src/validator_impl.cc
index 624793c98b..d3d404d1ce 100644
--- a/src/validator_impl.cc
+++ b/src/validator_impl.cc
@@ -12,9 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <cassert>
 #include "src/validator_impl.h"
+
+#include <cassert>
 #include <unordered_set>
+
 #include "src/ast/call_statement.h"
 #include "src/ast/function.h"
 #include "src/ast/int_literal.h"