diff --git a/BUCK b/BUCK
index 5af52a2f..e11649b9 100644
--- a/BUCK
+++ b/BUCK
@@ -17,9 +17,9 @@ TEST_COMPILER_FLAGS = BASE_COMPILER_FLAGS + GMOCK_OVERRIDE_FLAGS + [
 yoga_cxx_library(
     name = "yoga",
     srcs = glob(["yoga/**/*.cpp"]),
-    header_namespace = "",
-    exported_headers = subdir_glob([("", "yoga/**/*.h")]),
     compiler_flags = LIBRARY_COMPILER_FLAGS,
+    public_include_directories = ["."],
+    raw_headers = glob(["yoga/**/*.h"]),
     soname = "libyogacore.$(ext)",
     tests = [":YogaTests"],
     visibility = ["PUBLIC"],
@@ -31,9 +31,9 @@ yoga_cxx_library(
 yoga_cxx_library(
     name = "yogaForDebug",
     srcs = glob(["yoga/**/*.cpp"]),
-    header_namespace = "",
-    exported_headers = subdir_glob([("", "yoga/**/*.h")]),
     compiler_flags = TEST_COMPILER_FLAGS,
+    public_include_directories = ["."],
+    raw_headers = glob(["yoga/**/*.h"]),
     soname = "libyogacore.$(ext)",
     tests = [":YogaTests"],
     visibility = ["PUBLIC"],