diff --git a/src/main/java/BUILD b/src/main/java/BUILD
index 9c7214a..b631176 100644
--- a/src/main/java/BUILD
+++ b/src/main/java/BUILD
@@ -114,13 +114,8 @@
 )
 
 java_library(
-    name = "packages",
-    srcs = glob([
-        "com/google/devtools/build/lib/packages/*.java",
-        "com/google/devtools/build/lib/pkgcache/*.java",
-        "com/google/devtools/build/lib/syntax/*.java",
-    ]),
-    exports = [":cmdline"],
+    name = "syntax",
+    srcs = glob(["com/google/devtools/build/lib/syntax/*.java"]),
     deps = [
         ":cmdline",
         ":collect",
@@ -137,6 +132,31 @@
 )
 
 java_library(
+    name = "packages",
+    srcs = glob([
+        "com/google/devtools/build/lib/packages/*.java",
+        "com/google/devtools/build/lib/pkgcache/*.java",
+    ]),
+    exports = [
+        ":cmdline",
+        ":syntax",
+    ],
+    deps = [
+        ":cmdline",
+        ":collect",
+        ":common",
+        ":concurrent",
+        ":events",
+        ":options",
+        ":syntax",
+        ":vfs",
+        "//src/main/protobuf:proto_build",
+        "//third_party:guava",
+        "//third_party:jsr305",
+    ],
+)
+
+java_library(
     name = "unix",
     srcs = glob([
         "com/google/devtools/build/lib/unix/*.java",