diff --git a/ReactAndroid/src/main/java/com/facebook/react/BUCK b/ReactAndroid/src/main/java/com/facebook/react/BUCK
index b96d08966..03be8543b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/BUCK
@@ -1,9 +1,15 @@
 include_defs('//ReactAndroid/DEFS')
 
 DEPS = [
-  react_native_target('java/com/facebook/react/cxxbridge:bridge'),
+  react_native_dep('java/com/facebook/systrace:systrace'),
+  react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'),
+  react_native_dep('libraries/soloader/java/com/facebook/soloader:soloader'),
+  react_native_dep('third-party/android/support/v4:lib-support-v4'),
+  react_native_dep('third-party/java/infer-annotations:infer-annotations'),
+  react_native_dep('third-party/java/jsr-305:jsr-305'),
   react_native_target('java/com/facebook/react/bridge:bridge'),
   react_native_target('java/com/facebook/react/common:common'),
+  react_native_target('java/com/facebook/react/cxxbridge:bridge'),
   react_native_target('java/com/facebook/react/devsupport:devsupport'),
   react_native_target('java/com/facebook/react/jstasks:jstasks'),
   react_native_target('java/com/facebook/react/module/annotations:annotations'),
@@ -12,14 +18,8 @@ DEPS = [
   react_native_target('java/com/facebook/react/modules/debug:debug'),
   react_native_target('java/com/facebook/react/modules/systeminfo:systeminfo'),
   react_native_target('java/com/facebook/react/modules/toast:toast'),
-  react_native_target('java/com/facebook/react/views/imagehelper:imagehelper'),
   react_native_target('java/com/facebook/react/uimanager:uimanager'),
-  react_native_dep('java/com/facebook/systrace:systrace'),
-  react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'),
-  react_native_dep('libraries/soloader/java/com/facebook/soloader:soloader'),
-  react_native_dep('third-party/android/support/v4:lib-support-v4'),
-  react_native_dep('third-party/java/infer-annotations:infer-annotations'),
-  react_native_dep('third-party/java/jsr-305:jsr-305'),
+  react_native_target('java/com/facebook/react/views/imagehelper:imagehelper'),
 ]
 
 android_library(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/animation/BUCK b/ReactAndroid/src/main/java/com/facebook/react/animation/BUCK
index 6a3307d02..4c8c0f71c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animation/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/animation/BUCK
@@ -4,9 +4,9 @@ android_library(
   name = 'animation',
   srcs = glob(['**/*.java']),
   deps = [
-    react_native_target('java/com/facebook/react/bridge:bridge'),
     react_native_dep('third-party/java/infer-annotations:infer-annotations'),
     react_native_dep('third-party/java/jsr-305:jsr-305'),
+    react_native_target('java/com/facebook/react/bridge:bridge'),
   ],
   visibility = [
     'PUBLIC'
diff --git a/ReactAndroid/src/main/java/com/facebook/react/jstasks/BUCK b/ReactAndroid/src/main/java/com/facebook/react/jstasks/BUCK
index 09359c749..38b46d877 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/jstasks/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/jstasks/BUCK
@@ -1,12 +1,12 @@
 include_defs('//ReactAndroid/DEFS')
 
 DEPS = [
-  react_native_target('java/com/facebook/react/bridge:bridge'),
-  react_native_target('java/com/facebook/react/common:common'),
-  react_native_target('java/com/facebook/react/uimanager:uimanager'),
   react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'),
   react_native_dep('third-party/java/infer-annotations:infer-annotations'),
   react_native_dep('third-party/java/jsr-305:jsr-305'),
+  react_native_target('java/com/facebook/react/bridge:bridge'),
+  react_native_target('java/com/facebook/react/common:common'),
+  react_native_target('java/com/facebook/react/uimanager:uimanager'),
 ]
 
 android_library(
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/common/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/common/BUCK
index ed2454fac..880aa61af 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/common/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/common/BUCK
@@ -4,11 +4,11 @@ android_library(
   name = 'common',
   srcs = glob(['**/*.java']),
   deps = [
-    react_native_target('java/com/facebook/react/bridge:bridge'),
-    react_native_target('java/com/facebook/react/common:common'),
     react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'),
     react_native_dep('third-party/java/infer-annotations:infer-annotations'),
     react_native_dep('third-party/java/jsr-305:jsr-305'),
+    react_native_target('java/com/facebook/react/bridge:bridge'),
+    react_native_target('java/com/facebook/react/common:common'),
   ],
   visibility = [
     'PUBLIC',
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK
index 6c5cf2424..3a2bd8570 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/core/BUCK
@@ -10,9 +10,9 @@ android_library(
     react_native_target('java/com/facebook/react/bridge:bridge'),
     react_native_target('java/com/facebook/react/common:common'),
     react_native_target('java/com/facebook/react/devsupport:devsupport'),
+    react_native_target('java/com/facebook/react/jstasks:jstasks'),
     react_native_target('java/com/facebook/react/module/annotations:annotations'),
     react_native_target('java/com/facebook/react/uimanager:uimanager'),
-    react_native_target('java/com/facebook/react/jstasks:jstasks'),
   ],
   visibility = [
     'PUBLIC',
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK
index a50072103..8938bd3cb 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/statusbar/BUCK
@@ -4,10 +4,10 @@ android_library(
   name = 'statusbar',
   srcs = glob(['**/*.java']),
   deps = [
+    react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'),
     react_native_dep('third-party/android/support/v4:lib-support-v4'),
     react_native_dep('third-party/java/infer-annotations:infer-annotations'),
     react_native_dep('third-party/java/jsr-305:jsr-305'),
-    react_native_dep('libraries/fbcore/src/main/java/com/facebook/common/logging:logging'),
     react_native_target('java/com/facebook/react/bridge:bridge'),
     react_native_target('java/com/facebook/react/common:common'),
     react_native_target('java/com/facebook/react/module/annotations:annotations'),
diff --git a/ReactAndroid/src/main/java/com/facebook/react/processing/BUCK b/ReactAndroid/src/main/java/com/facebook/react/processing/BUCK
index e057630de..d28cb4bc4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/processing/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/processing/BUCK
@@ -6,11 +6,11 @@ java_library(
   source = '7',
   target = '7',
   deps = [
-    react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
-    react_native_target('java/com/facebook/react/bridge:bridge'),
     react_native_dep('third-party/java/infer-annotations:infer-annotations'),
     react_native_dep('third-party/java/javapoet:javapoet'),
     react_native_dep('third-party/java/jsr-305:jsr-305'),
+    react_native_target('java/com/facebook/react/bridge:bridge'),
+    react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
   ],
   visibility=[
     'PUBLIC'
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/recyclerview/BUCK b/ReactAndroid/src/main/java/com/facebook/react/views/recyclerview/BUCK
index 1457bc8e6..36f5bd77c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/recyclerview/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/recyclerview/BUCK
@@ -4,6 +4,10 @@ android_library(
   name = 'recyclerview',
   srcs = glob(['**/*.java']),
   deps = [
+    react_native_dep('third-party/android/support/v4:lib-support-v4'),
+    react_native_dep('third-party/android/support/v7/recyclerview:recyclerview'),
+    react_native_dep('third-party/java/infer-annotations:infer-annotations'),
+    react_native_dep('third-party/java/jsr-305:jsr-305'),
     react_native_target('java/com/facebook/react/bridge:bridge'),
     react_native_target('java/com/facebook/react/common:common'),
     react_native_target('java/com/facebook/react/touch:touch'),
@@ -11,10 +15,6 @@ android_library(
     react_native_target('java/com/facebook/react/uimanager/annotations:annotations'),
     react_native_target('java/com/facebook/react/views/scroll:scroll'),
     react_native_target('java/com/facebook/react/views/view:view'),
-    react_native_dep('third-party/android/support/v4:lib-support-v4'),
-    react_native_dep('third-party/android/support/v7/recyclerview:recyclerview'),
-    react_native_dep('third-party/java/infer-annotations:infer-annotations'),
-    react_native_dep('third-party/java/jsr-305:jsr-305'),
   ],
   visibility = [
     'PUBLIC',
diff --git a/ReactAndroid/src/test/java/com/facebook/react/animated/BUCK b/ReactAndroid/src/test/java/com/facebook/react/animated/BUCK
index c218e19f0..082b05bb4 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/animated/BUCK
+++ b/ReactAndroid/src/test/java/com/facebook/react/animated/BUCK
@@ -6,19 +6,18 @@ robolectric3_test(
   contacts = ['oncall+fbandroid_sheriff@xmail.facebook.com'],
   srcs = glob(['**/*.java']),
   deps = [
-    react_native_target('java/com/facebook/react/animated:animated'),
-    react_native_target('java/com/facebook/react/bridge:bridge'),
-    react_native_target('java/com/facebook/react/uimanager:uimanager'),
-    react_native_target('java/com/facebook/react/common:common'),
-    react_native_target('java/com/facebook/react:react'),
-
-    react_native_tests_target('java/com/facebook/react/bridge:testhelpers'),
     react_native_dep('libraries/fbcore/src/test/java/com/facebook/powermock:powermock'),
     react_native_dep('third-party/java/fest:fest'),
     react_native_dep('third-party/java/jsr-305:jsr-305'),
     react_native_dep('third-party/java/junit:junit'),
     react_native_dep('third-party/java/mockito:mockito'),
     react_native_dep('third-party/java/robolectric3/robolectric:robolectric'),
+    react_native_target('java/com/facebook/react:react'),
+    react_native_target('java/com/facebook/react/animated:animated'),
+    react_native_target('java/com/facebook/react/bridge:bridge'),
+    react_native_target('java/com/facebook/react/common:common'),
+    react_native_target('java/com/facebook/react/uimanager:uimanager'),
+    react_native_tests_target('java/com/facebook/react/bridge:testhelpers'),
   ],
   visibility = [
     'PUBLIC'
diff --git a/ReactAndroid/src/test/java/com/facebook/react/devsupport/BUCK b/ReactAndroid/src/test/java/com/facebook/react/devsupport/BUCK
index 80a647901..a01530d22 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/devsupport/BUCK
+++ b/ReactAndroid/src/test/java/com/facebook/react/devsupport/BUCK
@@ -6,20 +6,19 @@ robolectric3_test(
   contacts = ['oncall+fbandroid_sheriff@xmail.facebook.com'],
   srcs = glob(['**/*.java']),
   deps = [
-    react_native_target('java/com/facebook/react/devsupport:devsupport'),
-    react_native_target('java/com/facebook/react/common:common'),
-    react_native_target('java/com/facebook/react/bridge:bridge'),
-    react_native_target('java/com/facebook/react:react'),
-
-    react_native_tests_target('java/com/facebook/react/bridge:testhelpers'),
-    react_native_dep('third-party/java/okhttp:okhttp3'),
-    react_native_dep('third-party/java/okhttp:okhttp3-ws'),
     react_native_dep('libraries/fbcore/src/test/java/com/facebook/powermock:powermock'),
     react_native_dep('third-party/java/fest:fest'),
     react_native_dep('third-party/java/jsr-305:jsr-305'),
     react_native_dep('third-party/java/junit:junit'),
     react_native_dep('third-party/java/mockito:mockito'),
+    react_native_dep('third-party/java/okhttp:okhttp3'),
+    react_native_dep('third-party/java/okhttp:okhttp3-ws'),
     react_native_dep('third-party/java/robolectric3/robolectric:robolectric'),
+    react_native_target('java/com/facebook/react:react'),
+    react_native_target('java/com/facebook/react/bridge:bridge'),
+    react_native_target('java/com/facebook/react/common:common'),
+    react_native_target('java/com/facebook/react/devsupport:devsupport'),
+    react_native_tests_target('java/com/facebook/react/bridge:testhelpers'),
   ],
   visibility = [
     'PUBLIC'