[fxl] Update include paths
FXL is now in //src. We should include "src" in the path.
Change-Id: Icdf56951c5f539b2f7b34fca6ab45a423f23dd16
diff --git a/app/term/key_util.cc b/app/term/key_util.cc
index 08d9a2b..79a87f5 100644
--- a/app/term/key_util.cc
+++ b/app/term/key_util.cc
@@ -7,7 +7,7 @@
#include <fuchsia/ui/input/cpp/fidl.h>
#include <hid/usages.h>
-#include "lib/fxl/logging.h"
+#include "src/lib/fxl/logging.h"
namespace term {
diff --git a/app/term/main.cc b/app/term/main.cc
index b520c3d..678237f 100644
--- a/app/term/main.cc
+++ b/app/term/main.cc
@@ -5,8 +5,8 @@
#include <lib/async-loop/cpp/loop.h>
#include <trace-provider/provider.h>
-#include "lib/fxl/log_settings_command_line.h"
-#include "lib/fxl/logging.h"
+#include "src/lib/fxl/log_settings_command_line.h"
+#include "src/lib/fxl/logging.h"
#include "topaz/app/term/app.h"
#include "topaz/app/term/term_params.h"
diff --git a/app/term/pty_server.cc b/app/term/pty_server.cc
index b39a8b9..475e8a0 100644
--- a/app/term/pty_server.cc
+++ b/app/term/pty_server.cc
@@ -14,7 +14,7 @@
#include <unistd.h>
#include <zircon/status.h>
-#include "lib/fxl/logging.h"
+#include "src/lib/fxl/logging.h"
namespace term {
namespace {
diff --git a/app/term/term_model.cc b/app/term/term_model.cc
index 9ae0581..2cae644 100644
--- a/app/term/term_model.cc
+++ b/app/term/term_model.cc
@@ -9,7 +9,7 @@
#include <algorithm>
#include <limits>
-#include "lib/fxl/logging.h"
+#include "src/lib/fxl/logging.h"
namespace term {
namespace {
diff --git a/app/term/term_params.cc b/app/term/term_params.cc
index bb787a2..9b5900e 100644
--- a/app/term/term_params.cc
+++ b/app/term/term_params.cc
@@ -4,7 +4,7 @@
#include "topaz/app/term/term_params.h"
-#include "lib/fxl/strings/string_number_conversions.h"
+#include "src/lib/fxl/strings/string_number_conversions.h"
namespace term {
diff --git a/app/term/term_params.h b/app/term/term_params.h
index bc77b2f..daf0c1b 100644
--- a/app/term/term_params.h
+++ b/app/term/term_params.h
@@ -5,7 +5,7 @@
#ifndef TOPAZ_APP_TERM_TERM_PARAMS_H_
#define TOPAZ_APP_TERM_TERM_PARAMS_H_
-#include "lib/fxl/command_line.h"
+#include "src/lib/fxl/command_line.h"
namespace term {
diff --git a/app/term/view_controller.cc b/app/term/view_controller.cc
index 7fa0c8c..cab77fd 100644
--- a/app/term/view_controller.cc
+++ b/app/term/view_controller.cc
@@ -9,8 +9,8 @@
#include <unistd.h>
#include <zircon/status.h>
-#include "lib/fxl/logging.h"
-#include "lib/fxl/strings/string_printf.h"
+#include "src/lib/fxl/logging.h"
+#include "src/lib/fxl/strings/string_printf.h"
#include "lib/ui/input/cpp/formatting.h"
#include "third_party/skia/include/core/SkFont.h"
#include "third_party/skia/include/core/SkFontMetrics.h"
diff --git a/auth_providers/google/factory_impl.h b/auth_providers/google/factory_impl.h
index 5a7e99d..ec64524 100644
--- a/auth_providers/google/factory_impl.h
+++ b/auth_providers/google/factory_impl.h
@@ -9,7 +9,7 @@
#include <lib/async/dispatcher.h>
#include "lib/callback/auto_cleanable.h"
-#include "lib/fxl/macros.h"
+#include "src/lib/fxl/macros.h"
#include "lib/network_wrapper/network_wrapper.h"
#include "topaz/auth_providers/google/google_auth_provider_impl.h"
#include "topaz/auth_providers/google/settings.h"
diff --git a/auth_providers/google/factory_impl_unittest.cc b/auth_providers/google/factory_impl_unittest.cc
index b455365..13d7fa0 100644
--- a/auth_providers/google/factory_impl_unittest.cc
+++ b/auth_providers/google/factory_impl_unittest.cc
@@ -7,7 +7,7 @@
#include "lib/callback/capture.h"
#include "lib/callback/set_when_called.h"
#include "lib/fidl/cpp/binding.h"
-#include "lib/fxl/macros.h"
+#include "src/lib/fxl/macros.h"
#include "lib/gtest/test_loop_fixture.h"
#include "lib/network_wrapper/fake_network_wrapper.h"
#include "topaz/auth_providers/google/settings.h"
diff --git a/auth_providers/google/google_auth_provider_impl.cc b/auth_providers/google/google_auth_provider_impl.cc
index cf151fd..1a9eea1 100644
--- a/auth_providers/google/google_auth_provider_impl.cc
+++ b/auth_providers/google/google_auth_provider_impl.cc
@@ -14,7 +14,7 @@
#include "lib/component/cpp/connect.h"
#include "lib/component/cpp/startup_context.h"
#include "lib/fidl/cpp/interface_request.h"
-#include "lib/fxl/strings/join_strings.h"
+#include "src/lib/fxl/strings/join_strings.h"
#include "lib/svc/cpp/services.h"
#include "peridot/lib/rapidjson/rapidjson.h"
#include "rapidjson/document.h"
diff --git a/auth_providers/google/google_auth_provider_impl.h b/auth_providers/google/google_auth_provider_impl.h
index c9233b3..d58c5fa 100644
--- a/auth_providers/google/google_auth_provider_impl.h
+++ b/auth_providers/google/google_auth_provider_impl.h
@@ -16,7 +16,7 @@
#include "lib/callback/cancellable.h"
#include "lib/component/cpp/startup_context.h"
#include "lib/fidl/cpp/binding.h"
-#include "lib/fxl/macros.h"
+#include "src/lib/fxl/macros.h"
#include "lib/network_wrapper/network_wrapper.h"
#include "topaz/auth_providers/google/settings.h"
diff --git a/auth_providers/google/google_auth_provider_impl_unittest.cc b/auth_providers/google/google_auth_provider_impl_unittest.cc
index a706e0a..6a5930d 100644
--- a/auth_providers/google/google_auth_provider_impl_unittest.cc
+++ b/auth_providers/google/google_auth_provider_impl_unittest.cc
@@ -7,7 +7,7 @@
#include "lib/callback/capture.h"
#include "lib/callback/set_when_called.h"
#include "lib/fidl/cpp/binding.h"
-#include "lib/fxl/macros.h"
+#include "src/lib/fxl/macros.h"
#include "lib/gtest/test_loop_fixture.h"
#include "lib/network_wrapper/fake_network_wrapper.h"
#include "peridot/lib/rapidjson/rapidjson.h"
diff --git a/auth_providers/google/main.cc b/auth_providers/google/main.cc
index 25d7e2d..8e894cd 100644
--- a/auth_providers/google/main.cc
+++ b/auth_providers/google/main.cc
@@ -14,7 +14,7 @@
#include "lib/fidl/cpp/interface_request.h"
#include "lib/fsl/syslogger/init.h"
#include "lib/fsl/vmo/strings.h"
-#include "lib/fxl/command_line.h"
+#include "src/lib/fxl/command_line.h"
#include "lib/network_wrapper/network_wrapper_impl.h"
#include "topaz/auth_providers/google/factory_impl.h"
#include "topaz/auth_providers/google/settings.h"
diff --git a/auth_providers/oauth/oauth_request_builder.cc b/auth_providers/oauth/oauth_request_builder.cc
index 5c25a8c..9e9c547 100644
--- a/auth_providers/oauth/oauth_request_builder.cc
+++ b/auth_providers/oauth/oauth_request_builder.cc
@@ -9,10 +9,10 @@
#include "lib/fsl/socket/strings.h"
#include "lib/fsl/vmo/strings.h"
-#include "lib/fxl/logging.h"
-#include "lib/fxl/macros.h"
-#include "lib/fxl/strings/join_strings.h"
-#include "lib/fxl/strings/string_number_conversions.h"
+#include "src/lib/fxl/logging.h"
+#include "src/lib/fxl/macros.h"
+#include "src/lib/fxl/strings/join_strings.h"
+#include "src/lib/fxl/strings/string_number_conversions.h"
namespace auth_providers {
namespace oauth {
diff --git a/auth_providers/oauth/oauth_request_builder_unittest.cc b/auth_providers/oauth/oauth_request_builder_unittest.cc
index dd152c3..499b530 100644
--- a/auth_providers/oauth/oauth_request_builder_unittest.cc
+++ b/auth_providers/oauth/oauth_request_builder_unittest.cc
@@ -7,7 +7,7 @@
#include <string>
#include "gtest/gtest.h"
-#include "lib/fxl/logging.h"
+#include "src/lib/fxl/logging.h"
#include "peridot/lib/rapidjson/rapidjson.h"
namespace auth_providers {
diff --git a/auth_providers/oauth/oauth_response.cc b/auth_providers/oauth/oauth_response.cc
index 1bb1de4..ed25ab0 100644
--- a/auth_providers/oauth/oauth_response.cc
+++ b/auth_providers/oauth/oauth_response.cc
@@ -5,8 +5,8 @@
#include "topaz/auth_providers/oauth/oauth_response.h"
#include "lib/fsl/socket/strings.h"
-#include "lib/fxl/logging.h"
-#include "lib/fxl/macros.h"
+#include "src/lib/fxl/logging.h"
+#include "src/lib/fxl/macros.h"
#include "rapidjson/error/en.h"
namespace auth_providers {
diff --git a/auth_providers/oauth/oauth_response_unittest.cc b/auth_providers/oauth/oauth_response_unittest.cc
index 5f642cc..f42f71d 100644
--- a/auth_providers/oauth/oauth_response_unittest.cc
+++ b/auth_providers/oauth/oauth_response_unittest.cc
@@ -9,7 +9,7 @@
#include "gtest/gtest.h"
#include "lib/fsl/socket/strings.h"
-#include "lib/fxl/strings/string_number_conversions.h"
+#include "src/lib/fxl/strings/string_number_conversions.h"
#include "peridot/lib/rapidjson/rapidjson.h"
namespace auth_providers {
diff --git a/bin/ui/skottie_viewer/main.cc b/bin/ui/skottie_viewer/main.cc
index ccacedd..c8d0c7e 100644
--- a/bin/ui/skottie_viewer/main.cc
+++ b/bin/ui/skottie_viewer/main.cc
@@ -5,8 +5,8 @@
#include <lib/async-loop/cpp/loop.h>
#include <trace-provider/provider.h>
-#include "lib/fxl/command_line.h"
-#include "lib/fxl/log_settings_command_line.h"
+#include "src/lib/fxl/command_line.h"
+#include "src/lib/fxl/log_settings_command_line.h"
#include "lib/ui/base_view/cpp/view_provider_component.h"
#include "topaz/bin/ui/skottie_viewer/view.h"
diff --git a/bin/ui/skottie_viewer/view.cc b/bin/ui/skottie_viewer/view.cc
index e8ad499..487cad5 100644
--- a/bin/ui/skottie_viewer/view.cc
+++ b/bin/ui/skottie_viewer/view.cc
@@ -5,7 +5,7 @@
#include "topaz/bin/ui/skottie_viewer/view.h"
#include "lib/fsl/vmo/vector.h"
-#include "lib/fxl/logging.h"
+#include "src/lib/fxl/logging.h"
#include "third_party/skia/include/core/SkColor.h"
namespace skottie {
diff --git a/bin/ui/skottie_viewer/view.h b/bin/ui/skottie_viewer/view.h
index b2c1491..5f11bba 100644
--- a/bin/ui/skottie_viewer/view.h
+++ b/bin/ui/skottie_viewer/view.h
@@ -12,7 +12,7 @@
#include "examples/ui/lib/skia_view.h"
#include "lib/component/cpp/startup_context.h"
#include "lib/fidl/cpp/binding_set.h"
-#include "lib/fxl/macros.h"
+#include "src/lib/fxl/macros.h"
//#if defined(SK_ENABLE_SKOTTIE)
#include "third_party/skia/modules/skottie/include/Skottie.h"
//#endif
diff --git a/examples/media/vu_meter/main.cc b/examples/media/vu_meter/main.cc
index 4b4075c..f3eb1c6 100644
--- a/examples/media/vu_meter/main.cc
+++ b/examples/media/vu_meter/main.cc
@@ -5,8 +5,8 @@
#include <lib/async-loop/cpp/loop.h>
#include <trace-provider/provider.h>
-#include "lib/fxl/command_line.h"
-#include "lib/fxl/log_settings_command_line.h"
+#include "src/lib/fxl/command_line.h"
+#include "src/lib/fxl/log_settings_command_line.h"
#include "lib/ui/base_view/cpp/view_provider_component.h"
#include "topaz/examples/media/vu_meter/vu_meter_view.h"
diff --git a/examples/media/vu_meter/vu_meter_view.cc b/examples/media/vu_meter/vu_meter_view.cc
index 6c11cfd..231e03f 100644
--- a/examples/media/vu_meter/vu_meter_view.cc
+++ b/examples/media/vu_meter/vu_meter_view.cc
@@ -9,7 +9,7 @@
#include <iomanip>
#include "lib/component/cpp/connect.h"
-#include "lib/fxl/logging.h"
+#include "src/lib/fxl/logging.h"
#include "lib/media/audio/types.h"
#include "third_party/skia/include/core/SkColor.h"
#include "third_party/skia/include/core/SkPath.h"
diff --git a/examples/media/vu_meter/vu_meter_view.h b/examples/media/vu_meter/vu_meter_view.h
index 613eef8..26f8fec 100644
--- a/examples/media/vu_meter/vu_meter_view.h
+++ b/examples/media/vu_meter/vu_meter_view.h
@@ -16,7 +16,7 @@
#include "examples/ui/lib/skia_view.h"
#include "lib/component/cpp/startup_context.h"
-#include "lib/fxl/macros.h"
+#include "src/lib/fxl/macros.h"
namespace examples {
diff --git a/examples/mediaplayer/mediaplayer_skia/main.cc b/examples/mediaplayer/mediaplayer_skia/main.cc
index 09e9c7e..3213141 100644
--- a/examples/mediaplayer/mediaplayer_skia/main.cc
+++ b/examples/mediaplayer/mediaplayer_skia/main.cc
@@ -5,8 +5,8 @@
#include <lib/async-loop/cpp/loop.h>
#include <trace-provider/provider.h>
-#include "lib/fxl/command_line.h"
-#include "lib/fxl/log_settings_command_line.h"
+#include "src/lib/fxl/command_line.h"
+#include "src/lib/fxl/log_settings_command_line.h"
#include "lib/ui/base_view/cpp/view_provider_component.h"
#include "topaz/examples/mediaplayer/mediaplayer_skia/mediaplayer_view.h"
diff --git a/examples/mediaplayer/mediaplayer_skia/mediaplayer_params.cc b/examples/mediaplayer/mediaplayer_skia/mediaplayer_params.cc
index f41276e..6b5b1df 100644
--- a/examples/mediaplayer/mediaplayer_skia/mediaplayer_params.cc
+++ b/examples/mediaplayer/mediaplayer_skia/mediaplayer_params.cc
@@ -6,7 +6,7 @@
#include <iostream>
-#include "lib/fxl/strings/split_string.h"
+#include "src/lib/fxl/strings/split_string.h"
namespace examples {
diff --git a/examples/mediaplayer/mediaplayer_skia/mediaplayer_params.h b/examples/mediaplayer/mediaplayer_skia/mediaplayer_params.h
index 624648a..3c2c94e 100644
--- a/examples/mediaplayer/mediaplayer_skia/mediaplayer_params.h
+++ b/examples/mediaplayer/mediaplayer_skia/mediaplayer_params.h
@@ -7,7 +7,7 @@
#include <string>
-#include "lib/fxl/command_line.h"
+#include "src/lib/fxl/command_line.h"
namespace examples {
diff --git a/examples/mediaplayer/mediaplayer_skia/mediaplayer_view.cc b/examples/mediaplayer/mediaplayer_skia/mediaplayer_view.cc
index 98ca79a..d83fabd 100644
--- a/examples/mediaplayer/mediaplayer_skia/mediaplayer_view.cc
+++ b/examples/mediaplayer/mediaplayer_skia/mediaplayer_view.cc
@@ -13,7 +13,7 @@
#include "lib/fidl/cpp/clone.h"
#include "lib/fidl/cpp/optional.h"
#include "lib/fsl/io/fd.h"
-#include "lib/fxl/logging.h"
+#include "src/lib/fxl/logging.h"
#include "lib/media/timeline/timeline.h"
#include "lib/media/timeline/type_converters.h"
#include "lib/ui/scenic/cpp/view_token_pair.h"
diff --git a/examples/mediaplayer/mediaplayer_skia/mediaplayer_view.h b/examples/mediaplayer/mediaplayer_skia/mediaplayer_view.h
index a8fd332..a060859 100644
--- a/examples/mediaplayer/mediaplayer_skia/mediaplayer_view.h
+++ b/examples/mediaplayer/mediaplayer_skia/mediaplayer_view.h
@@ -17,7 +17,7 @@
#include <queue>
#include "examples/ui/lib/host_canvas_cycler.h"
#include "lib/component/cpp/startup_context.h"
-#include "lib/fxl/macros.h"
+#include "src/lib/fxl/macros.h"
#include "lib/media/timeline/timeline_function.h"
#include "lib/ui/base_view/cpp/base_view.h"
#include "mediaplayer_params.h"
diff --git a/examples/ui/jank/jank_view.cc b/examples/ui/jank/jank_view.cc
index 6d49f95..cef2cbd 100644
--- a/examples/ui/jank/jank_view.cc
+++ b/examples/ui/jank/jank_view.cc
@@ -9,9 +9,9 @@
#include <string>
#include "lib/component/cpp/connect.h"
-#include "lib/fxl/logging.h"
-#include "lib/fxl/macros.h"
-#include "lib/fxl/time/time_delta.h"
+#include "src/lib/fxl/logging.h"
+#include "src/lib/fxl/macros.h"
+#include "src/lib/fxl/time/time_delta.h"
namespace examples {
diff --git a/examples/ui/jank/jank_view.h b/examples/ui/jank/jank_view.h
index d2cb042..eac19ce 100644
--- a/examples/ui/jank/jank_view.h
+++ b/examples/ui/jank/jank_view.h
@@ -8,8 +8,8 @@
#include <fuchsia/fonts/cpp/fidl.h>
#include <fuchsia/images/cpp/fidl.h>
#include <fuchsia/ui/input/cpp/fidl.h>
-#include "lib/fxl/macros.h"
-#include "lib/fxl/time/time_point.h"
+#include "src/lib/fxl/macros.h"
+#include "src/lib/fxl/time/time_point.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkColor.h"
#include "third_party/skia/include/core/SkFont.h"
diff --git a/examples/ui/jank/main.cc b/examples/ui/jank/main.cc
index a860814..b020cf6 100644
--- a/examples/ui/jank/main.cc
+++ b/examples/ui/jank/main.cc
@@ -5,8 +5,8 @@
#include <lib/async-loop/cpp/loop.h>
#include <trace-provider/provider.h>
-#include "lib/fxl/command_line.h"
-#include "lib/fxl/log_settings_command_line.h"
+#include "src/lib/fxl/command_line.h"
+#include "src/lib/fxl/log_settings_command_line.h"
#include "lib/ui/base_view/cpp/view_provider_component.h"
#include "topaz/examples/ui/jank/jank_view.h"
diff --git a/examples/ui/lib/host_canvas_cycler.cc b/examples/ui/lib/host_canvas_cycler.cc
index 8538b7e..e902301 100644
--- a/examples/ui/lib/host_canvas_cycler.cc
+++ b/examples/ui/lib/host_canvas_cycler.cc
@@ -4,7 +4,7 @@
#include "examples/ui/lib/host_canvas_cycler.h"
-#include "lib/fxl/logging.h"
+#include "src/lib/fxl/logging.h"
namespace scenic {
namespace skia {
diff --git a/examples/ui/lib/host_surfaces.cc b/examples/ui/lib/host_surfaces.cc
index 9e0be9c..2c06582 100644
--- a/examples/ui/lib/host_surfaces.cc
+++ b/examples/ui/lib/host_surfaces.cc
@@ -5,7 +5,7 @@
#include "examples/ui/lib/host_surfaces.h"
#include "examples/ui/lib/image_info.h"
-#include "lib/fxl/logging.h"
+#include "src/lib/fxl/logging.h"
namespace scenic {
namespace skia {
diff --git a/examples/ui/lib/image_info.cc b/examples/ui/lib/image_info.cc
index 9137095..48099c2 100644
--- a/examples/ui/lib/image_info.cc
+++ b/examples/ui/lib/image_info.cc
@@ -4,7 +4,7 @@
#include "examples/ui/lib/image_info.h"
-#include "lib/fxl/logging.h"
+#include "src/lib/fxl/logging.h"
namespace scenic {
namespace skia {
diff --git a/examples/ui/lib/skia_font_loader.h b/examples/ui/lib/skia_font_loader.h
index d717359..5d2ecbe 100644
--- a/examples/ui/lib/skia_font_loader.h
+++ b/examples/ui/lib/skia_font_loader.h
@@ -10,7 +10,7 @@
#include <fuchsia/fonts/cpp/fidl.h>
#include <lib/fit/function.h>
-#include "lib/fxl/macros.h"
+#include "src/lib/fxl/macros.h"
#include "third_party/skia/include/core/SkTypeface.h"
namespace mozart {
diff --git a/examples/ui/lib/skia_view.h b/examples/ui/lib/skia_view.h
index 906e82a..f36d710 100644
--- a/examples/ui/lib/skia_view.h
+++ b/examples/ui/lib/skia_view.h
@@ -6,8 +6,8 @@
#define TOPAZ_EXAMPLES_UI_LIB_SKIA_VIEW_H_
#include "examples/ui/lib/host_canvas_cycler.h"
-#include "lib/fxl/logging.h"
-#include "lib/fxl/macros.h"
+#include "src/lib/fxl/logging.h"
+#include "src/lib/fxl/macros.h"
#include "lib/ui/base_view/cpp/base_view.h"
namespace scenic {
diff --git a/examples/ui/lib/skia_vmo_data.cc b/examples/ui/lib/skia_vmo_data.cc
index 90100e2..3a0d74c 100644
--- a/examples/ui/lib/skia_vmo_data.cc
+++ b/examples/ui/lib/skia_vmo_data.cc
@@ -9,7 +9,7 @@
#include <trace/event.h>
#include <lib/zx/vmar.h>
-#include "lib/fxl/logging.h"
+#include "src/lib/fxl/logging.h"
static_assert(sizeof(size_t) == sizeof(uint64_t),
"Fuchsia should always be 64-bit");
diff --git a/examples/ui/noodles/main.cc b/examples/ui/noodles/main.cc
index 67a7275..43a2ced 100644
--- a/examples/ui/noodles/main.cc
+++ b/examples/ui/noodles/main.cc
@@ -5,8 +5,8 @@
#include <lib/async-loop/cpp/loop.h>
#include <trace-provider/provider.h>
-#include "lib/fxl/command_line.h"
-#include "lib/fxl/log_settings_command_line.h"
+#include "src/lib/fxl/command_line.h"
+#include "src/lib/fxl/log_settings_command_line.h"
#include "lib/ui/base_view/cpp/view_provider_component.h"
#include "topaz/examples/ui/noodles/noodles_view.h"
diff --git a/examples/ui/noodles/noodles_view.cc b/examples/ui/noodles/noodles_view.cc
index 9134a01..d5c8e97 100644
--- a/examples/ui/noodles/noodles_view.cc
+++ b/examples/ui/noodles/noodles_view.cc
@@ -9,7 +9,7 @@
#include <cstdlib>
#include <utility>
-#include "lib/fxl/logging.h"
+#include "src/lib/fxl/logging.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkColor.h"
#include "third_party/skia/include/core/SkImageInfo.h"
diff --git a/examples/ui/noodles/noodles_view.h b/examples/ui/noodles/noodles_view.h
index 7103f89..b804c25 100644
--- a/examples/ui/noodles/noodles_view.h
+++ b/examples/ui/noodles/noodles_view.h
@@ -7,7 +7,7 @@
#include <fuchsia/images/cpp/fidl.h>
#include "examples/ui/lib/skia_view.h"
-#include "lib/fxl/macros.h"
+#include "src/lib/fxl/macros.h"
class SkCanvas;
diff --git a/examples/ui/paint/main.cc b/examples/ui/paint/main.cc
index 80690d6..84c68f3 100644
--- a/examples/ui/paint/main.cc
+++ b/examples/ui/paint/main.cc
@@ -5,8 +5,8 @@
#include <lib/async-loop/cpp/loop.h>
#include <trace-provider/provider.h>
-#include "lib/fxl/command_line.h"
-#include "lib/fxl/log_settings_command_line.h"
+#include "src/lib/fxl/command_line.h"
+#include "src/lib/fxl/log_settings_command_line.h"
#include "lib/ui/base_view/cpp/view_provider_component.h"
#include "topaz/examples/ui/paint/paint_view.h"
diff --git a/examples/ui/paint/paint_view.cc b/examples/ui/paint/paint_view.cc
index ff90099..8f261b5 100644
--- a/examples/ui/paint/paint_view.cc
+++ b/examples/ui/paint/paint_view.cc
@@ -7,8 +7,8 @@
#include <hid/usages.h>
#include "lib/component/cpp/connect.h"
-#include "lib/fxl/logging.h"
-#include "lib/fxl/macros.h"
+#include "src/lib/fxl/logging.h"
+#include "src/lib/fxl/macros.h"
#include "third_party/skia/include/core/SkColor.h"
#include "third_party/skia/include/core/SkRect.h"
diff --git a/examples/ui/paint/paint_view.h b/examples/ui/paint/paint_view.h
index 942600e..7513cd3 100644
--- a/examples/ui/paint/paint_view.h
+++ b/examples/ui/paint/paint_view.h
@@ -9,7 +9,7 @@
#include <fuchsia/ui/input/cpp/fidl.h>
#include <map>
#include <vector>
-#include "lib/fxl/macros.h"
+#include "src/lib/fxl/macros.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkPath.h"
diff --git a/examples/ui/view_config_demo/main.cc b/examples/ui/view_config_demo/main.cc
index 2043d21..ab50ec3 100644
--- a/examples/ui/view_config_demo/main.cc
+++ b/examples/ui/view_config_demo/main.cc
@@ -5,8 +5,8 @@
#include <lib/async-loop/cpp/loop.h>
#include <trace-provider/provider.h>
-#include "lib/fxl/command_line.h"
-#include "lib/fxl/log_settings_command_line.h"
+#include "src/lib/fxl/command_line.h"
+#include "src/lib/fxl/log_settings_command_line.h"
#include "lib/ui/base_view/cpp/view_provider_component.h"
#include "topaz/examples/ui/view_config_demo/view_config_demo_view.h"
diff --git a/examples/ui/view_config_demo/view_config_demo_view.cc b/examples/ui/view_config_demo/view_config_demo_view.cc
index b35fa5c..0da389e 100644
--- a/examples/ui/view_config_demo/view_config_demo_view.cc
+++ b/examples/ui/view_config_demo/view_config_demo_view.cc
@@ -4,7 +4,7 @@
#include "view_config_demo_view.h"
-#include "lib/fxl/logging.h"
+#include "src/lib/fxl/logging.h"
#include "third_party/skia/include/core/SkFont.h"
#include "third_party/skia/include/core/SkPaint.h"
diff --git a/examples/ui/view_config_demo/view_config_demo_view.h b/examples/ui/view_config_demo/view_config_demo_view.h
index af47915..cd0b2d5 100644
--- a/examples/ui/view_config_demo/view_config_demo_view.h
+++ b/examples/ui/view_config_demo/view_config_demo_view.h
@@ -7,7 +7,7 @@
#include "examples/ui/lib/skia_font_loader.h"
#include "examples/ui/lib/skia_view.h"
-#include "lib/fxl/logging.h"
+#include "src/lib/fxl/logging.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkColor.h"
#include "third_party/skia/include/core/SkRect.h"
diff --git a/public/dart-pkg/fuchsia/sdk_ext/fuchsia.cc b/public/dart-pkg/fuchsia/sdk_ext/fuchsia.cc
index ddcaf91..93fa67b 100644
--- a/public/dart-pkg/fuchsia/sdk_ext/fuchsia.cc
+++ b/public/dart-pkg/fuchsia/sdk_ext/fuchsia.cc
@@ -15,9 +15,9 @@
#include "dart-pkg/zircon/sdk_ext/handle.h"
#include "dart-pkg/zircon/sdk_ext/natives.h"
#include "dart-pkg/zircon/sdk_ext/system.h"
-#include "lib/fxl/arraysize.h"
-#include "lib/fxl/logging.h"
-#include "lib/fxl/macros.h"
+#include "src/lib/fxl/arraysize.h"
+#include "src/lib/fxl/logging.h"
+#include "src/lib/fxl/macros.h"
#include "third_party/dart/runtime/include/dart_api.h"
#include "third_party/tonic/dart_binding_macros.h"
#include "third_party/tonic/dart_class_library.h"
diff --git a/public/dart-pkg/zircon/sdk_ext/handle.h b/public/dart-pkg/zircon/sdk_ext/handle.h
index 2e59771..c3965cf 100644
--- a/public/dart-pkg/zircon/sdk_ext/handle.h
+++ b/public/dart-pkg/zircon/sdk_ext/handle.h
@@ -10,7 +10,7 @@
#include <vector>
#include "dart-pkg/zircon/sdk_ext/handle_waiter.h"
-#include "lib/fxl/memory/ref_counted.h"
+#include "src/lib/fxl/memory/ref_counted.h"
#include "third_party/dart/runtime/include/dart_api.h"
#include "third_party/tonic/dart_library_natives.h"
#include "third_party/tonic/dart_wrappable.h"
diff --git a/public/dart-pkg/zircon/sdk_ext/handle_waiter.cc b/public/dart-pkg/zircon/sdk_ext/handle_waiter.cc
index efeee31..8ecfb87 100644
--- a/public/dart-pkg/zircon/sdk_ext/handle_waiter.cc
+++ b/public/dart-pkg/zircon/sdk_ext/handle_waiter.cc
@@ -7,7 +7,7 @@
#include <lib/async/default.h>
#include "dart-pkg/zircon/sdk_ext/handle.h"
-#include "lib/fxl/logging.h"
+#include "src/lib/fxl/logging.h"
#include "third_party/tonic/converter/dart_converter.h"
#include "third_party/tonic/dart_args.h"
#include "third_party/tonic/dart_binding_macros.h"
diff --git a/public/dart-pkg/zircon/sdk_ext/handle_waiter.h b/public/dart-pkg/zircon/sdk_ext/handle_waiter.h
index e828d92..edcf6dc 100644
--- a/public/dart-pkg/zircon/sdk_ext/handle_waiter.h
+++ b/public/dart-pkg/zircon/sdk_ext/handle_waiter.h
@@ -8,7 +8,7 @@
#include <lib/async/cpp/wait.h>
#include <lib/zx/handle.h>
-#include "lib/fxl/memory/ref_counted.h"
+#include "src/lib/fxl/memory/ref_counted.h"
#include "third_party/tonic/dart_wrappable.h"
namespace tonic {
diff --git a/public/dart-pkg/zircon/sdk_ext/natives.cc b/public/dart-pkg/zircon/sdk_ext/natives.cc
index 100d227..20429a9 100644
--- a/public/dart-pkg/zircon/sdk_ext/natives.cc
+++ b/public/dart-pkg/zircon/sdk_ext/natives.cc
@@ -16,9 +16,9 @@
#include "dart-pkg/zircon/sdk_ext/handle.h"
#include "dart-pkg/zircon/sdk_ext/handle_waiter.h"
#include "dart-pkg/zircon/sdk_ext/system.h"
-#include "lib/fxl/arraysize.h"
-#include "lib/fxl/logging.h"
-#include "lib/fxl/macros.h"
+#include "src/lib/fxl/arraysize.h"
+#include "src/lib/fxl/logging.h"
+#include "src/lib/fxl/macros.h"
#include "third_party/tonic/dart_binding_macros.h"
#include "third_party/tonic/dart_class_library.h"
#include "third_party/tonic/dart_class_provider.h"
diff --git a/public/dart/fuchsia_inspect/test/integration/test.cc b/public/dart/fuchsia_inspect/test/integration/test.cc
index ab57f1c..cd74ad6 100644
--- a/public/dart/fuchsia_inspect/test/integration/test.cc
+++ b/public/dart/fuchsia_inspect/test/integration/test.cc
@@ -12,7 +12,7 @@
#include "gmock/gmock.h"
#include "lib/component/cpp/expose.h"
-#include "lib/fxl/strings/substitute.h"
+#include "src/lib/fxl/strings/substitute.h"
#include "lib/svc/cpp/services.h"
#include "lib/sys/cpp/testing/test_with_environment.h"
#include "src/lib/files/glob.h"
diff --git a/public/lib/ui/flutter/sdk_ext/src/natives.cc b/public/lib/ui/flutter/sdk_ext/src/natives.cc
index cbd5114..3806f7d 100644
--- a/public/lib/ui/flutter/sdk_ext/src/natives.cc
+++ b/public/lib/ui/flutter/sdk_ext/src/natives.cc
@@ -11,9 +11,9 @@
#include <vector>
#include "dart-pkg/zircon/sdk_ext/handle.h"
-#include "lib/fxl/arraysize.h"
-#include "lib/fxl/logging.h"
-#include "lib/fxl/macros.h"
+#include "src/lib/fxl/arraysize.h"
+#include "src/lib/fxl/logging.h"
+#include "src/lib/fxl/macros.h"
namespace mozart {
diff --git a/tests/web_runner_tests/chromium_context.cc b/tests/web_runner_tests/chromium_context.cc
index dcb75b4..762a179 100644
--- a/tests/web_runner_tests/chromium_context.cc
+++ b/tests/web_runner_tests/chromium_context.cc
@@ -6,7 +6,7 @@
#include <gtest/gtest.h>
#include <lib/fdio/directory.h>
-#include <lib/fxl/logging.h>
+#include <src/lib/fxl/logging.h>
#include <zircon/status.h>
ChromiumContext::ChromiumContext(component::StartupContext* startup_context) {
diff --git a/tests/web_runner_tests/web_runner_integration_tests.cc b/tests/web_runner_tests/web_runner_integration_tests.cc
index 1046648..8a3007c 100644
--- a/tests/web_runner_tests/web_runner_integration_tests.cc
+++ b/tests/web_runner_tests/web_runner_integration_tests.cc
@@ -6,8 +6,8 @@
#include <gtest/gtest.h>
#include <lib/component/cpp/environment_services_helper.h>
#include <lib/fit/function.h>
-#include <lib/fxl/logging.h>
-#include <lib/fxl/strings/string_printf.h>
+#include <src/lib/fxl/logging.h>
+#include <src/lib/fxl/strings/string_printf.h>
#include <lib/gtest/real_loop_fixture.h>
#include <zircon/status.h>
diff --git a/tests/web_runner_tests/web_runner_pixel_tests.cc b/tests/web_runner_tests/web_runner_pixel_tests.cc
index a24e053..740b91d 100644
--- a/tests/web_runner_tests/web_runner_pixel_tests.cc
+++ b/tests/web_runner_tests/web_runner_pixel_tests.cc
@@ -17,8 +17,8 @@
#include <lib/fdio/spawn.h>
#include <lib/fit/function.h>
#include <lib/fsl/vmo/vector.h>
-#include <lib/fxl/logging.h>
-#include <lib/fxl/strings/string_printf.h>
+#include <src/lib/fxl/logging.h>
+#include <src/lib/fxl/strings/string_printf.h>
#include <lib/gtest/real_loop_fixture.h>
#include <lib/ui/scenic/cpp/view_token_pair.h>
#include <lib/zx/time.h>
