diff --git a/WORKSPACE b/WORKSPACE
index 252b127..50900f7 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -22,7 +22,6 @@
 
 load(
     "@com_googlesource_gerrit_bazlets//tools:maven_jar.bzl",
-    "GERRIT",
     "MAVEN_CENTRAL",
     "maven_jar",
 )
diff --git a/java/com/google/gitiles/BUILD b/java/com/google/gitiles/BUILD
index 8ec9118..141c95e 100644
--- a/java/com/google/gitiles/BUILD
+++ b/java/com/google/gitiles/BUILD
@@ -1,3 +1,6 @@
+load("@com_googlesource_gerrit_bazlets//tools:javadoc.bzl", "java_doc")
+load("//tools:stamper.bzl", "stamp")
+
 DEPS = [
     "//lib:autolink",
     "//lib:commons-lang3",
@@ -40,8 +43,6 @@
     ],
 )
 
-load("@com_googlesource_gerrit_bazlets//tools:javadoc.bzl", "java_doc")
-
 java_doc(
     name = "servlet-javadoc",
     libs = DEPS + [
@@ -52,8 +53,6 @@
     visibility = ["//visibility:public"],
 )
 
-load("//tools:stamper.bzl", "stamp")
-
 stamp(
     name = "servlet",
     workspace = "gitiles",
diff --git a/java/com/google/gitiles/blame/cache/BUILD b/java/com/google/gitiles/blame/cache/BUILD
index 33a4797..ab91f8a 100644
--- a/java/com/google/gitiles/blame/cache/BUILD
+++ b/java/com/google/gitiles/blame/cache/BUILD
@@ -1,3 +1,6 @@
+load("@com_googlesource_gerrit_bazlets//tools:javadoc.bzl", "java_doc")
+load("//tools:stamper.bzl", "stamp")
+
 java_library(
     name = "cache",
     srcs = glob(["**/*.java"]),
@@ -8,8 +11,6 @@
     ],
 )
 
-load("@com_googlesource_gerrit_bazlets//tools:javadoc.bzl", "java_doc")
-
 java_doc(
     name = "cache-javadoc",
     libs = [
@@ -22,8 +23,6 @@
     visibility = ["//visibility:public"],
 )
 
-load("//tools:stamper.bzl", "stamp")
-
 stamp(
     name = "cache",
     workspace = "gitiles",
diff --git a/javatests/com/google/gitiles/BUILD b/javatests/com/google/gitiles/BUILD
index 8e18655..da6c034 100644
--- a/javatests/com/google/gitiles/BUILD
+++ b/javatests/com/google/gitiles/BUILD
@@ -1,3 +1,5 @@
+load("@com_googlesource_gerrit_bazlets//tools:junit.bzl", "junit_tests")
+
 DEPS = [
     "//lib:gson",
     "//lib:guava",
@@ -22,8 +24,6 @@
     ],
 )
 
-load("@com_googlesource_gerrit_bazlets//tools:junit.bzl", "junit_tests")
-
 junit_tests(
     name = "servlet_tests",
     srcs = glob(
diff --git a/tools/maven/BUILD b/tools/maven/BUILD
index 50a343d..eecdda0 100644
--- a/tools/maven/BUILD
+++ b/tools/maven/BUILD
@@ -1,5 +1,5 @@
-load("//:version.bzl", "GITILES_VERSION")
 load("@com_googlesource_gerrit_bazlets//tools/maven:package.bzl", "maven_package")
+load("//:version.bzl", "GITILES_VERSION")
 
 maven_package(
     src = {