diff --git a/gentest/gentest.js b/gentest/gentest.js
index ac1f720f..f3653125 100755
--- a/gentest/gentest.js
+++ b/gentest/gentest.js
@@ -41,8 +41,7 @@ function printTest(rootNode, layoutTree) {
   lines.push('');
 
   lines.push([
-    '#include <CSSLayout/CSSLayout-internal.h>',
-    '#include <CSSLayoutTestUtils/CSSLayoutTestUtils.h>',
+    '#include <CSSLayout/CSSLayout.h>',
     '#include <gtest/gtest.h>',
     '',
   ].reduce(function(curr, prev) {
diff --git a/tests/CSSLayoutAbsolutePositionTest.cpp b/tests/CSSLayoutAbsolutePositionTest.cpp
index ee27c93c..1c2feb2f 100644
--- a/tests/CSSLayoutAbsolutePositionTest.cpp
+++ b/tests/CSSLayoutAbsolutePositionTest.cpp
@@ -25,8 +25,7 @@
  *
  */
 
-#include <CSSLayout/CSSLayout-internal.h>
-#include <CSSLayoutTestUtils/CSSLayoutTestUtils.h>
+#include <CSSLayout/CSSLayout.h>
 #include <gtest/gtest.h>
 
 TEST(CSSLayoutTest, absolute_layout_width_height_left_top) {
diff --git a/tests/CSSLayoutAlignContentTest.cpp b/tests/CSSLayoutAlignContentTest.cpp
index fc038b6f..72d489be 100644
--- a/tests/CSSLayoutAlignContentTest.cpp
+++ b/tests/CSSLayoutAlignContentTest.cpp
@@ -41,8 +41,7 @@
  *
  */
 
-#include <CSSLayout/CSSLayout-internal.h>
-#include <CSSLayoutTestUtils/CSSLayoutTestUtils.h>
+#include <CSSLayout/CSSLayout.h>
 #include <gtest/gtest.h>
 
 TEST(CSSLayoutTest, align_content_flex_start) {
diff --git a/tests/CSSLayoutAlignItemsTest.cpp b/tests/CSSLayoutAlignItemsTest.cpp
index 2fe95785..7e68ee01 100644
--- a/tests/CSSLayoutAlignItemsTest.cpp
+++ b/tests/CSSLayoutAlignItemsTest.cpp
@@ -25,8 +25,7 @@
  *
  */
 
-#include <CSSLayout/CSSLayout-internal.h>
-#include <CSSLayoutTestUtils/CSSLayoutTestUtils.h>
+#include <CSSLayout/CSSLayout.h>
 #include <gtest/gtest.h>
 
 TEST(CSSLayoutTest, align_items_stretch) {
diff --git a/tests/CSSLayoutAlignSelfTest.cpp b/tests/CSSLayoutAlignSelfTest.cpp
index 256fc9fb..86471ed4 100644
--- a/tests/CSSLayoutAlignSelfTest.cpp
+++ b/tests/CSSLayoutAlignSelfTest.cpp
@@ -25,8 +25,7 @@
  *
  */
 
-#include <CSSLayout/CSSLayout-internal.h>
-#include <CSSLayoutTestUtils/CSSLayoutTestUtils.h>
+#include <CSSLayout/CSSLayout.h>
 #include <gtest/gtest.h>
 
 TEST(CSSLayoutTest, align_self_center) {
diff --git a/tests/CSSLayoutFlexDirectionTest.cpp b/tests/CSSLayoutFlexDirectionTest.cpp
index aab5ca80..68162127 100644
--- a/tests/CSSLayoutFlexDirectionTest.cpp
+++ b/tests/CSSLayoutFlexDirectionTest.cpp
@@ -43,8 +43,7 @@
  *
  */
 
-#include <CSSLayout/CSSLayout-internal.h>
-#include <CSSLayoutTestUtils/CSSLayoutTestUtils.h>
+#include <CSSLayout/CSSLayout.h>
 #include <gtest/gtest.h>
 
 TEST(CSSLayoutTest, flex_direction_column_no_height) {
diff --git a/tests/CSSLayoutFlexTest.cpp b/tests/CSSLayoutFlexTest.cpp
index ef0923b5..588ed0e6 100644
--- a/tests/CSSLayoutFlexTest.cpp
+++ b/tests/CSSLayoutFlexTest.cpp
@@ -33,8 +33,7 @@
  *
  */
 
-#include <CSSLayout/CSSLayout-internal.h>
-#include <CSSLayoutTestUtils/CSSLayoutTestUtils.h>
+#include <CSSLayout/CSSLayout.h>
 #include <gtest/gtest.h>
 
 TEST(CSSLayoutTest, flex_basis_flex_grow_column) {
diff --git a/tests/CSSLayoutFlexWrapTest.cpp b/tests/CSSLayoutFlexWrapTest.cpp
index 41140158..0f388539 100644
--- a/tests/CSSLayoutFlexWrapTest.cpp
+++ b/tests/CSSLayoutFlexWrapTest.cpp
@@ -30,8 +30,7 @@
 // of their children in that dimension.
 // See diagram under flex-wrap header https://www.w3.org/TR/css-flexbox-1/
 
-#include <CSSLayout/CSSLayout-internal.h>
-#include <CSSLayoutTestUtils/CSSLayoutTestUtils.h>
+#include <CSSLayout/CSSLayout.h>
 #include <gtest/gtest.h>
 
 TEST(CSSLayoutTest, wrap_column) {
diff --git a/tests/CSSLayoutJustifyContentTest.cpp b/tests/CSSLayoutJustifyContentTest.cpp
index 15047bc6..f3e31b82 100644
--- a/tests/CSSLayoutJustifyContentTest.cpp
+++ b/tests/CSSLayoutJustifyContentTest.cpp
@@ -63,8 +63,7 @@
  *
  */
 
-#include <CSSLayout/CSSLayout-internal.h>
-#include <CSSLayoutTestUtils/CSSLayoutTestUtils.h>
+#include <CSSLayout/CSSLayout.h>
 #include <gtest/gtest.h>
 
 TEST(CSSLayoutTest, justify_content_row_flex_start) {
diff --git a/tests/CSSLayoutMeasureCacheTest.cpp b/tests/CSSLayoutMeasureCacheTest.cpp
index 02112fd7..aee2d9cc 100644
--- a/tests/CSSLayoutMeasureCacheTest.cpp
+++ b/tests/CSSLayoutMeasureCacheTest.cpp
@@ -7,8 +7,7 @@
  * of patent rights can be found in the PATENTS file in the same directory.
  */
 
-#include <CSSLayout/CSSLayout-internal.h>
-#include <CSSLayoutTestUtils/CSSLayoutTestUtils.h>
+#include <CSSLayout/CSSLayout.h>
 #include <gtest/gtest.h>
 
 static CSSSize _measure(void *context,
diff --git a/tests/CSSLayoutMinMaxDimensionTest.cpp b/tests/CSSLayoutMinMaxDimensionTest.cpp
index 940181fe..69316d01 100644
--- a/tests/CSSLayoutMinMaxDimensionTest.cpp
+++ b/tests/CSSLayoutMinMaxDimensionTest.cpp
@@ -27,8 +27,7 @@
  *
  */
 
-#include <CSSLayout/CSSLayout-internal.h>
-#include <CSSLayoutTestUtils/CSSLayoutTestUtils.h>
+#include <CSSLayout/CSSLayout.h>
 #include <gtest/gtest.h>
 
 TEST(CSSLayoutTest, max_width) {