diff --git a/pw_allocator/block/result_test.cc b/pw_allocator/block/result_test.cc
index 436e9fbb2..9073e8dcf 100644
--- a/pw_allocator/block/result_test.cc
+++ b/pw_allocator/block/result_test.cc
@@ -17,7 +17,7 @@
 #include <array>
 #include <cstddef>
 
-#include "public/pw_allocator/block/basic.h"
+#include "pw_allocator/block/basic.h"
 #include "pw_status/status.h"
 #include "pw_unit_test/framework.h"
 
diff --git a/pw_checksum/crc32_test.cc b/pw_checksum/crc32_test.cc
index b6490b41f..800861f7c 100644
--- a/pw_checksum/crc32_test.cc
+++ b/pw_checksum/crc32_test.cc
@@ -15,8 +15,8 @@
 
 #include <string_view>
 
-#include "public/pw_checksum/crc32.h"
 #include "pw_bytes/array.h"
+#include "pw_checksum/crc32.h"
 #include "pw_span/span.h"
 #include "pw_unit_test/framework.h"
 
diff --git a/pw_chre/host_link.cc b/pw_chre/host_link.cc
index 51d7749f8..7e4fc1b5f 100644
--- a/pw_chre/host_link.cc
+++ b/pw_chre/host_link.cc
@@ -17,7 +17,6 @@
 #include <algorithm>
 
 #include "chre/core/host_comms_manager.h"
-#include "public/pw_chre/host_link.h"
 #include "pw_chre/host_link.h"
 
 namespace chre {
diff --git a/pw_kvs/flash_partition_stream_test.cc b/pw_kvs/flash_partition_stream_test.cc
index 3111344e9..c40e88f47 100644
--- a/pw_kvs/flash_partition_stream_test.cc
+++ b/pw_kvs/flash_partition_stream_test.cc
@@ -17,7 +17,6 @@
 #include <cstddef>
 #include <cstring>
 
-#include "public/pw_kvs/flash_memory.h"
 #include "pw_kvs/fake_flash_memory.h"
 #include "pw_kvs/flash_memory.h"
 #include "pw_kvs_private/config.h"
diff --git a/pw_rpc/pwpb/client_reader_writer_test.cc b/pw_rpc/pwpb/client_reader_writer_test.cc
index acc24416c..36ac21d1c 100644
--- a/pw_rpc/pwpb/client_reader_writer_test.cc
+++ b/pw_rpc/pwpb/client_reader_writer_test.cc
@@ -16,7 +16,7 @@
 
 #include <optional>
 
-#include "public/pw_rpc/pwpb/client_reader_writer.h"
+#include "pw_rpc/pwpb/client_reader_writer.h"
 #include "pw_rpc/pwpb/client_testing.h"
 #include "pw_rpc_test_protos/test.rpc.pwpb.h"
 #include "pw_unit_test/framework.h"
diff --git a/pw_rpc_transport/egress_ingress_test.cc b/pw_rpc_transport/egress_ingress_test.cc
index bc36be437..5df8b229e 100644
--- a/pw_rpc_transport/egress_ingress_test.cc
+++ b/pw_rpc_transport/egress_ingress_test.cc
@@ -16,7 +16,6 @@
 
 #include <random>
 
-#include "public/pw_rpc_transport/rpc_transport.h"
 #include "pw_bytes/span.h"
 #include "pw_metric/metric.h"
 #include "pw_rpc/client_server.h"
diff --git a/pw_stream_uart_linux/stream_test.cc b/pw_stream_uart_linux/stream_test.cc
index f090b2a63..612c6fb60 100644
--- a/pw_stream_uart_linux/stream_test.cc
+++ b/pw_stream_uart_linux/stream_test.cc
@@ -14,7 +14,6 @@
 
 #include "pw_stream_uart_linux/stream.h"
 
-#include "public/pw_stream_uart_linux/stream.h"
 #include "pw_unit_test/framework.h"
 
 namespace pw::stream {
diff --git a/pw_system/file_service.cc b/pw_system/file_service.cc
index 4e3f3519a..e9d7b5577 100644
--- a/pw_system/file_service.cc
+++ b/pw_system/file_service.cc
@@ -14,7 +14,7 @@
 
 #include "pw_system/file_service.h"
 
-#include "public/pw_system/file_manager.h"
+#include "pw_system/file_manager.h"
 
 namespace pw::system {
 namespace {
diff --git a/pw_transfer/transfer.cc b/pw_transfer/transfer.cc
index 971e9ca73..0a9639359 100644
--- a/pw_transfer/transfer.cc
+++ b/pw_transfer/transfer.cc
@@ -16,7 +16,6 @@
 #define PW_LOG_MODULE_NAME "TRN"
 #define PW_LOG_LEVEL PW_TRANSFER_CONFIG_LOG_LEVEL
 
-#include "public/pw_transfer/transfer.h"
 #include "pw_assert/check.h"
 #include "pw_log/log.h"
 #include "pw_status/try.h"
diff --git a/pw_uart/uart_non_blocking_test.cc b/pw_uart/uart_non_blocking_test.cc
index 8bb05a0bd..ad4c27232 100644
--- a/pw_uart/uart_non_blocking_test.cc
+++ b/pw_uart/uart_non_blocking_test.cc
@@ -12,7 +12,7 @@
 // License for the specific language governing permissions and limitations under
 // the License.
 
-#include "public/pw_uart/uart_non_blocking.h"
+#include "pw_uart/uart_non_blocking.h"
 
 #include <cstdint>