diff --git a/ReactAndroid/DEFS b/ReactAndroid/DEFS
index 129899a88..20f0f7626 100644
--- a/ReactAndroid/DEFS
+++ b/ReactAndroid/DEFS
@@ -32,7 +32,7 @@ JSC_DEPS = [
   '//native/third-party/jsc:jsc_legacy_profiler',
 ]
 
-CSSLAYOUT_TARGET = '//ReactAndroid/src/main/java/com/facebook/csslayout:csslayout'
+CSSLAYOUT_TARGET = '//ReactAndroid/src/main/java/com/facebook:csslayout'
 FBGLOGINIT_TARGET = '//ReactAndroid/src/main/jni/first-party/fbgloginit:fbgloginit'
 
 # React property preprocessor
diff --git a/ReactAndroid/src/main/java/com/facebook/csslayout/BUCK b/ReactAndroid/src/main/java/com/facebook/BUCK
similarity index 61%
rename from ReactAndroid/src/main/java/com/facebook/csslayout/BUCK
rename to ReactAndroid/src/main/java/com/facebook/BUCK
index da7888de9..01c15cefd 100644
--- a/ReactAndroid/src/main/java/com/facebook/csslayout/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/BUCK
@@ -2,8 +2,10 @@ include_defs('//ReactAndroid/DEFS')
 
 android_library(
   name = 'csslayout',
-  srcs = glob(['**/*.java']),
+  srcs = glob(['csslayout/*.java']),
   deps = [
+    react_native_dep('java/com/facebook/proguard/annotations:annotations'),
+    react_native_dep('libraries/soloader/java/com/facebook/soloader:soloader'),
     react_native_dep('third-party/java/infer-annotations:infer-annotations'),
     react_native_dep('third-party/java/jsr-305:jsr-305'),
   ],