diff --git a/BUCK b/BUCK
index 4b809f69..699e7a61 100644
--- a/BUCK
+++ b/BUCK
@@ -2,7 +2,7 @@
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
-load("//:yoga_defs.bzl", "BASE_COMPILER_FLAGS", "GTEST_TARGET", "LIBRARY_COMPILER_FLAGS", "subdir_glob", "yoga_cxx_library", "yoga_cxx_test", "yoga_dep")
+load("//tools/build_defs/oss:yoga_defs.bzl", "BASE_COMPILER_FLAGS", "GTEST_TARGET", "LIBRARY_COMPILER_FLAGS", "subdir_glob", "yoga_cxx_library", "yoga_cxx_test", "yoga_dep")
 
 GMOCK_OVERRIDE_FLAGS = [
     # gmock does not mark mocked methods as override, ignore the warnings in tests
diff --git a/YogaKit/BUCK b/YogaKit/BUCK
index 9675d049..f4ea3567 100644
--- a/YogaKit/BUCK
+++ b/YogaKit/BUCK
@@ -2,7 +2,7 @@
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
-load("//:yoga_defs.bzl", "subdir_glob", "yoga_apple_library", "yoga_apple_test", "yoga_dep")
+load("//tools/build_defs/oss:yoga_defs.bzl", "subdir_glob", "yoga_apple_library", "yoga_apple_test", "yoga_dep")
 
 COMPILER_FLAGS = [
     "-fobjc-arc",
diff --git a/android/BUCK b/android/BUCK
index af64135f..35f91a0d 100644
--- a/android/BUCK
+++ b/android/BUCK
@@ -3,7 +3,7 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-load("//:yoga_defs.bzl", "ANDROID_JAVA_TARGET", "ANDROID_RES_TARGET", "INFER_ANNOTATIONS_TARGET", "JAVA_TARGET", "PROGRUARD_ANNOTATIONS_TARGET", "yoga_android_aar", "yoga_android_resource")
+load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_JAVA_TARGET", "ANDROID_RES_TARGET", "INFER_ANNOTATIONS_TARGET", "JAVA_TARGET", "PROGRUARD_ANNOTATIONS_TARGET", "yoga_android_aar", "yoga_android_resource")
 
 yoga_android_aar(
     name = "android",
diff --git a/android/sample/BUCK b/android/sample/BUCK
index 966c700d..0612aca9 100644
--- a/android/sample/BUCK
+++ b/android/sample/BUCK
@@ -4,7 +4,7 @@
 # This source code is licensed under the license found in the
 # LICENSE-examples file in the root directory of this source tree.
 
-load("//:yoga_defs.bzl", "ANDROID_RES_TARGET", "ANDROID_SAMPLE_JAVA_TARGET", "ANDROID_SAMPLE_RES_TARGET", "yoga_android_binary", "yoga_android_resource")
+load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_RES_TARGET", "ANDROID_SAMPLE_JAVA_TARGET", "ANDROID_SAMPLE_RES_TARGET", "yoga_android_binary", "yoga_android_resource")
 
 yoga_android_binary(
     name = "sample",
diff --git a/android/sample/java/com/facebook/samples/yoga/BUCK b/android/sample/java/com/facebook/samples/yoga/BUCK
index 4c216b1e..5d3b601f 100644
--- a/android/sample/java/com/facebook/samples/yoga/BUCK
+++ b/android/sample/java/com/facebook/samples/yoga/BUCK
@@ -3,7 +3,7 @@
 # This source code is licensed under the license found in the
 # LICENSE-examples file in the root directory of this source tree.
 
-load("//:yoga_defs.bzl", "ANDROID_JAVA_TARGET", "ANDROID_SAMPLE_RES_TARGET", "ANDROID_SUPPORT_TARGET", "APPCOMPAT_TARGET", "SOLOADER_TARGET", "yoga_android_library")
+load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_JAVA_TARGET", "ANDROID_SAMPLE_RES_TARGET", "ANDROID_SUPPORT_TARGET", "APPCOMPAT_TARGET", "SOLOADER_TARGET", "yoga_android_library")
 
 yoga_android_library(
     name = "yoga",
diff --git a/android/src/main/java/com/facebook/yoga/android/BUCK b/android/src/main/java/com/facebook/yoga/android/BUCK
index 01a8d47d..8731dc3c 100644
--- a/android/src/main/java/com/facebook/yoga/android/BUCK
+++ b/android/src/main/java/com/facebook/yoga/android/BUCK
@@ -3,7 +3,7 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-load("//:yoga_defs.bzl", "ANDROID_RES_TARGET", "INFER_ANNOTATIONS_TARGET", "JAVA_TARGET", "JSR_305_TARGET", "SOLOADER_TARGET", "yoga_android_library")
+load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_RES_TARGET", "INFER_ANNOTATIONS_TARGET", "JAVA_TARGET", "JSR_305_TARGET", "SOLOADER_TARGET", "yoga_android_library")
 
 yoga_android_library(
     name = "android",
diff --git a/benchmark/BUCK b/benchmark/BUCK
index 82864373..2071746f 100644
--- a/benchmark/BUCK
+++ b/benchmark/BUCK
@@ -2,7 +2,7 @@
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
-load("//:yoga_defs.bzl", "subdir_glob", "yoga_cxx_binary", "yoga_dep")
+load("//tools/build_defs/oss:yoga_defs.bzl", "subdir_glob", "yoga_cxx_binary", "yoga_dep")
 
 yoga_cxx_binary(
     name = "benchmark",
diff --git a/csharp/BUCK b/csharp/BUCK
index e679803a..21e3b23f 100644
--- a/csharp/BUCK
+++ b/csharp/BUCK
@@ -4,7 +4,7 @@
 # LICENSE file in the root directory of this source tree.
 
 load(
-    "//:yoga_defs.bzl",
+    "//tools/build_defs/oss:yoga_defs.bzl",
     "BASE_COMPILER_FLAGS",
     "is_apple_platform",
     "yoga_cxx_library",
diff --git a/java/BUCK b/java/BUCK
index 4ddabcef..dab188ce 100644
--- a/java/BUCK
+++ b/java/BUCK
@@ -3,7 +3,7 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-load("//:yoga_defs.bzl", "ANDROID", "CXX_LIBRARY_WHITELIST", "FBJNI_JAVA_TARGET", "FBJNI_TARGET", "INFER_ANNOTATIONS_TARGET", "JNI_TARGET", "JSR_305_TARGET", "JUNIT_TARGET", "PROGRUARD_ANNOTATIONS_TARGET", "SOLOADER_TARGET", "yoga_cxx_library", "yoga_dep", "yoga_java_binary", "yoga_java_library", "yoga_java_test")
+load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID", "CXX_LIBRARY_WHITELIST", "FBJNI_JAVA_TARGET", "FBJNI_TARGET", "INFER_ANNOTATIONS_TARGET", "JNI_TARGET", "JSR_305_TARGET", "JUNIT_TARGET", "PROGRUARD_ANNOTATIONS_TARGET", "SOLOADER_TARGET", "yoga_cxx_library", "yoga_dep", "yoga_java_binary", "yoga_java_library", "yoga_java_test")
 
 yoga_cxx_library(
     name = "jni",
diff --git a/java/proguard-annotations/src/main/java/com/facebook/proguard/annotations/BUCK b/java/proguard-annotations/src/main/java/com/facebook/proguard/annotations/BUCK
index 73456365..16761a05 100644
--- a/java/proguard-annotations/src/main/java/com/facebook/proguard/annotations/BUCK
+++ b/java/proguard-annotations/src/main/java/com/facebook/proguard/annotations/BUCK
@@ -3,7 +3,7 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-load("//:yoga_defs.bzl", "YOGA_ROOTS", "yoga_java_library")
+load("//tools/build_defs/oss:yoga_defs.bzl", "YOGA_ROOTS", "yoga_java_library")
 
 yoga_java_library(
     name = "annotations",
diff --git a/lib/android-support/BUCK b/lib/android-support/BUCK
index d104d464..59bc7cfa 100644
--- a/lib/android-support/BUCK
+++ b/lib/android-support/BUCK
@@ -3,7 +3,7 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-load("//:yoga_defs.bzl", "YOGA_ROOTS", "yoga_prebuilt_jar")
+load("//tools/build_defs/oss:yoga_defs.bzl", "YOGA_ROOTS", "yoga_prebuilt_jar")
 
 yoga_prebuilt_jar(
     name = "android-support",
diff --git a/lib/appcompat/BUCK b/lib/appcompat/BUCK
index eeda3b37..c5508740 100644
--- a/lib/appcompat/BUCK
+++ b/lib/appcompat/BUCK
@@ -3,7 +3,7 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-load("//:yoga_defs.bzl", "YOGA_ROOTS")
+load("//tools/build_defs/oss:yoga_defs.bzl", "YOGA_ROOTS")
 
 android_prebuilt_aar(
     name = "appcompat",
diff --git a/lib/fb/BUCK b/lib/fb/BUCK
index cc2502ec..6eac7750 100644
--- a/lib/fb/BUCK
+++ b/lib/fb/BUCK
@@ -2,7 +2,7 @@
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
-load("//:yoga_defs.bzl", "ANDROID", "FBJNI_JAVA_TARGET", "JNI_TARGET", "YOGA_ROOTS", "subdir_glob", "yoga_cxx_library", "yoga_prebuilt_cxx_library")
+load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID", "FBJNI_JAVA_TARGET", "JNI_TARGET", "YOGA_ROOTS", "subdir_glob", "yoga_cxx_library", "yoga_prebuilt_cxx_library")
 
 yoga_prebuilt_cxx_library(
     name = "ndklog",
diff --git a/lib/fb/src/main/java/com/facebook/jni/BUCK b/lib/fb/src/main/java/com/facebook/jni/BUCK
index 0bb5297d..b69c0c07 100644
--- a/lib/fb/src/main/java/com/facebook/jni/BUCK
+++ b/lib/fb/src/main/java/com/facebook/jni/BUCK
@@ -3,7 +3,7 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-load("//:yoga_defs.bzl", "JSR_305_TARGET", "PROGRUARD_ANNOTATIONS_TARGET", "SOLOADER_TARGET", "yoga_java_library")
+load("//tools/build_defs/oss:yoga_defs.bzl", "JSR_305_TARGET", "PROGRUARD_ANNOTATIONS_TARGET", "SOLOADER_TARGET", "yoga_java_library")
 
 yoga_java_library(
     name = "jni",
diff --git a/lib/gtest/BUCK b/lib/gtest/BUCK
index e489c69c..e59462a5 100644
--- a/lib/gtest/BUCK
+++ b/lib/gtest/BUCK
@@ -2,7 +2,7 @@
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
-load("//:yoga_defs.bzl", "YOGA_ROOTS", "subdir_glob", "yoga_cxx_library")
+load("//tools/build_defs/oss:yoga_defs.bzl", "YOGA_ROOTS", "subdir_glob", "yoga_cxx_library")
 
 COMPILER_FLAGS = [
     "-std=c++11",
diff --git a/lib/infer-annotations/BUCK b/lib/infer-annotations/BUCK
index 6c89bc6e..8dbd2a13 100644
--- a/lib/infer-annotations/BUCK
+++ b/lib/infer-annotations/BUCK
@@ -3,7 +3,7 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-load("//:yoga_defs.bzl", "YOGA_ROOTS", "yoga_java_library", "yoga_prebuilt_jar")
+load("//tools/build_defs/oss:yoga_defs.bzl", "YOGA_ROOTS", "yoga_java_library", "yoga_prebuilt_jar")
 
 yoga_prebuilt_jar(
     name = "infer-annotations-jar",
diff --git a/lib/jni/BUCK b/lib/jni/BUCK
index 9ce8bd05..9ec57971 100644
--- a/lib/jni/BUCK
+++ b/lib/jni/BUCK
@@ -3,7 +3,7 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-load("//:yoga_defs.bzl", "yoga_cxx_library")
+load("//tools/build_defs/oss:yoga_defs.bzl", "yoga_cxx_library")
 
 yoga_cxx_library(
     name = "jni",
diff --git a/lib/jsr-305/BUCK b/lib/jsr-305/BUCK
index 34343c25..dadd5e0b 100644
--- a/lib/jsr-305/BUCK
+++ b/lib/jsr-305/BUCK
@@ -3,7 +3,7 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-load("//:yoga_defs.bzl", "YOGA_ROOTS", "yoga_java_library", "yoga_prebuilt_jar")
+load("//tools/build_defs/oss:yoga_defs.bzl", "YOGA_ROOTS", "yoga_java_library", "yoga_prebuilt_jar")
 
 yoga_prebuilt_jar(
     name = "jsr305-jar",
diff --git a/lib/junit/BUCK b/lib/junit/BUCK
index 7cc0079c..64f8f1d3 100644
--- a/lib/junit/BUCK
+++ b/lib/junit/BUCK
@@ -3,7 +3,7 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-load("//:yoga_defs.bzl", "YOGA_ROOTS", "yoga_java_library", "yoga_prebuilt_jar")
+load("//tools/build_defs/oss:yoga_defs.bzl", "YOGA_ROOTS", "yoga_java_library", "yoga_prebuilt_jar")
 
 yoga_prebuilt_jar(
     name = "junit-jar",
diff --git a/lib/soloader/BUCK b/lib/soloader/BUCK
index 7ab9627f..c21b5475 100644
--- a/lib/soloader/BUCK
+++ b/lib/soloader/BUCK
@@ -3,7 +3,7 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-load("//:yoga_defs.bzl", "YOGA_ROOTS")
+load("//tools/build_defs/oss:yoga_defs.bzl", "YOGA_ROOTS")
 
 android_prebuilt_aar(
     name = "soloader",
diff --git a/yoga_defs.bzl b/tools/build_defs/oss/yoga_defs.bzl
similarity index 100%
rename from yoga_defs.bzl
rename to tools/build_defs/oss/yoga_defs.bzl