101 files changed, 560 insertions, 470 deletions
diff --git a/WORKSPACE b/WORKSPACE
new file mode 100644
index 0000000..8364d80
--- /dev/null
+++ b/WORKSPACE
@@ -0,0 +1,17 @@
+# Copyright 2020 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Workspace file for the Ruy project.
+
+workspace(name = "com_google_ruy")
diff --git a/BUILD b/ruy/BUILD
index 9d331b8..0b19193 100644
--- a/BUILD
+++ b/ruy/BUILD
@@ -131,7 +131,7 @@ cc_library(
         ":opt_set",
         ":platform",
         ":time",
-        "//profiler:instrumentation",
+        "//ruy/profiler:instrumentation",
     ],
 )
 
@@ -209,7 +209,7 @@ cc_library(
         ":path",
         ":side_pair",
         ":size_util",
-        "//profiler:instrumentation",
+        "//ruy/profiler:instrumentation",
     ],
 )
 
@@ -383,7 +383,7 @@ cc_library(
         ":size_util",
         ":spec",
         ":tune",
-        "//profiler:instrumentation",
+        "//ruy/profiler:instrumentation",
     ],
 )
 
@@ -405,7 +405,7 @@ cc_library(
         ":path",
         ":platform",
         ":tune",
-        "//profiler:instrumentation",
+        "//ruy/profiler:instrumentation",
     ],
 )
 
@@ -421,7 +421,7 @@ cc_library(
         ":kernel_common",
         ":opt_set",
         ":platform",
-        "//profiler:instrumentation",
+        "//ruy/profiler:instrumentation",
     ],
 )
 
@@ -436,7 +436,7 @@ cc_library(
         ":opt_set",
         ":pack_common",
         ":platform",
-        "//profiler:instrumentation",
+        "//ruy/profiler:instrumentation",
     ],
 )
 
@@ -456,7 +456,7 @@ cc_library(
         ":kernel_common",
         ":opt_set",
         ":platform",
-        "//profiler:instrumentation",
+        "//ruy/profiler:instrumentation",
     ],
 )
 
@@ -473,7 +473,7 @@ cc_library(
         ":pack_common",
         ":path",
         ":platform",
-        "//profiler:instrumentation",
+        "//ruy/profiler:instrumentation",
     ],
 )
 
@@ -509,7 +509,7 @@ cc_library(
         ":kernel_common",
         ":opt_set",
         ":platform",
-        "//profiler:instrumentation",
+        "//ruy/profiler:instrumentation",
     ],
 )
 
@@ -526,7 +526,7 @@ cc_library(
         ":pack_common",
         ":path",
         ":platform",
-        "//profiler:instrumentation",
+        "//ruy/profiler:instrumentation",
     ],
 )
 
@@ -566,7 +566,7 @@ cc_library(
         ":kernel_common",
         ":opt_set",
         ":platform",
-        "//profiler:instrumentation",
+        "//ruy/profiler:instrumentation",
     ],
 )
 
@@ -583,7 +583,7 @@ cc_library(
         ":pack_common",
         ":path",
         ":platform",
-        "//profiler:instrumentation",
+        "//ruy/profiler:instrumentation",
     ],
 )
 
@@ -623,7 +623,7 @@ cc_library(
         ":kernel_common",
         ":opt_set",
         ":platform",
-        "//profiler:instrumentation",
+        "//ruy/profiler:instrumentation",
     ],
 )
 
@@ -640,7 +640,7 @@ cc_library(
         ":pack_common",
         ":path",
         ":platform",
-        "//profiler:instrumentation",
+        "//ruy/profiler:instrumentation",
     ],
 )
 
@@ -685,7 +685,7 @@ cc_library(
         ":size_util",
         ":spec",
         ":tune",
-        "//profiler:instrumentation",
+        "//ruy/profiler:instrumentation",
     ],
 )
 
@@ -711,7 +711,7 @@ cc_library(
         ":path",
         ":platform",
         ":tune",
-        "//profiler:instrumentation",
+        "//ruy/profiler:instrumentation",
     ],
 )
 
@@ -796,7 +796,7 @@ cc_library(
         ":trace",
         ":trmul_params",
         ":tune",
-        "//profiler:instrumentation",
+        "//ruy/profiler:instrumentation",
     ],
 )
 
@@ -829,7 +829,7 @@ cc_library(
         ":trmul",
         ":trmul_params",
         ":tune",
-        "//profiler:instrumentation",
+        "//ruy/profiler:instrumentation",
     ],
 )
 
@@ -877,7 +877,7 @@ cc_library(
         ":time",
         "@com_google_googletest//:gtest",
         ":platform",
-        "//profiler:profiler",
+        "//ruy/profiler:profiler",
     ] + ruy_test_ext_deps(),
 )
 
@@ -894,8 +894,8 @@ ruy_benchmark(
         ("i8", "i8", "i32", "i32"),
     ],
     deps = [
-        ":test_lib",
-        "//profiler:instrumentation",
+        "//ruy:test_lib",
+        "//ruy/profiler:instrumentation",
     ],
 )
 
@@ -916,7 +916,7 @@ ruy_test(
     ],
     deps = [
         "@com_google_googletest//:gtest_main",
-        ":test_lib",
+        "//ruy:test_lib",
     ],
 )
 
@@ -934,7 +934,7 @@ ruy_test(
     tags = ["slow"],
     deps = [
         "@com_google_googletest//:gtest_main",
-        ":test_lib",
+        "//ruy:test_lib",
     ],
 )
 
@@ -949,6 +949,6 @@ ruy_test(
     ],
     deps = [
         "@com_google_googletest//:gtest_main",
-        ":test_lib",
+        "//ruy:test_lib",
     ],
 )
diff --git a/allocator.cc b/ruy/allocator.cc
index a2e596a..d8fb738 100644
--- a/allocator.cc
+++ b/ruy/allocator.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "allocator.h"
+#include "ruy/allocator.h"
 
 #include <cstdint>
 #include <cstdlib>
diff --git a/allocator.h b/ruy/allocator.h
index e2d31e4..b0379b1 100644
--- a/allocator.h
+++ b/ruy/allocator.h
@@ -13,16 +13,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_ALLOCATOR_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_ALLOCATOR_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_ALLOCATOR_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_ALLOCATOR_H_
 
 #include <cstddef>
 #include <cstdint>
 #include <memory>
 #include <vector>
 
-#include "check_macros.h"
-#include "size_util.h"
+#include "ruy/check_macros.h"
+#include "ruy/size_util.h"
 
 namespace ruy {
 
@@ -182,4 +182,4 @@ class Allocator {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_ALLOCATOR_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_ALLOCATOR_H_
diff --git a/allocator_test.cc b/ruy/allocator_test.cc
index 51707bd..7f46a66 100644
--- a/allocator_test.cc
+++ b/ruy/allocator_test.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "allocator.h"
+#include "ruy/allocator.h"
 
 #include "testing/base/public/gunit.h"
 
diff --git a/benchmark.cc b/ruy/benchmark.cc
index ece71e1..6ce0b32 100644
--- a/benchmark.cc
+++ b/ruy/benchmark.cc
@@ -17,7 +17,7 @@ limitations under the License.
 #include <cstdlib>
 #include <string>
 
-#include "test.h"
+#include "ruy/test.h"
 
 namespace ruy {
 
diff --git a/block_map.cc b/ruy/block_map.cc
index 04ef5b2..e1e6166 100644
--- a/block_map.cc
+++ b/ruy/block_map.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "block_map.h"
+#include "ruy/block_map.h"
 
 #include <algorithm>
 #include <cstdint>
@@ -24,10 +24,10 @@ limitations under the License.
 #include <string>
 #endif
 
-#include "check_macros.h"
-#include "opt_set.h"
-#include "profiler/instrumentation.h"
-#include "size_util.h"
+#include "ruy/check_macros.h"
+#include "ruy/opt_set.h"
+#include "ruy/profiler/instrumentation.h"
+#include "ruy/size_util.h"
 
 namespace ruy {
 
diff --git a/block_map.h b/ruy/block_map.h
index 18e9847..5e1cee0 100644
--- a/block_map.h
+++ b/ruy/block_map.h
@@ -13,11 +13,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_BLOCK_MAP_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_BLOCK_MAP_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_BLOCK_MAP_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_BLOCK_MAP_H_
 
-#include "path.h"
-#include "side_pair.h"
+#include "ruy/path.h"
+#include "ruy/side_pair.h"
 
 namespace ruy {
 
@@ -158,4 +158,4 @@ inline int NumBlocks(const BlockMap& block_map) {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_BLOCK_MAP_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_BLOCK_MAP_H_
diff --git a/block_map_test.cc b/ruy/block_map_test.cc
index 3ce6d0f..24646cf 100644
--- a/block_map_test.cc
+++ b/ruy/block_map_test.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "block_map.h"
+#include "ruy/block_map.h"
 
 #include <cstddef>
 #include <cstdint>
@@ -22,9 +22,9 @@ limitations under the License.
 #include <vector>
 
 #include "testing/base/public/gunit.h"
-#include "cpu_cache_size.h"
-#include "path.h"
-#include "side_pair.h"
+#include "ruy/cpu_cache_size.h"
+#include "ruy/path.h"
+#include "ruy/side_pair.h"
 
 namespace ruy {
 namespace {
diff --git a/blocking_counter.cc b/ruy/blocking_counter.cc
index 2bfb896..ffa7ac0 100644
--- a/blocking_counter.cc
+++ b/ruy/blocking_counter.cc
@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "blocking_counter.h"
+#include "ruy/blocking_counter.h"
 
-#include "check_macros.h"
-#include "wait.h"
+#include "ruy/check_macros.h"
+#include "ruy/wait.h"
 
 namespace ruy {
 
diff --git a/blocking_counter.h b/ruy/blocking_counter.h
index e8c76d5..878f0e7 100644
--- a/blocking_counter.h
+++ b/ruy/blocking_counter.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_BLOCKING_COUNTER_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_BLOCKING_COUNTER_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_BLOCKING_COUNTER_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_BLOCKING_COUNTER_H_
 
 #include <atomic>
 #include <condition_variable>  // NOLINT(build/c++11) // IWYU pragma: keep
@@ -59,4 +59,4 @@ class BlockingCounter {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_BLOCKING_COUNTER_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_BLOCKING_COUNTER_H_
diff --git a/ruy/build_defs.bzl b/ruy/build_defs.bzl
new file mode 100644
index 0000000..964ede3
--- /dev/null
+++ b/ruy/build_defs.bzl
@@ -0,0 +1,54 @@
+"""Build definitions for Ruy.
+
+In some cases these are used to configure specific targets for
+specific platforms, and dispatch is based on runtime capability detection.
+"""
+
+# 1. Enable -mfpu=neon unconditionally on ARM32. If it turns out that we need to support
+#    ARM32 without NEON then we'll implement runtime detection and dispatch at that point.
+# 2. Explicitly pass -O3 on optimization configs where just "-c opt" means "optimize for code size".
+
+def ruy_copts_base():
+    return select({
+        ":armeabi-v7a": [
+            "-mfpu=neon",
+        ],
+        "//conditions:default": [],
+    }) + select({
+        ":optimized": ["-O3"],
+        "//conditions:default": [],
+    })
+
+# Used for targets that are compiled with extra features that are skipped at runtime if unavailable.
+def ruy_copts_skylake():
+    return select({
+        ":x86_64": ["-march=skylake-avx512"],
+        "//conditions:default": [],
+    })
+
+# Used for targets that are compiled with extra features that are skipped at runtime if unavailable.
+def ruy_copts_avx2():
+    return select({
+        ":x86_64": ["-mavx2", "-mfma"],
+        "//conditions:default": [],
+    })
+
+# TODO(b/147376783): SSE 4.2 and AVX-VNNI support is incomplete / placeholder.
+# Optimization is not finished. In particular the dimensions of the kernel
+# blocks can be changed as desired.
+#
+# Used for targets that are compiled with extra features that are skipped at runtime if unavailable.
+def ruy_copts_sse42():
+    return []
+
+# TODO(b/147376783): SSE 4.2 and AVX-VNNI support is incomplete / placeholder.
+# Optimization is not finished. In particular the dimensions of the kernel
+# blocks can be changed as desired.
+#
+# Used for targets that are compiled with extra features that are skipped at runtime if unavailable.
+def ruy_copts_avxvnni():
+    return select({
+        # TODO(b/146494398): Reinstate flag, something like "-march=cascadelake".
+        ":x86_64": [],
+        "//conditions:default": [],
+    })
diff --git a/build_defs.bzl b/ruy/build_defs.bzl.opensource
index 9bccccf..9bccccf 100644
--- a/build_defs.bzl
+++ b/ruy/build_defs.bzl.opensource
diff --git a/check_macros.h b/ruy/check_macros.h
index 564440b..773f37d 100644
--- a/check_macros.h
+++ b/ruy/check_macros.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_CHECK_MACROS_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_CHECK_MACROS_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_CHECK_MACROS_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_CHECK_MACROS_H_
 
 #include <cstdio>
 #include <cstdlib>
@@ -135,4 +135,4 @@ inline void Failure(const char* file, int line, const char* macro,
 }  // end namespace check_macros
 }  // end namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_CHECK_MACROS_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_CHECK_MACROS_H_
diff --git a/check_macros_test.cc b/ruy/check_macros_test.cc
index 459513e..7e47e7f 100644
--- a/check_macros_test.cc
+++ b/ruy/check_macros_test.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "check_macros.h"
+#include "ruy/check_macros.h"
 
 #include "testing/base/public/gunit.h"
 
diff --git a/common.h b/ruy/common.h
index 157399c..1cd40fe 100644
--- a/common.h
+++ b/ruy/common.h
@@ -15,17 +15,17 @@ limitations under the License.
 
 // Miscellaneous helpers internal library.
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_COMMON_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_COMMON_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_COMMON_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_COMMON_H_
 
 #include <limits>
 #include <type_traits>
 
-#include "check_macros.h"
-#include "matrix.h"
-#include "opt_set.h"
-#include "path.h"
-#include "platform.h"
+#include "ruy/check_macros.h"
+#include "ruy/matrix.h"
+#include "ruy/opt_set.h"
+#include "ruy/path.h"
+#include "ruy/platform.h"
 
 #if RUY_OPT_ENABLED(RUY_OPT_PREFETCH_LOAD)
 #define RUY_PREFETCH_LOAD(X) X
@@ -70,4 +70,4 @@ Scalar SymmetricZeroPoint() {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_COMMON_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_COMMON_H_
diff --git a/context.cc b/ruy/context.cc
index 4852abf..1a70303 100644
--- a/context.cc
+++ b/ruy/context.cc
@@ -13,13 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "context.h"
+#include "ruy/context.h"
 
-#include "check_macros.h"
-#include "detect_arm.h"
-#include "detect_x86.h"
-#include "have_built_path_for.h"
-#include "platform.h"
+#include "ruy/check_macros.h"
+#include "ruy/detect_arm.h"
+#include "ruy/detect_x86.h"
+#include "ruy/have_built_path_for.h"
+#include "ruy/platform.h"
 
 namespace ruy {
 
diff --git a/context.h b/ruy/context.h
index 6772bed..330a7e7 100644
--- a/context.h
+++ b/ruy/context.h
@@ -13,19 +13,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_CONTEXT_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_CONTEXT_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_CONTEXT_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_CONTEXT_H_
 
 #include <cstddef>
 #include <memory>
 #include <vector>
 
-#include "allocator.h"
-#include "path.h"
-#include "prepacked_cache.h"
-#include "thread_pool.h"
-#include "trace.h"
-#include "tune.h"
+#include "ruy/allocator.h"
+#include "ruy/path.h"
+#include "ruy/prepacked_cache.h"
+#include "ruy/thread_pool.h"
+#include "ruy/trace.h"
+#include "ruy/tune.h"
 
 namespace ruy {
 
@@ -106,4 +106,4 @@ struct Context final {
 
 }  // end namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_CONTEXT_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_CONTEXT_H_
diff --git a/context_test.cc b/ruy/context_test.cc
index 2a9c4cd..c189030 100644
--- a/context_test.cc
+++ b/ruy/context_test.cc
@@ -13,11 +13,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "context.h"
+#include "ruy/context.h"
 
 #include "testing/base/public/gunit.h"
-#include "path.h"
-#include "platform.h"
+#include "ruy/path.h"
+#include "ruy/platform.h"
 
 namespace ruy {
 namespace {
diff --git a/cpu_cache_size.h b/ruy/cpu_cache_size.h
index 98d4864..82f41cc 100644
--- a/cpu_cache_size.h
+++ b/ruy/cpu_cache_size.h
@@ -13,11 +13,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_CPU_CACHE_SIZE_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_CPU_CACHE_SIZE_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_CPU_CACHE_SIZE_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_CPU_CACHE_SIZE_H_
 
-#include "path.h"
-#include "platform.h"
+#include "ruy/path.h"
+#include "ruy/platform.h"
 
 namespace ruy {
 
@@ -78,4 +78,4 @@ inline int SharedDataCacheSize(Path path) {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_CPU_CACHE_SIZE_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_CPU_CACHE_SIZE_H_
diff --git a/detect_arm.cc b/ruy/detect_arm.cc
index 3d39360..85f7156 100644
--- a/detect_arm.cc
+++ b/ruy/detect_arm.cc
@@ -40,7 +40,7 @@ limitations under the License.
  * file - in actual code for (A) and in a comment for (B).
  */
 
-#include "detect_arm.h"
+#include "ruy/detect_arm.h"
 
 #if defined __linux__ && defined __aarch64__
 #include <sys/auxv.h>
diff --git a/detect_arm.h b/ruy/detect_arm.h
index e843a68..9a1542d 100644
--- a/detect_arm.h
+++ b/ruy/detect_arm.h
@@ -15,8 +15,8 @@ limitations under the License.
 
 // Temporary dotprod-detection code until we can rely on getauxval.
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_DETECT_ARM_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_DETECT_ARM_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_DETECT_ARM_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_DETECT_ARM_H_
 
 namespace ruy {
 
@@ -26,4 +26,4 @@ bool DetectDotprod();
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_DETECT_ARM_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_DETECT_ARM_H_
diff --git a/detect_x86.cc b/ruy/detect_x86.cc
index 7477ea3..ded37b1 100644
--- a/detect_x86.cc
+++ b/ruy/detect_x86.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "detect_x86.h"
+#include "ruy/detect_x86.h"
 
 #include <cstdint>
 
diff --git a/detect_x86.h b/ruy/detect_x86.h
index d330d05..fede7c7 100644
--- a/detect_x86.h
+++ b/ruy/detect_x86.h
@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_DETECT_X86_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_DETECT_X86_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_DETECT_X86_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_DETECT_X86_H_
 
-#include "platform.h"
+#include "ruy/platform.h"
 
 namespace ruy {
 
@@ -46,4 +46,4 @@ inline bool DetectCpuAvxVnni() { return false; }
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_DETECT_X86_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_DETECT_X86_H_
diff --git a/dispatch.h b/ruy/dispatch.h
index 3b9c8b2..2fd50d0 100644
--- a/dispatch.h
+++ b/ruy/dispatch.h
@@ -30,31 +30,31 @@ limitations under the License.
 //
 // This file also performs some checking of invariants to catch user errors.
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_DISPATCH_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_DISPATCH_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_DISPATCH_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_DISPATCH_H_
 
 #include <algorithm>
 #include <cstdint>
 #include <limits>  // IWYU pragma: keep
 #include <type_traits>
 
-#include "check_macros.h"
-#include "common.h"
-#include "context.h"
-#include "internal_matrix.h"
-#include "kernel.h"
-#include "kernel_common.h"
-#include "matrix.h"
-#include "opt_set.h"
-#include "pack.h"
-#include "pack_common.h"
-#include "path.h"
-#include "profiler/instrumentation.h"
-#include "side_pair.h"
-#include "size_util.h"
-#include "spec.h"
-#include "trmul.h"
-#include "trmul_params.h"
+#include "ruy/check_macros.h"
+#include "ruy/common.h"
+#include "ruy/context.h"
+#include "ruy/internal_matrix.h"
+#include "ruy/kernel.h"
+#include "ruy/kernel_common.h"
+#include "ruy/matrix.h"
+#include "ruy/opt_set.h"
+#include "ruy/pack.h"
+#include "ruy/pack_common.h"
+#include "ruy/path.h"
+#include "ruy/profiler/instrumentation.h"
+#include "ruy/side_pair.h"
+#include "ruy/size_util.h"
+#include "ruy/spec.h"
+#include "ruy/trmul.h"
+#include "ruy/trmul_params.h"
 
 namespace ruy {
 
@@ -479,4 +479,4 @@ void DispatchMul(const Matrix<LhsScalar>& lhs, const Matrix<RhsScalar>& rhs,
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_DISPATCH_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_DISPATCH_H_
diff --git a/example.cc b/ruy/example.cc
index ce3fd81..3b42c97 100644
--- a/example.cc
+++ b/ruy/example.cc
@@ -16,7 +16,7 @@ limitations under the License.
 #include <cstdint>
 #include <iostream>
 
-#include "ruy.h"
+#include "ruy/ruy.h"
 
 void ExampleMulFloat(ruy::Context *context) {
   const float lhs_data[] = {1, 2, 3, 4};
diff --git a/example_advanced.cc b/ruy/example_advanced.cc
index 90a6473..9041bdb 100644
--- a/example_advanced.cc
+++ b/ruy/example_advanced.cc
@@ -18,7 +18,7 @@ limitations under the License.
 #include <memory>
 #include <vector>
 
-#include "ruy_advanced.h"
+#include "ruy/ruy_advanced.h"
 
 // Simple allocator for allocating pre-packed matrices.
 class SimpleAllocator {
diff --git a/have_built_path_for.h b/ruy/have_built_path_for.h
index 98c6af5..8913965 100644
--- a/have_built_path_for.h
+++ b/ruy/have_built_path_for.h
@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_HAVE_BUILT_PATH_FOR_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_HAVE_BUILT_PATH_FOR_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_HAVE_BUILT_PATH_FOR_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_HAVE_BUILT_PATH_FOR_H_
 
-#include "platform.h"
+#include "ruy/platform.h"
 
 namespace ruy {
 
@@ -29,4 +29,4 @@ bool HaveBuiltPathForAvxVnni();
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_HAVE_BUILT_PATH_FOR_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_HAVE_BUILT_PATH_FOR_H_
diff --git a/have_built_path_for_avx2.cc b/ruy/have_built_path_for_avx2.cc
index 33d1b1c..ceca8a4 100644
--- a/have_built_path_for_avx2.cc
+++ b/ruy/have_built_path_for_avx2.cc
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "have_built_path_for.h"
-#include "opt_set.h"
+#include "ruy/have_built_path_for.h"
+#include "ruy/opt_set.h"
 
 namespace ruy {
 
diff --git a/have_built_path_for_avx512.cc b/ruy/have_built_path_for_avx512.cc
index 35c4095..15fba62 100644
--- a/have_built_path_for_avx512.cc
+++ b/ruy/have_built_path_for_avx512.cc
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "have_built_path_for.h"
-#include "opt_set.h"
+#include "ruy/have_built_path_for.h"
+#include "ruy/opt_set.h"
 
 namespace ruy {
 
diff --git a/have_built_path_for_avxvnni.cc b/ruy/have_built_path_for_avxvnni.cc
index 5c642a3..68ef2a2 100644
--- a/have_built_path_for_avxvnni.cc
+++ b/ruy/have_built_path_for_avxvnni.cc
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "have_built_path_for.h"
-#include "opt_set.h"
+#include "ruy/have_built_path_for.h"
+#include "ruy/opt_set.h"
 
 namespace ruy {
 
diff --git a/have_built_path_for_sse42.cc b/ruy/have_built_path_for_sse42.cc
index 04c7e6b..2141b75 100644
--- a/have_built_path_for_sse42.cc
+++ b/ruy/have_built_path_for_sse42.cc
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "have_built_path_for.h"
-#include "opt_set.h"
+#include "ruy/have_built_path_for.h"
+#include "ruy/opt_set.h"
 
 namespace ruy {
 
diff --git a/internal_matrix.h b/ruy/internal_matrix.h
index 586fa8b..7fe13be 100644
--- a/internal_matrix.h
+++ b/ruy/internal_matrix.h
@@ -87,18 +87,18 @@ limitations under the License.
 // exists is so that PMatrix is not exposed to users -- we prefer to keep the
 // internal matrix types hidden, even from "advanced" users.
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_INTERNAL_MATRIX_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_INTERNAL_MATRIX_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_INTERNAL_MATRIX_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_INTERNAL_MATRIX_H_
 
 #include <cstddef>
 #include <cstdint>
 #include <type_traits>
 #include <utility>
 
-#include "check_macros.h"
-#include "common.h"
-#include "matrix.h"
-#include "size_util.h"
+#include "ruy/check_macros.h"
+#include "ruy/common.h"
+#include "ruy/matrix.h"
+#include "ruy/size_util.h"
 
 namespace ruy {
 
@@ -385,4 +385,4 @@ KernelLayout ToKernelLayout() {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_INTERNAL_MATRIX_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_INTERNAL_MATRIX_H_
diff --git a/kernel.h b/ruy/kernel.h
index d41d26c..d7930b4 100644
--- a/kernel.h
+++ b/ruy/kernel.h
@@ -13,19 +13,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_KERNEL_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_KERNEL_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_KERNEL_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_KERNEL_H_
 
-#include "platform.h"
+#include "ruy/platform.h"
 
 // IWYU pragma: begin_exports
 #if RUY_PLATFORM(NEON)
-#include "kernel_arm.h"
+#include "ruy/kernel_arm.h"
 #elif RUY_PLATFORM(X86)
-#include "kernel_x86.h"
+#include "ruy/kernel_x86.h"
 #else
-#include "kernel_common.h"
+#include "ruy/kernel_common.h"
 #endif
 // IWYU pragma: end_exports
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_KERNEL_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_KERNEL_H_
diff --git a/kernel_arm.h b/ruy/kernel_arm.h
index 480c41f..408c23a 100644
--- a/kernel_arm.h
+++ b/ruy/kernel_arm.h
@@ -13,24 +13,24 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_KERNEL_ARM_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_KERNEL_ARM_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_KERNEL_ARM_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_KERNEL_ARM_H_
 
 #include <cstddef>
 #include <cstdint>
 
-#include "common.h"
-#include "internal_matrix.h"
-#include "kernel_common.h"
-#include "matrix.h"
-#include "opt_set.h"
-#include "path.h"
-#include "platform.h"
-#include "profiler/instrumentation.h"
-#include "side_pair.h"
-#include "size_util.h"
-#include "spec.h"
-#include "tune.h"
+#include "ruy/common.h"
+#include "ruy/internal_matrix.h"
+#include "ruy/kernel_common.h"
+#include "ruy/matrix.h"
+#include "ruy/opt_set.h"
+#include "ruy/path.h"
+#include "ruy/platform.h"
+#include "ruy/profiler/instrumentation.h"
+#include "ruy/side_pair.h"
+#include "ruy/size_util.h"
+#include "ruy/spec.h"
+#include "ruy/tune.h"
 
 namespace ruy {
 
@@ -208,4 +208,4 @@ struct Kernel<Path::kNeonDotprod, float, float, float,
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_KERNEL_ARM_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_KERNEL_ARM_H_
diff --git a/kernel_arm32.cc b/ruy/kernel_arm32.cc
index 8d7e55d..d537cfe 100644
--- a/kernel_arm32.cc
+++ b/ruy/kernel_arm32.cc
@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "kernel.h"
-#include "opt_set.h"
-#include "platform.h"
-#include "profiler/instrumentation.h"
+#include "ruy/kernel.h"
+#include "ruy/opt_set.h"
+#include "ruy/platform.h"
+#include "ruy/profiler/instrumentation.h"
 
 namespace ruy {
 
diff --git a/kernel_arm64.cc b/ruy/kernel_arm64.cc
index 52381fd..38af032 100644
--- a/kernel_arm64.cc
+++ b/ruy/kernel_arm64.cc
@@ -15,11 +15,11 @@ limitations under the License.
 
 #include <cstdint>
 
-#include "common.h"
-#include "kernel.h"
-#include "opt_set.h"
-#include "platform.h"
-#include "profiler/instrumentation.h"
+#include "ruy/common.h"
+#include "ruy/kernel.h"
+#include "ruy/opt_set.h"
+#include "ruy/platform.h"
+#include "ruy/profiler/instrumentation.h"
 
 namespace ruy {
 
diff --git a/kernel_avx2.cc b/ruy/kernel_avx2.cc
index da660b4..13fe22b 100644
--- a/kernel_avx2.cc
+++ b/ruy/kernel_avx2.cc
@@ -16,11 +16,11 @@ limitations under the License.
 #include <algorithm>
 #include <cstdint>
 
-#include "check_macros.h"
-#include "kernel.h"
-#include "opt_set.h"
-#include "platform.h"
-#include "profiler/instrumentation.h"
+#include "ruy/check_macros.h"
+#include "ruy/kernel.h"
+#include "ruy/opt_set.h"
+#include "ruy/platform.h"
+#include "ruy/profiler/instrumentation.h"
 
 #if RUY_PLATFORM(AVX2) && RUY_OPT_ENABLED(RUY_OPT_ASM)
 #include <immintrin.h>  // IWYU pragma: keep
diff --git a/kernel_avx512.cc b/ruy/kernel_avx512.cc
index 202b347..5e771a5 100644
--- a/kernel_avx512.cc
+++ b/ruy/kernel_avx512.cc
@@ -16,11 +16,11 @@ limitations under the License.
 #include <algorithm>
 #include <cstdint>
 
-#include "check_macros.h"
-#include "kernel.h"
-#include "opt_set.h"
-#include "platform.h"
-#include "profiler/instrumentation.h"
+#include "ruy/check_macros.h"
+#include "ruy/kernel.h"
+#include "ruy/opt_set.h"
+#include "ruy/platform.h"
+#include "ruy/profiler/instrumentation.h"
 
 #if RUY_PLATFORM(AVX512) && RUY_OPT_ENABLED(RUY_OPT_ASM)
 #include <immintrin.h>  // IWYU pragma: keep
diff --git a/kernel_avxvnni.cc b/ruy/kernel_avxvnni.cc
index b7b8c9e..4513b20 100644
--- a/kernel_avxvnni.cc
+++ b/ruy/kernel_avxvnni.cc
@@ -16,11 +16,11 @@ limitations under the License.
 #include <algorithm>
 #include <cstdint>
 
-#include "check_macros.h"
-#include "kernel.h"
-#include "opt_set.h"
-#include "platform.h"
-#include "profiler/instrumentation.h"
+#include "ruy/check_macros.h"
+#include "ruy/kernel.h"
+#include "ruy/opt_set.h"
+#include "ruy/platform.h"
+#include "ruy/profiler/instrumentation.h"
 
 #if RUY_PLATFORM(AVX_VNNI) && RUY_OPT_ENABLED(RUY_OPT_ASM)
 #include <immintrin.h>  // IWYU pragma: keep
diff --git a/kernel_common.h b/ruy/kernel_common.h
index f20bd16..0cd123f 100644
--- a/kernel_common.h
+++ b/ruy/kernel_common.h
@@ -13,25 +13,25 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_KERNEL_COMMON_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_KERNEL_COMMON_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_KERNEL_COMMON_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_KERNEL_COMMON_H_
 
 #include <algorithm>
 #include <cstdint>
 #include <type_traits>
 
-#include "check_macros.h"
-#include "common.h"
-#include "internal_matrix.h"
-#include "matrix.h"
-#include "opt_set.h"
-#include "path.h"
-#include "platform.h"
-#include "profiler/instrumentation.h"
-#include "side_pair.h"
-#include "size_util.h"
-#include "spec.h"
-#include "tune.h"
+#include "ruy/check_macros.h"
+#include "ruy/common.h"
+#include "ruy/internal_matrix.h"
+#include "ruy/matrix.h"
+#include "ruy/opt_set.h"
+#include "ruy/path.h"
+#include "ruy/platform.h"
+#include "ruy/profiler/instrumentation.h"
+#include "ruy/side_pair.h"
+#include "ruy/size_util.h"
+#include "ruy/spec.h"
+#include "ruy/tune.h"
 
 namespace ruy {
 
@@ -478,4 +478,4 @@ struct KernelParamsFloat {};
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_KERNEL_COMMON_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_KERNEL_COMMON_H_
diff --git a/kernel_sse42.cc b/ruy/kernel_sse42.cc
index 37196a6..747ca1c 100644
--- a/kernel_sse42.cc
+++ b/ruy/kernel_sse42.cc
@@ -16,11 +16,11 @@ limitations under the License.
 #include <algorithm>
 #include <cstdint>
 
-#include "check_macros.h"
-#include "kernel.h"
-#include "opt_set.h"
-#include "platform.h"
-#include "profiler/instrumentation.h"
+#include "ruy/check_macros.h"
+#include "ruy/kernel.h"
+#include "ruy/opt_set.h"
+#include "ruy/platform.h"
+#include "ruy/profiler/instrumentation.h"
 
 #if RUY_PLATFORM(SSE42) && RUY_OPT_ENABLED(RUY_OPT_ASM)
 #include <immintrin.h>  // IWYU pragma: keep
diff --git a/kernel_x86.h b/ruy/kernel_x86.h
index d6ce72a..dbcf42b 100644
--- a/kernel_x86.h
+++ b/ruy/kernel_x86.h
@@ -13,20 +13,20 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_KERNEL_X86_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_KERNEL_X86_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_KERNEL_X86_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_KERNEL_X86_H_
 
 #include <cstdint>
 
-#include "common.h"
-#include "internal_matrix.h"
-#include "kernel_common.h"
-#include "matrix.h"
-#include "opt_set.h"
-#include "path.h"
-#include "platform.h"
-#include "spec.h"
-#include "tune.h"
+#include "ruy/common.h"
+#include "ruy/internal_matrix.h"
+#include "ruy/kernel_common.h"
+#include "ruy/matrix.h"
+#include "ruy/opt_set.h"
+#include "ruy/path.h"
+#include "ruy/platform.h"
+#include "ruy/spec.h"
+#include "ruy/tune.h"
 
 namespace ruy {
 
@@ -219,4 +219,4 @@ struct Kernel<Path::kAvxVnni, float, float, float, BasicSpec<float, float>> {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_KERNEL_X86_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_KERNEL_X86_H_
diff --git a/matrix.h b/ruy/matrix.h
index 8c5fbf9..2dcb081 100644
--- a/matrix.h
+++ b/ruy/matrix.h
@@ -13,14 +13,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_MATRIX_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_MATRIX_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_MATRIX_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_MATRIX_H_
 
 #include <cstddef>
 #include <cstdint>  // IWYU pragma: keep
 #include <type_traits>
 
-#include "check_macros.h"
+#include "ruy/check_macros.h"
 
 namespace ruy {
 
@@ -179,4 +179,4 @@ constexpr int FixedKernelLayout<tOrder, tRows, tCols>::kRows;
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_MATRIX_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_MATRIX_H_
diff --git a/opt_set.h b/ruy/opt_set.h
index d082ade..fef0107 100644
--- a/opt_set.h
+++ b/ruy/opt_set.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_OPT_SET_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_OPT_SET_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_OPT_SET_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_OPT_SET_H_
 
 // RUY_OPT_SET is a compile-time API that Ruy provides for enabling/disabling
 // certain optimizations. It should be used by defining that macro on the
@@ -48,4 +48,4 @@ limitations under the License.
 
 #define RUY_OPT_ENABLED(ruy_opt) ((RUY_OPT_SET & ruy_opt) != 0)
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_OPT_SET_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_OPT_SET_H_
diff --git a/pack.h b/ruy/pack.h
index 4aaec2e..e066663 100644
--- a/pack.h
+++ b/ruy/pack.h
@@ -80,19 +80,19 @@ limitations under the License.
 // column sums for quantization (and never row sums, since the LHS is
 // transposed).
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_PACK_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_PACK_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PACK_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PACK_H_
 
-#include "platform.h"
+#include "ruy/platform.h"
 
 // IWYU pragma: begin_exports
 #if RUY_PLATFORM(NEON)
-#include "pack_arm.h"
+#include "ruy/pack_arm.h"
 #elif RUY_PLATFORM(X86)
-#include "pack_x86.h"
+#include "ruy/pack_x86.h"
 #else
-#include "pack_common.h"
+#include "ruy/pack_common.h"
 #endif
 // IWYU pragma: end_exports
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_PACK_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PACK_H_
diff --git a/pack_arm.cc b/ruy/pack_arm.cc
index 549e615..8b68a39 100644
--- a/pack_arm.cc
+++ b/ruy/pack_arm.cc
@@ -14,11 +14,11 @@ limitations under the License.
 ==============================================================================*/
 #include <cstdint>
 
-#include "common.h"
-#include "opt_set.h"
-#include "pack.h"
-#include "platform.h"
-#include "profiler/instrumentation.h"
+#include "ruy/common.h"
+#include "ruy/opt_set.h"
+#include "ruy/pack.h"
+#include "ruy/platform.h"
+#include "ruy/profiler/instrumentation.h"
 
 namespace ruy {
 
diff --git a/pack_arm.h b/ruy/pack_arm.h
index d93475b..8e7f619 100644
--- a/pack_arm.h
+++ b/ruy/pack_arm.h
@@ -80,22 +80,22 @@ limitations under the License.
 // column sums for quantization (and never row sums, since the LHS is
 // transposed).
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_PACK_ARM_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_PACK_ARM_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PACK_ARM_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PACK_ARM_H_
 
 #include <cstdint>
 #include <type_traits>
 
-#include "check_macros.h"
-#include "common.h"
-#include "internal_matrix.h"
-#include "matrix.h"
-#include "opt_set.h"
-#include "pack_common.h"
-#include "path.h"
-#include "platform.h"
-#include "profiler/instrumentation.h"
-#include "tune.h"
+#include "ruy/check_macros.h"
+#include "ruy/common.h"
+#include "ruy/internal_matrix.h"
+#include "ruy/matrix.h"
+#include "ruy/opt_set.h"
+#include "ruy/pack_common.h"
+#include "ruy/path.h"
+#include "ruy/platform.h"
+#include "ruy/profiler/instrumentation.h"
+#include "ruy/tune.h"
 
 namespace ruy {
 
@@ -494,4 +494,4 @@ struct PackImpl<Path::kNeon, FixedKernelLayout<Order::kRowMajor, 1, 4>, float,
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_PACK_ARM_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PACK_ARM_H_
diff --git a/pack_avx2.cc b/ruy/pack_avx2.cc
index 65efaab..013a8c0 100644
--- a/pack_avx2.cc
+++ b/ruy/pack_avx2.cc
@@ -16,13 +16,13 @@ limitations under the License.
 #include <cstdint>
 #include <cstring>
 
-#include "check_macros.h"
-#include "matrix.h"
-#include "opt_set.h"
-#include "pack.h"
-#include "path.h"
-#include "platform.h"
-#include "profiler/instrumentation.h"
+#include "ruy/check_macros.h"
+#include "ruy/matrix.h"
+#include "ruy/opt_set.h"
+#include "ruy/pack.h"
+#include "ruy/path.h"
+#include "ruy/platform.h"
+#include "ruy/profiler/instrumentation.h"
 
 #if RUY_PLATFORM(AVX2) && RUY_OPT_ENABLED(RUY_OPT_INTRINSICS)
 #include <immintrin.h>  // IWYU pragma: keep
diff --git a/pack_avx512.cc b/ruy/pack_avx512.cc
index 9d27b9a..ecad3a2 100644
--- a/pack_avx512.cc
+++ b/ruy/pack_avx512.cc
@@ -16,13 +16,13 @@ limitations under the License.
 #include <cstdint>
 #include <cstring>
 
-#include "check_macros.h"
-#include "matrix.h"
-#include "opt_set.h"
-#include "pack.h"
-#include "path.h"
-#include "platform.h"
-#include "profiler/instrumentation.h"
+#include "ruy/check_macros.h"
+#include "ruy/matrix.h"
+#include "ruy/opt_set.h"
+#include "ruy/pack.h"
+#include "ruy/path.h"
+#include "ruy/platform.h"
+#include "ruy/profiler/instrumentation.h"
 
 #if RUY_PLATFORM(AVX512) && RUY_OPT_ENABLED(RUY_OPT_INTRINSICS)
 #include <immintrin.h>  // IWYU pragma: keep
diff --git a/pack_avxvnni.cc b/ruy/pack_avxvnni.cc
index 6b08415..bb9a730 100644
--- a/pack_avxvnni.cc
+++ b/ruy/pack_avxvnni.cc
@@ -16,13 +16,13 @@ limitations under the License.
 #include <cstdint>
 #include <cstring>
 
-#include "check_macros.h"
-#include "matrix.h"
-#include "opt_set.h"
-#include "pack.h"
-#include "path.h"
-#include "platform.h"
-#include "profiler/instrumentation.h"
+#include "ruy/check_macros.h"
+#include "ruy/matrix.h"
+#include "ruy/opt_set.h"
+#include "ruy/pack.h"
+#include "ruy/path.h"
+#include "ruy/platform.h"
+#include "ruy/profiler/instrumentation.h"
 
 #if RUY_PLATFORM(AVX_VNNI) && RUY_OPT_ENABLED(RUY_OPT_INTRINSICS)
 #include <immintrin.h>  // IWYU pragma: keep
diff --git a/pack_common.h b/ruy/pack_common.h
index 0fe2797..5c03afd 100644
--- a/pack_common.h
+++ b/ruy/pack_common.h
@@ -80,20 +80,20 @@ limitations under the License.
 // column sums for quantization (and never row sums, since the LHS is
 // transposed).
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_PACK_COMMON_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_PACK_COMMON_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PACK_COMMON_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PACK_COMMON_H_
 
 #include <cstdint>
 
-#include "check_macros.h"
-#include "common.h"
-#include "internal_matrix.h"
-#include "matrix.h"
-#include "opt_set.h"
-#include "path.h"
-#include "platform.h"
-#include "profiler/instrumentation.h"
-#include "tune.h"
+#include "ruy/check_macros.h"
+#include "ruy/common.h"
+#include "ruy/internal_matrix.h"
+#include "ruy/matrix.h"
+#include "ruy/opt_set.h"
+#include "ruy/path.h"
+#include "ruy/platform.h"
+#include "ruy/profiler/instrumentation.h"
+#include "ruy/tune.h"
 
 namespace ruy {
 
@@ -243,4 +243,4 @@ void RunPack(Tuning tuning, const DMatrix& src_matrix, PMatrix* packed_matrix,
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_PACK_COMMON_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PACK_COMMON_H_
diff --git a/pack_sse42.cc b/ruy/pack_sse42.cc
index ca59dc7..90c7250 100644
--- a/pack_sse42.cc
+++ b/ruy/pack_sse42.cc
@@ -16,13 +16,13 @@ limitations under the License.
 #include <cstdint>
 #include <cstring>
 
-#include "check_macros.h"
-#include "matrix.h"
-#include "opt_set.h"
-#include "pack.h"
-#include "path.h"
-#include "platform.h"
-#include "profiler/instrumentation.h"
+#include "ruy/check_macros.h"
+#include "ruy/matrix.h"
+#include "ruy/opt_set.h"
+#include "ruy/pack.h"
+#include "ruy/path.h"
+#include "ruy/platform.h"
+#include "ruy/profiler/instrumentation.h"
 
 #if RUY_PLATFORM(SSE42) && RUY_OPT_ENABLED(RUY_OPT_INTRINSICS)
 #include <immintrin.h>  // IWYU pragma: keep
diff --git a/pack_x86.h b/ruy/pack_x86.h
index 4998fc6..b777cc1 100644
--- a/pack_x86.h
+++ b/ruy/pack_x86.h
@@ -80,23 +80,23 @@ limitations under the License.
 // column sums for quantization (and never row sums, since the LHS is
 // transposed).
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_PACK_X86_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_PACK_X86_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PACK_X86_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PACK_X86_H_
 
 #include <cstdint>
 #include <cstring>
 #include <type_traits>
 
-#include "check_macros.h"
-#include "common.h"
-#include "internal_matrix.h"
-#include "matrix.h"
-#include "opt_set.h"
-#include "pack_common.h"
-#include "path.h"
-#include "platform.h"
-#include "profiler/instrumentation.h"
-#include "tune.h"
+#include "ruy/check_macros.h"
+#include "ruy/common.h"
+#include "ruy/internal_matrix.h"
+#include "ruy/matrix.h"
+#include "ruy/opt_set.h"
+#include "ruy/pack_common.h"
+#include "ruy/path.h"
+#include "ruy/platform.h"
+#include "ruy/profiler/instrumentation.h"
+#include "ruy/tune.h"
 
 namespace ruy {
 
@@ -458,4 +458,4 @@ struct PackImpl<Path::kAvxVnni, FixedKernelLayout<Order::kRowMajor, 1, 16>,
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_PACK_X86_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PACK_X86_H_
diff --git a/path.h b/ruy/path.h
index 3ff0c57..7141b16 100644
--- a/path.h
+++ b/ruy/path.h
@@ -13,13 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_PATH_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_PATH_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PATH_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PATH_H_
 
 #include <cstdint>
 
-#include "platform.h"
-#include "size_util.h"
+#include "ruy/platform.h"
+#include "ruy/size_util.h"
 
 namespace ruy {
 
@@ -159,4 +159,4 @@ constexpr Path kAllPaths = Path::kReference | Path::kStandardCpp;
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_PATH_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PATH_H_
diff --git a/platform.h b/ruy/platform.h
index d86c957..d6e86e6 100644
--- a/platform.h
+++ b/ruy/platform.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_PLATFORM_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_PLATFORM_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PLATFORM_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PLATFORM_H_
 
 #ifdef __ANDROID_NDK__
 #include <android/ndk-version.h>
@@ -153,4 +153,4 @@ limitations under the License.
 #define RUY_DONOTUSEDIRECTLY_EMSCRIPTEN 0
 #endif
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_PLATFORM_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PLATFORM_H_
diff --git a/pmu.cc b/ruy/pmu.cc
index 5c87d73..1d87b1f 100644
--- a/pmu.cc
+++ b/ruy/pmu.cc
@@ -13,9 +13,9 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "pmu.h"
+#include "ruy/pmu.h"
 
-#include "check_macros.h"
+#include "ruy/check_macros.h"
 
 #ifdef __linux__
 #include <asm/unistd.h>
diff --git a/pmu.h b/ruy/pmu.h
index 03f0cb7..721c1d5 100644
--- a/pmu.h
+++ b/ruy/pmu.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_PMU_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_PMU_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PMU_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PMU_H_
 
 namespace ruy {
 
@@ -41,4 +41,4 @@ class PmuEvents {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_PMU_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PMU_H_
diff --git a/prepack.h b/ruy/prepack.h
index 138410d..4bfc9ed 100644
--- a/prepack.h
+++ b/ruy/prepack.h
@@ -15,24 +15,24 @@ limitations under the License.
 
 // Implementation of low-level pre-packing API.
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_PREPACK_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_PREPACK_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PREPACK_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PREPACK_H_
 
 #include <cstddef>
 #include <functional>
 
-#include "check_macros.h"
-#include "context.h"
-#include "dispatch.h"
-#include "internal_matrix.h"
-#include "matrix.h"
-#include "path.h"
-#include "profiler/instrumentation.h"
-#include "side_pair.h"
-#include "spec.h"
-#include "trmul.h"
-#include "trmul_params.h"
-#include "tune.h"
+#include "ruy/check_macros.h"
+#include "ruy/context.h"
+#include "ruy/dispatch.h"
+#include "ruy/internal_matrix.h"
+#include "ruy/matrix.h"
+#include "ruy/path.h"
+#include "ruy/profiler/instrumentation.h"
+#include "ruy/side_pair.h"
+#include "ruy/spec.h"
+#include "ruy/trmul.h"
+#include "ruy/trmul_params.h"
+#include "ruy/tune.h"
 
 namespace ruy {
 
@@ -105,4 +105,4 @@ void MulWithPrepackedInternal(const Matrix<LhsScalar>& lhs,
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_PREPACK_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PREPACK_H_
diff --git a/prepacked_cache.cc b/ruy/prepacked_cache.cc
index 776ef47..020fdf7 100644
--- a/prepacked_cache.cc
+++ b/ruy/prepacked_cache.cc
@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "prepacked_cache.h"
+#include "ruy/prepacked_cache.h"
 
-#include "matrix.h"
-#include "profiler/instrumentation.h"
+#include "ruy/matrix.h"
+#include "ruy/profiler/instrumentation.h"
 
 namespace ruy {
 
diff --git a/prepacked_cache.h b/ruy/prepacked_cache.h
index a47647a..eedd7e4 100644
--- a/prepacked_cache.h
+++ b/ruy/prepacked_cache.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_PREPACKED_CACHE_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_PREPACKED_CACHE_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PREPACKED_CACHE_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PREPACKED_CACHE_H_
 
 #include <cstddef>
 #include <iostream>
@@ -22,9 +22,9 @@ limitations under the License.
 #include <queue>
 #include <vector>
 
-#include "allocator.h"
-#include "matrix.h"
-#include "time.h"
+#include "ruy/allocator.h"
+#include "ruy/matrix.h"
+#include "ruy/time.h"
 
 namespace ruy {
 
@@ -127,4 +127,4 @@ class PrepackedCache {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_PREPACKED_CACHE_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PREPACKED_CACHE_H_
diff --git a/prepacked_cache_test.cc b/ruy/prepacked_cache_test.cc
index fbf4f5a..a65841e 100644
--- a/prepacked_cache_test.cc
+++ b/ruy/prepacked_cache_test.cc
@@ -13,13 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "prepacked_cache.h"
+#include "ruy/prepacked_cache.h"
 
 #include <thread>  // NOLINT(build/c++11)
 
 #include "testing/base/public/gunit.h"
-#include "ruy.h"
-#include "time.h"
+#include "ruy/ruy.h"
+#include "ruy/time.h"
 
 namespace ruy {
 namespace {
diff --git a/profiler/BUILD b/ruy/profiler/BUILD
index b0af802..b0af802 100644
--- a/profiler/BUILD
+++ b/ruy/profiler/BUILD
diff --git a/profiler/README.md b/ruy/profiler/README.md
index 8d79025..8d79025 100644
--- a/profiler/README.md
+++ b/ruy/profiler/README.md
diff --git a/profiler/instrumentation.cc b/ruy/profiler/instrumentation.cc
index 3ceefb3..f03f667 100644
--- a/profiler/instrumentation.cc
+++ b/ruy/profiler/instrumentation.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "profiler/instrumentation.h"
+#include "ruy/profiler/instrumentation.h"
 
 #ifdef RUY_PROFILER
 
diff --git a/profiler/instrumentation.h b/ruy/profiler/instrumentation.h
index cb0e702..a9046d4 100644
--- a/profiler/instrumentation.h
+++ b/ruy/profiler/instrumentation.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_PROFILER_INSTRUMENTATION_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_PROFILER_INSTRUMENTATION_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PROFILER_INSTRUMENTATION_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PROFILER_INSTRUMENTATION_H_
 
 #ifdef RUY_PROFILER
 #include <cstdio>
@@ -200,4 +200,4 @@ class ScopeLabel {
 }  // namespace profiler
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_PROFILER_INSTRUMENTATION_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PROFILER_INSTRUMENTATION_H_
diff --git a/profiler/profiler.cc b/ruy/profiler/profiler.cc
index 8e527ba..ae3a2e2 100644
--- a/profiler/profiler.cc
+++ b/ruy/profiler/profiler.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "profiler/profiler.h"
+#include "ruy/profiler/profiler.h"
 
 #ifdef RUY_PROFILER
 #include <atomic>
@@ -24,8 +24,8 @@ limitations under the License.
 #include <vector>
 #endif
 
-#include "profiler/instrumentation.h"
-#include "profiler/treeview.h"
+#include "ruy/profiler/instrumentation.h"
+#include "ruy/profiler/treeview.h"
 
 namespace ruy {
 namespace profiler {
diff --git a/profiler/profiler.h b/ruy/profiler/profiler.h
index caff2d5..b68ca90 100644
--- a/profiler/profiler.h
+++ b/ruy/profiler/profiler.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_PROFILER_PROFILER_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_PROFILER_PROFILER_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PROFILER_PROFILER_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PROFILER_PROFILER_H_
 
 #include <cstdio>
 
@@ -25,8 +25,8 @@ limitations under the License.
 #include <vector>
 #endif
 
-#include "profiler/instrumentation.h"
-#include "profiler/treeview.h"
+#include "ruy/profiler/instrumentation.h"
+#include "ruy/profiler/treeview.h"
 
 namespace ruy {
 namespace profiler {
@@ -103,4 +103,4 @@ struct ScopeProfile {
 }  // namespace profiler
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_PROFILER_PROFILER_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PROFILER_PROFILER_H_
diff --git a/profiler/test.cc b/ruy/profiler/test.cc
index 6a8fbda..e94840b 100644
--- a/profiler/test.cc
+++ b/ruy/profiler/test.cc
@@ -18,9 +18,9 @@ limitations under the License.
 #include <thread>
 
 #include "testing/base/public/gunit.h"
-#include "profiler/profiler.h"
-#include "profiler/test_instrumented_library.h"
-#include "profiler/treeview.h"
+#include "ruy/profiler/profiler.h"
+#include "ruy/profiler/test_instrumented_library.h"
+#include "ruy/profiler/treeview.h"
 
 namespace ruy {
 namespace profiler {
diff --git a/profiler/test_instrumented_library.cc b/ruy/profiler/test_instrumented_library.cc
index 42461c3..b017ea9 100644
--- a/profiler/test_instrumented_library.cc
+++ b/ruy/profiler/test_instrumented_library.cc
@@ -15,7 +15,7 @@ limitations under the License.
 
 #include <vector>
 
-#include "profiler/instrumentation.h"
+#include "ruy/profiler/instrumentation.h"
 
 namespace {
 
diff --git a/profiler/test_instrumented_library.h b/ruy/profiler/test_instrumented_library.h
index 03956df..53d204e 100644
--- a/profiler/test_instrumented_library.h
+++ b/ruy/profiler/test_instrumented_library.h
@@ -13,11 +13,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_PROFILER_TEST_INSTRUMENTED_LIBRARY_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_PROFILER_TEST_INSTRUMENTED_LIBRARY_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PROFILER_TEST_INSTRUMENTED_LIBRARY_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PROFILER_TEST_INSTRUMENTED_LIBRARY_H_
 
-#include "profiler/instrumentation.h"
+#include "ruy/profiler/instrumentation.h"
 
 void MergeSort(int size, int* data);
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_PROFILER_TEST_INSTRUMENTED_LIBRARY_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PROFILER_TEST_INSTRUMENTED_LIBRARY_H_
diff --git a/profiler/treeview.cc b/ruy/profiler/treeview.cc
index 64ed05a..48d922a 100644
--- a/profiler/treeview.cc
+++ b/ruy/profiler/treeview.cc
@@ -15,7 +15,7 @@ limitations under the License.
 
 #ifdef RUY_PROFILER
 
-#include "profiler/treeview.h"
+#include "ruy/profiler/treeview.h"
 
 #include <algorithm>
 #include <cstdio>
diff --git a/profiler/treeview.h b/ruy/profiler/treeview.h
index 80d1180..e34b4f9 100644
--- a/profiler/treeview.h
+++ b/ruy/profiler/treeview.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_PROFILER_TREEVIEW_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_PROFILER_TREEVIEW_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PROFILER_TREEVIEW_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PROFILER_TREEVIEW_H_
 
 #ifdef RUY_PROFILER
 
@@ -23,7 +23,7 @@ limitations under the License.
 #include <memory>
 #include <vector>
 
-#include "profiler/instrumentation.h"
+#include "ruy/profiler/instrumentation.h"
 
 namespace ruy {
 namespace profiler {
@@ -127,4 +127,4 @@ void CollapseNodesMatchingFormatted(const TreeView& treeview_in, int depth,
 
 #endif  // RUY_PROFILER
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_PROFILER_TREEVIEW_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_PROFILER_TREEVIEW_H_
diff --git a/ruy.h b/ruy/ruy.h
index 8b530c6..9cafe14 100644
--- a/ruy.h
+++ b/ruy/ruy.h
@@ -15,14 +15,14 @@ limitations under the License.
 
 // This is the only Ruy header that users should #include.
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_RUY_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_RUY_H_
 
-#include "context.h"
-#include "dispatch.h"
-#include "matrix.h"
-#include "path.h"
-#include "spec.h"
+#include "ruy/context.h"
+#include "ruy/dispatch.h"
+#include "ruy/matrix.h"
+#include "ruy/path.h"
+#include "ruy/spec.h"
 
 namespace ruy {
 
@@ -39,4 +39,4 @@ void Mul(const Matrix<LhsScalar>& lhs, const Matrix<RhsScalar>& rhs,
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_RUY_H_
diff --git a/ruy_advanced.h b/ruy/ruy_advanced.h
index 333e173..124ddd2 100644
--- a/ruy_advanced.h
+++ b/ruy/ruy_advanced.h
@@ -13,17 +13,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_ADVANCED_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_ADVANCED_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_RUY_ADVANCED_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_RUY_ADVANCED_H_
 
 #include <cstddef>
 #include <functional>
 
-#include "context.h"
-#include "matrix.h"
-#include "path.h"
-#include "prepack.h"
-#include "side_pair.h"
+#include "ruy/context.h"
+#include "ruy/matrix.h"
+#include "ruy/path.h"
+#include "ruy/prepack.h"
+#include "ruy/side_pair.h"
 
 namespace ruy {
 
@@ -66,4 +66,4 @@ void MulWithPrepacked(const Matrix<LhsScalar>& lhs,
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_ADVANCED_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_RUY_ADVANCED_H_
diff --git a/ruy_test.bzl b/ruy/ruy_test.bzl
index ef7e8b1..ef7e8b1 100644
--- a/ruy_test.bzl
+++ b/ruy/ruy_test.bzl
diff --git a/ruy/ruy_test_ext.bzl b/ruy/ruy_test_ext.bzl
new file mode 100644
index 0000000..263121f
--- /dev/null
+++ b/ruy/ruy_test_ext.bzl
@@ -0,0 +1,19 @@
+"""Allows to specialize the ruy BUILD to availability of external libraries"""
+
+def ruy_test_ext_defines():
+    return select({
+        "//tools/cc_target_os:windows": [],
+        "//tools/cc_target_os:wasm": [],
+        "//tools/cc_target_os:chromiumos": ["RUY_TESTING_ON_CHROMIUMOS"],
+        "//conditions:default": ["RUY_TEST_EXTERNAL_PATHS"],
+    })
+
+def ruy_test_ext_deps():
+    return select({
+        "//tools/cc_target_os:windows": [],
+        "//conditions:default": [
+            "//third_party/eigen3",
+            "//third_party/gemmlowp",
+            "//third_party/lapack:blas",
+        ],
+    })
diff --git a/ruy_test_ext.bzl b/ruy/ruy_test_ext.bzl.opensource
index 5701fff..5701fff 100644
--- a/ruy_test_ext.bzl
+++ b/ruy/ruy_test_ext.bzl.opensource
diff --git a/side_pair.h b/ruy/side_pair.h
index 2951760..e62968b 100644
--- a/side_pair.h
+++ b/ruy/side_pair.h
@@ -13,10 +13,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_SIDE_PAIR_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_SIDE_PAIR_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_SIDE_PAIR_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_SIDE_PAIR_H_
 
-#include "check_macros.h"
+#include "ruy/check_macros.h"
 
 namespace ruy {
 
@@ -61,4 +61,4 @@ class SidePair final {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_SIDE_PAIR_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_SIDE_PAIR_H_
diff --git a/size_util.h b/ruy/size_util.h
index e459c22..2a4bdb9 100644
--- a/size_util.h
+++ b/ruy/size_util.h
@@ -13,12 +13,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_SIZE_UTIL_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_SIZE_UTIL_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_SIZE_UTIL_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_SIZE_UTIL_H_
 
 #include <type_traits>
 
-#include "check_macros.h"
+#include "ruy/check_macros.h"
 
 #ifdef _WIN32
 #include <intrin.h>
@@ -90,4 +90,4 @@ Integer round_up_pot(Integer value, Modulo modulo) {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_SIZE_UTIL_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_SIZE_UTIL_H_
diff --git a/size_util_test.cc b/ruy/size_util_test.cc
index 393f21e..54f0c11 100644
--- a/size_util_test.cc
+++ b/ruy/size_util_test.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "size_util.h"
+#include "ruy/size_util.h"
 
 #include <cstddef>
 #include <cstdint>
diff --git a/spec.h b/ruy/spec.h
index 178ff20..d96b6a9 100644
--- a/spec.h
+++ b/ruy/spec.h
@@ -13,14 +13,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_SPEC_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_SPEC_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_SPEC_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_SPEC_H_
 
 #include <limits>
 #include <type_traits>
 
-#include "cpu_cache_size.h"
-#include "matrix.h"
+#include "ruy/cpu_cache_size.h"
+#include "ruy/matrix.h"
 
 namespace ruy {
 
@@ -115,4 +115,4 @@ struct BasicSpec {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_SPEC_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_SPEC_H_
diff --git a/test.h b/ruy/test.h
index 8c93a56..649a0d9 100644
--- a/test.h
+++ b/ruy/test.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_TEST_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_TEST_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TEST_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TEST_H_
 
 #include <math.h>
 
@@ -37,13 +37,13 @@ limitations under the License.
 #include <vector>
 
 #include "testing/base/public/gunit.h"  // IWYU pragma: export
-#include "matrix.h"  // IWYU pragma: export
-#include "platform.h"
-#include "pmu.h"
-#include "ruy.h"
-#include "ruy_advanced.h"
-#include "spec.h"  // IWYU pragma: export
-#include "time.h"
+#include "ruy/matrix.h"  // IWYU pragma: export
+#include "ruy/platform.h"
+#include "ruy/pmu.h"
+#include "ruy/ruy.h"
+#include "ruy/ruy_advanced.h"
+#include "ruy/spec.h"  // IWYU pragma: export
+#include "ruy/time.h"
 
 #ifdef RUY_TEST_EXTERNAL_PATHS
 #define EIGEN_USE_THREADS
@@ -55,7 +55,7 @@ limitations under the License.
 #endif
 
 #ifdef RUY_PROFILER
-#include "profiler/profiler.h"
+#include "ruy/profiler/profiler.h"
 #endif
 
 namespace ruy {
@@ -2122,4 +2122,4 @@ void TestLinearAllOrders(int rows, int depth, int cols) {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_TEST_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TEST_H_
diff --git a/test_fast.cc b/ruy/test_fast.cc
index 610fc1b..d1c1308 100644
--- a/test_fast.cc
+++ b/ruy/test_fast.cc
@@ -17,7 +17,7 @@ limitations under the License.
 
 #include <vector>
 
-#include "test.h"
+#include "ruy/test.h"
 
 namespace ruy {
 
diff --git a/test_slow.cc b/ruy/test_slow.cc
index 1f3c6bf..9f0f218 100644
--- a/test_slow.cc
+++ b/ruy/test_slow.cc
@@ -15,7 +15,7 @@ limitations under the License.
 
 // This test contains more expensive test cases.
 
-#include "test.h"
+#include "ruy/test.h"
 
 namespace ruy {
 
diff --git a/test_special_specs.cc b/ruy/test_special_specs.cc
index 41e6e51..a621d0e 100644
--- a/test_special_specs.cc
+++ b/ruy/test_special_specs.cc
@@ -15,7 +15,7 @@ limitations under the License.
 
 // This test covers non-basic specs.
 
-#include "test.h"
+#include "ruy/test.h"
 
 namespace ruy {
 
diff --git a/thread_pool.cc b/ruy/thread_pool.cc
index f5c53dd..d09bf1e 100644
--- a/thread_pool.cc
+++ b/ruy/thread_pool.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "thread_pool.h"
+#include "ruy/thread_pool.h"
 
 #include <atomic>
 #include <chrono>              // NOLINT(build/c++11)
@@ -24,8 +24,8 @@ limitations under the License.
 #include <mutex>               // NOLINT(build/c++11)
 #include <thread>              // NOLINT(build/c++11)
 
-#include "check_macros.h"
-#include "wait.h"
+#include "ruy/check_macros.h"
+#include "ruy/wait.h"
 
 namespace ruy {
 
diff --git a/thread_pool.h b/ruy/thread_pool.h
index 8e2d141..04c201c 100644
--- a/thread_pool.h
+++ b/ruy/thread_pool.h
@@ -16,12 +16,12 @@ limitations under the License.
 // This file is a fork of gemmlowp's multi_thread_gemm.h, under Apache 2.0
 // license.
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_THREAD_POOL_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_THREAD_POOL_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_THREAD_POOL_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_THREAD_POOL_H_
 
 #include <vector>
 
-#include "blocking_counter.h"
+#include "ruy/blocking_counter.h"
 
 namespace ruy {
 
@@ -99,4 +99,4 @@ class ThreadPool {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_THREAD_POOL_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_THREAD_POOL_H_
diff --git a/time.h b/ruy/time.h
index d96ed34..9dba75e 100644
--- a/time.h
+++ b/ruy/time.h
@@ -13,8 +13,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_TIME_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_TIME_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TIME_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TIME_H_
 
 #include <chrono>  // NOLINT(build/c++11)
 #include <cstdint>  // IWYU pragma: keep
@@ -78,4 +78,4 @@ inline TimePoint CoarseNow() {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_TIME_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TIME_H_
diff --git a/trace.cc b/ruy/trace.cc
index c11fe9b..1822cdb 100644
--- a/trace.cc
+++ b/ruy/trace.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "trace.h"
+#include "ruy/trace.h"
 
 #include <algorithm>
 #include <cerrno>  // IWYU pragma: keep
@@ -22,9 +22,9 @@ limitations under the License.
 #include <string>
 #include <vector>
 
-#include "check_macros.h"
-#include "side_pair.h"
-#include "time.h"
+#include "ruy/check_macros.h"
+#include "ruy/side_pair.h"
+#include "ruy/time.h"
 
 namespace ruy {
 
diff --git a/trace.h b/ruy/trace.h
index 144065c..d2cc51d 100644
--- a/trace.h
+++ b/ruy/trace.h
@@ -13,13 +13,13 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_TRACE_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_TRACE_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TRACE_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TRACE_H_
 
 #include <cstdint>
 
-#include "block_map.h"
-#include "side_pair.h"
+#include "ruy/block_map.h"
+#include "ruy/side_pair.h"
 
 namespace ruy {
 
@@ -70,4 +70,4 @@ inline void TraceRecordEnd(Trace*) {}
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_TRACE_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TRACE_H_
diff --git a/trmul.cc b/ruy/trmul.cc
index 48ac44f..a3ba46a 100644
--- a/trmul.cc
+++ b/ruy/trmul.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "trmul.h"
+#include "ruy/trmul.h"
 
 #include <atomic>
 #include <cstdint>
@@ -21,20 +21,20 @@ limitations under the License.
 #include <memory>
 #include <vector>
 
-#include "allocator.h"
-#include "block_map.h"
-#include "check_macros.h"
-#include "common.h"
-#include "internal_matrix.h"
-#include "matrix.h"
-#include "opt_set.h"
-#include "profiler/instrumentation.h"
-#include "side_pair.h"
-#include "size_util.h"
-#include "spec.h"
-#include "thread_pool.h"
-#include "trace.h"
-#include "tune.h"
+#include "ruy/allocator.h"
+#include "ruy/block_map.h"
+#include "ruy/check_macros.h"
+#include "ruy/common.h"
+#include "ruy/internal_matrix.h"
+#include "ruy/matrix.h"
+#include "ruy/opt_set.h"
+#include "ruy/profiler/instrumentation.h"
+#include "ruy/side_pair.h"
+#include "ruy/size_util.h"
+#include "ruy/spec.h"
+#include "ruy/thread_pool.h"
+#include "ruy/trace.h"
+#include "ruy/tune.h"
 
 namespace ruy {
 
diff --git a/trmul.h b/ruy/trmul.h
index adb6cb3..f50bb0c 100644
--- a/trmul.h
+++ b/ruy/trmul.h
@@ -23,11 +23,11 @@ limitations under the License.
 // That is why TrMul is nicer to implement, allowing for a more symmetric
 // treatment of LHS and RHS.
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_TRMUL_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_TRMUL_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TRMUL_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TRMUL_H_
 
-#include "context.h"
-#include "trmul_params.h"
+#include "ruy/context.h"
+#include "ruy/trmul_params.h"
 
 namespace ruy {
 
@@ -35,4 +35,4 @@ void TrMul(TrMulParams* params, Context* context);
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_TRMUL_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TRMUL_H_
diff --git a/trmul_params.h b/ruy/trmul_params.h
index fc7970e..47537b7 100644
--- a/trmul_params.h
+++ b/ruy/trmul_params.h
@@ -13,12 +13,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_TRMUL_PARAMS_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_TRMUL_PARAMS_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TRMUL_PARAMS_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TRMUL_PARAMS_H_
 
-#include "internal_matrix.h"
-#include "side_pair.h"
-#include "tune.h"
+#include "ruy/internal_matrix.h"
+#include "ruy/side_pair.h"
+#include "ruy/tune.h"
 
 namespace ruy {
 
@@ -64,4 +64,4 @@ struct TrMulParams {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_TRMUL_PARAMS_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TRMUL_PARAMS_H_
diff --git a/tune.cc b/ruy/tune.cc
index cb615d3..a89242f 100644
--- a/tune.cc
+++ b/ruy/tune.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tune.h"
+#include "ruy/tune.h"
 
 #include <algorithm>
 #include <cstdint>
diff --git a/tune.h b/ruy/tune.h
index db321fd..e6a0ee8 100644
--- a/tune.h
+++ b/ruy/tune.h
@@ -69,12 +69,12 @@ limitations under the License.
 //    nano-benchmark.
 //  * Maybe using getcpu in conjunction with the nano-benchmark to cache
 //    per-CPU-id nano-benchmark results.
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_TUNE_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_TUNE_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TUNE_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TUNE_H_
 
-#include "opt_set.h"
-#include "platform.h"
-#include "time.h"
+#include "ruy/opt_set.h"
+#include "ruy/platform.h"
+#include "ruy/time.h"
 
 // Tuning only implemented on NEON_64 at the moment (see assembly code
 // in the nano-benchmark) and not on Apple (some Apple CPUs produce incorrect
@@ -160,4 +160,4 @@ class TuningResolver {
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_TUNE_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_TUNE_H_
diff --git a/tune_test.cc b/ruy/tune_test.cc
index 1c09dba..ebd86e0 100644
--- a/tune_test.cc
+++ b/ruy/tune_test.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "tune.h"
+#include "ruy/tune.h"
 
 #include <chrono>  // NOLINT(build/c++11)
 #include <thread>  // NOLINT(build/c++11)
diff --git a/tune_tool.cc b/ruy/tune_tool.cc
index 749e4ae..0b6e4ab 100644
--- a/tune_tool.cc
+++ b/ruy/tune_tool.cc
@@ -20,7 +20,7 @@ limitations under the License.
 #include <cstdio>
 #include <thread>  // NOLINT(build/c++11)
 
-#include "tune.h"
+#include "ruy/tune.h"
 
 #ifdef _WIN32
 #define getpid() 0
diff --git a/wait.cc b/ruy/wait.cc
index 330b7dd..d8156bc 100644
--- a/wait.cc
+++ b/ruy/wait.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "wait.h"
+#include "ruy/wait.h"
 
 #include <chrono>  // NOLINT(build/c++11)
 
diff --git a/wait.h b/ruy/wait.h
index 67378ff..900ec8d 100644
--- a/wait.h
+++ b/ruy/wait.h
@@ -13,14 +13,14 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_WAIT_H_
-#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_WAIT_H_
+#ifndef TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_WAIT_H_
+#define TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_WAIT_H_
 
 #include <condition_variable>  // NOLINT(build/c++11)
 #include <functional>
 #include <mutex>  //  NOLINT(build/c++11)
 
-#include "time.h"
+#include "ruy/time.h"
 
 namespace ruy {
 
@@ -70,4 +70,4 @@ void Wait(const std::function<bool()>& condition,
 
 }  // namespace ruy
 
-#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_WAIT_H_
+#endif  // TENSORFLOW_LITE_EXPERIMENTAL_RUY_RUY_WAIT_H_
diff --git a/wait_test.cc b/ruy/wait_test.cc
index 41816c4..f0548f9 100644
--- a/wait_test.cc
+++ b/ruy/wait_test.cc
@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ==============================================================================*/
 
-#include "wait.h"
+#include "ruy/wait.h"
 
 #include <atomic>
 #include <condition_variable>  // NOLINT(build/c++11)
@@ -21,7 +21,7 @@ limitations under the License.
 #include <thread>              // NOLINT(build/c++11)
 
 #include "testing/base/public/gunit.h"
-#include "platform.h"
+#include "ruy/platform.h"
 
 namespace ruy {
 namespace {