diff --git a/Dockerfile b/Dockerfile
index 93912e40e..586aaeb06 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ COPY .git .
 COPY Makefile .
 COPY include ./include/
 COPY lib ./lib/
-COPY rustify ./rustify/
+COPY rs-cpp ./rs-cpp/
 COPY src ./src/
 RUN make BUILD=release install
 
diff --git a/Makefile b/Makefile
index dc8525a45..756876375 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ CUSTOM_CXXFLAGS := $(shell grep -m1 cxxflags cabin.toml | sed 's/cxxflags = \[//
 
 # Git dependency versions
 TOML11_VER := $(shell grep -m1 toml11 cabin.toml | sed 's/.*tag = \(.*\)}/\1/' | tr -d '"')
-RESULT_VER := $(shell grep -m1 cpp-result rustify/cabin.toml | sed 's/.*tag = \(.*\)}/\1/' | tr -d '"')
+RESULT_VER := $(shell grep -m1 cpp-result rs-cpp/cabin.toml | sed 's/.*tag = \(.*\)}/\1/' | tr -d '"')
 
 GIT_DEPS   := $(O)/DEPS/toml11 $(O)/DEPS/mitama-cpp-result
 
@@ -44,7 +44,7 @@ DEFINES := -DCABIN_CABIN_PKG_VERSION='"$(VERSION)"' \
   -DCABIN_CABIN_COMMIT_HASH='"$(COMMIT_HASH)"' \
   -DCABIN_CABIN_COMMIT_SHORT_HASH='"$(COMMIT_SHORT_HASH)"' \
   -DCABIN_CABIN_COMMIT_DATE='"$(COMMIT_DATE)"'
-INCLUDES := -Iinclude -Isrc -Irustify/include -isystem $(O)/DEPS/toml11/include \
+INCLUDES := -Iinclude -Isrc -Irs-cpp/include -isystem $(O)/DEPS/toml11/include \
   -isystem $(O)/DEPS/mitama-cpp-result/include
 
 CXXFLAGS := -std=c++$(EDITION) -fdiagnostics-color $(CUSTOM_CXXFLAGS) \
diff --git a/cabin.toml b/cabin.toml
index 75d664bf5..eee9f7f2c 100644
--- a/cabin.toml
+++ b/cabin.toml
@@ -18,7 +18,7 @@ libcurl = {version = ">=7.79.1 && <9", system = true}
 libgit2 = {version = ">=1.7 && <1.10", system = true}
 nlohmann_json = {version = "3.10.5", system = true}
 tbb = {version = ">=2021.5.0 && <2023.0.0", system = true}
-rustify = {path = "rustify"}
+rs-cpp = {path = "./rs-cpp"}
 
 [dev-dependencies]
 boost-ut = {git = "https://github.com/boost-ext/ut.git", tag = "v2.3.1"}
diff --git a/include/Algos.hpp b/include/Algos.hpp
index 283d3192a..955036551 100644
--- a/include/Algos.hpp
+++ b/include/Algos.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
 #include "Command.hpp"
-#include "Rustify/Result.hpp"
 
 #include <algorithm>
 #include <cstddef>
 #include <optional>
+#include <rs/result.hpp>
 #include <span>
 #include <string>
 #include <string_view>
diff --git a/include/Builder/BuildGraph.hpp b/include/Builder/BuildGraph.hpp
index 4f2b87157..1a4957f26 100644
--- a/include/Builder/BuildGraph.hpp
+++ b/include/Builder/BuildGraph.hpp
@@ -7,11 +7,11 @@
 #include "Builder/SourceLayout.hpp"
 #include "Command.hpp"
 #include "Manifest.hpp"
-#include "Rustify/Result.hpp"
 
 #include <cstdint>
 #include <filesystem>
 #include <optional>
+#include <rs/result.hpp>
 #include <string>
 #include <string_view>
 #include <tbb/spin_mutex.h>
diff --git a/include/Builder/Compiler.hpp b/include/Builder/Compiler.hpp
index 7d03ed712..48d846fc6 100644
--- a/include/Builder/Compiler.hpp
+++ b/include/Builder/Compiler.hpp
@@ -1,12 +1,12 @@
 #pragma once
 
 #include "Command.hpp"
-#include "Rustify/Result.hpp"
 #include "VersionReq.hpp"
 
 #include <filesystem>
 #include <fmt/format.h>
 #include <fmt/std.h>
+#include <rs/result.hpp>
 #include <string>
 #include <string_view>
 #include <utility>
diff --git a/include/Builder/DepGraph.hpp b/include/Builder/DepGraph.hpp
index e38940191..a2588bbaf 100644
--- a/include/Builder/DepGraph.hpp
+++ b/include/Builder/DepGraph.hpp
@@ -3,10 +3,10 @@
 #include "Builder/BuildGraph.hpp"
 #include "Builder/BuildProfile.hpp"
 #include "Manifest.hpp"
-#include "Rustify/Result.hpp"
 
 #include <filesystem>
 #include <optional>
+#include <rs/result.hpp>
 #include <utility>
 
 namespace cabin {
diff --git a/include/Command.hpp b/include/Command.hpp
index 0381fd1d9..e7792f4af 100644
--- a/include/Command.hpp
+++ b/include/Command.hpp
@@ -1,11 +1,10 @@
 #pragma once
 
-#include "Rustify/Result.hpp"
-
 #include <cstdint>
 #include <cstdlib>
 #include <filesystem>
 #include <fmt/format.h>
+#include <rs/result.hpp>
 #include <span>
 #include <string>
 #include <string_view>
diff --git a/include/Dependency.hpp b/include/Dependency.hpp
index 75f5b0646..ddddbc174 100644
--- a/include/Dependency.hpp
+++ b/include/Dependency.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
 #include "Builder/Compiler.hpp"
-#include "Rustify/Result.hpp"
 #include "VersionReq.hpp"
 
 #include <optional>
+#include <rs/result.hpp>
 #include <string>
 #include <utility>
 #include <variant>
diff --git a/include/Manifest.hpp b/include/Manifest.hpp
index 4aea520a2..f5f6a52f7 100644
--- a/include/Manifest.hpp
+++ b/include/Manifest.hpp
@@ -3,7 +3,6 @@
 #include "Builder/BuildProfile.hpp"
 #include "Builder/Compiler.hpp"
 #include "Dependency.hpp"
-#include "Rustify/Result.hpp"
 #include "Semver.hpp"
 
 #include <cstddef>
@@ -11,6 +10,7 @@
 #include <filesystem>
 #include <fmt/ostream.h>
 #include <fmt/ranges.h>
+#include <rs/result.hpp>
 #include <string>
 #include <string_view>
 #include <toml.hpp>
diff --git a/include/Semver.hpp b/include/Semver.hpp
index b8c06cec4..5329d194d 100644
--- a/include/Semver.hpp
+++ b/include/Semver.hpp
@@ -9,12 +9,11 @@
 //   ident      ::= [a-zA-Z0-9][a-zA-Z0-9-]*
 #pragma once
 
-#include "Rustify/Result.hpp"
-
 #include <cstddef>
 #include <cstdint>
 #include <fmt/ostream.h>
 #include <ostream>
+#include <rs/result.hpp>
 #include <string>
 #include <string_view>
 #include <utility>
diff --git a/lib/Algos.cc b/lib/Algos.cc
index c389f598a..780dd58bc 100644
--- a/lib/Algos.cc
+++ b/lib/Algos.cc
@@ -1,12 +1,12 @@
 #include "Algos.hpp"
 
 #include "Command.hpp"
-#include "Rustify/Result.hpp"
 
 #include <cctype>
 #include <chrono>
 #include <cstdlib>
 #include <optional>
+#include <rs/result.hpp>
 #include <spdlog/spdlog.h>
 #include <string>
 #include <string_view>
@@ -89,10 +89,9 @@ bool commandExists(const std::string_view cmd) noexcept {
 
 #ifdef CABIN_TEST
 
-#  include "Rustify/Tests.hpp"
-
 #  include <array>
 #  include <limits>
+#  include <rs/tests.hpp>
 
 namespace tests {
 
diff --git a/lib/Builder/Compiler.cc b/lib/Builder/Compiler.cc
index 373c4a092..e116c0f6f 100644
--- a/lib/Builder/Compiler.cc
+++ b/lib/Builder/Compiler.cc
@@ -2,13 +2,13 @@
 
 #include "Algos.hpp"
 #include "Command.hpp"
-#include "Rustify/Result.hpp"
 
 #include <array>
 #include <cctype>
 #include <cstdint>
 #include <cstdlib>
 #include <optional>
+#include <rs/result.hpp>
 #include <sstream>
 #include <string>
 #include <string_view>
@@ -369,7 +369,7 @@ std::string Compiler::detectArchiver(const bool useLTO) const {
 
 #ifdef CABIN_TEST
 
-#  include "Rustify/Tests.hpp"
+#  include <rs/tests.hpp>
 
 namespace tests {
 
diff --git a/lib/Command.cc b/lib/Command.cc
index 95214458b..431685cfa 100644
--- a/lib/Command.cc
+++ b/lib/Command.cc
@@ -1,13 +1,12 @@
 #include "Command.hpp"
 
-#include "Rustify/Result.hpp"
-
 #include <algorithm>
 #include <array>
 #include <cstdio>
 #include <cstdlib>
 #include <fcntl.h>
 #include <fmt/format.h>
+#include <rs/result.hpp>
 #include <string>
 #include <sys/select.h>
 #include <sys/wait.h>
diff --git a/lib/Manifest.cc b/lib/Manifest.cc
index 6ea065261..37eec9b26 100644
--- a/lib/Manifest.cc
+++ b/lib/Manifest.cc
@@ -2,7 +2,6 @@
 
 #include "Builder/BuildProfile.hpp"
 #include "Builder/Compiler.hpp"
-#include "Rustify/Result.hpp"
 #include "Semver.hpp"
 #include "TermColor.hpp"
 #include "VersionReq.hpp"
@@ -14,6 +13,7 @@
 #include <fmt/core.h>
 #include <optional>
 #include <ranges>
+#include <rs/result.hpp>
 #include <spdlog/spdlog.h>
 #include <string>
 #include <string_view>
@@ -674,10 +674,9 @@ Result<void> validatePackageName(const std::string_view name) noexcept {
 
 #ifdef CABIN_TEST
 
-#  include "Rustify/Tests.hpp"
-
 #  include <climits>
 #  include <fmt/ranges.h>
+#  include <rs/tests.hpp>
 #  include <toml11/fwd/literal_fwd.hpp>
 
 namespace tests {
diff --git a/lib/Semver.cc b/lib/Semver.cc
index 6a822a4e7..9cad2ea07 100644
--- a/lib/Semver.cc
+++ b/lib/Semver.cc
@@ -436,7 +436,7 @@ Result<Version> Version::parse(const std::string_view str) noexcept {
 
 #ifdef CABIN_TEST
 
-#  include "Rustify/Tests.hpp"
+#  include <rs/tests.hpp>
 
 namespace tests {
 
diff --git a/lib/VersionReq.cc b/lib/VersionReq.cc
index f1d779689..a85e2a5f8 100644
--- a/lib/VersionReq.cc
+++ b/lib/VersionReq.cc
@@ -1,11 +1,10 @@
 #include "VersionReq.hpp"
 
-#include "Rustify/Result.hpp"
-
 #include <cctype>
 #include <cstddef>
 #include <cstdint>
 #include <ostream>
+#include <rs/result.hpp>
 #include <string>
 #include <string_view>
 #include <utility>
@@ -848,8 +847,7 @@ std::ostream& operator<<(std::ostream& os, const VersionReq& req) {
 
 #ifdef CABIN_TEST
 
-#  include "Rustify/Tests.hpp"
-
+#  include <rs/tests.hpp>
 #  include <source_location>
 #  include <span>
 
diff --git a/rustify/cabin.toml b/rs-cpp/cabin.toml
similarity index 92%
rename from rustify/cabin.toml
rename to rs-cpp/cabin.toml
index 436093dfe..809fa1977 100644
--- a/rustify/cabin.toml
+++ b/rs-cpp/cabin.toml
@@ -1,5 +1,5 @@
 [package]
-name = "rustify"
+name = "rs-cpp"
 version = "0.1.0"
 edition = "23"
 
diff --git a/rs-cpp/include/rs.hpp b/rs-cpp/include/rs.hpp
new file mode 100644
index 000000000..58966ba10
--- /dev/null
+++ b/rs-cpp/include/rs.hpp
@@ -0,0 +1,7 @@
+#ifndef RS_HPP
+#define RS_HPP
+
+#include <rs/result.hpp>
+#include <rs/tests.hpp>
+
+#endif // RS_HPP
diff --git a/rustify/include/Rustify/Result.hpp b/rs-cpp/include/rs/result.hpp
similarity index 93%
rename from rustify/include/Rustify/Result.hpp
rename to rs-cpp/include/rs/result.hpp
index 84fc67443..277e2e9a6 100644
--- a/rustify/include/Rustify/Result.hpp
+++ b/rs-cpp/include/rs/result.hpp
@@ -1,23 +1,20 @@
-#pragma once
+#ifndef RS_RESULT_HPP
+#define RS_RESULT_HPP
 
-#include <exception>
-#include <fmt/core.h>
 #include <memory>
 #include <mitama/anyhow/anyhow.hpp>
 #include <mitama/result/result.hpp>
-#include <string>
-#include <string_view>
 #include <type_traits>
 #include <utility>
 
-namespace anyhow = mitama::anyhow;
-
 // NOLINTBEGIN(readability-identifier-naming,cppcoreguidelines-macro-usage)
 
 #define Try(...) MITAMA_TRY(__VA_ARGS__)
 #define Bail(...) MITAMA_BAIL(__VA_ARGS__)
 #define Ensure(...) MITAMA_ENSURE(__VA_ARGS__)
 
+namespace anyhow = mitama::anyhow;
+
 // FIXME: shared_ptr is an implementation detail. Upstream the fix.
 using AnyhowErr = mitama::failure_t<std::shared_ptr<anyhow::error>>;
 
@@ -48,3 +45,5 @@ inline constexpr auto to_anyhow = [](auto... xs) {
 };
 
 // NOLINTEND(readability-identifier-naming,cppcoreguidelines-macro-usage)
+
+#endif // RS_RESULT_HPP
diff --git a/rustify/include/Rustify/Tests.hpp b/rs-cpp/include/rs/tests.hpp
similarity index 99%
rename from rustify/include/Rustify/Tests.hpp
rename to rs-cpp/include/rs/tests.hpp
index eb9a1ce6c..905d170cb 100644
--- a/rustify/include/Rustify/Tests.hpp
+++ b/rs-cpp/include/rs/tests.hpp
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef RS_TESTS_HPP
+#define RS_TESTS_HPP
 
 #include <concepts>
 #include <cstddef>
@@ -215,3 +216,5 @@ assertLt(Lhs&& lhs, Rhs&& rhs, const std::string_view msg = "",
 }
 
 } // namespace tests
+
+#endif // RS_TESTS_HPP
diff --git a/src/Builder/Builder.hpp b/src/Builder/Builder.hpp
index 731f43978..1f6b84d37 100644
--- a/src/Builder/Builder.hpp
+++ b/src/Builder/Builder.hpp
@@ -3,10 +3,10 @@
 #include "Builder/BuildGraph.hpp"
 #include "Builder/BuildProfile.hpp"
 #include "Builder/DepGraph.hpp"
-#include "Rustify/Result.hpp"
 
 #include <filesystem>
 #include <optional>
+#include <rs/result.hpp>
 #include <string>
 #include <vector>
 
diff --git a/src/Builder/Project.cc b/src/Builder/Project.cc
index 771ed53b0..eec137f9d 100644
--- a/src/Builder/Project.cc
+++ b/src/Builder/Project.cc
@@ -3,10 +3,10 @@
 #include "Algos.hpp"
 #include "Builder/BuildProfile.hpp"
 #include "Git2.hpp"
-#include "Rustify/Result.hpp"
 #include "TermColor.hpp"
 
 #include <filesystem>
+#include <rs/result.hpp>
 #include <spdlog/spdlog.h>
 #include <string>
 #include <unordered_map>
@@ -199,7 +199,7 @@ Result<Project> Project::init(const BuildProfile& buildProfile,
 
 #ifdef CABIN_TEST
 
-#  include "Rustify/Tests.hpp"
+#  include <rs/tests.hpp>
 
 namespace tests {
 
diff --git a/src/Builder/Project.hpp b/src/Builder/Project.hpp
index f8173b8be..d599fe01b 100644
--- a/src/Builder/Project.hpp
+++ b/src/Builder/Project.hpp
@@ -3,9 +3,9 @@
 #include "Builder/BuildProfile.hpp"
 #include "Builder/Compiler.hpp"
 #include "Manifest.hpp"
-#include "Rustify/Result.hpp"
 
 #include <filesystem>
+#include <rs/result.hpp>
 
 namespace cabin {
 
diff --git a/src/Cli.cc b/src/Cli.cc
index 95e93e621..362baef57 100644
--- a/src/Cli.cc
+++ b/src/Cli.cc
@@ -2,7 +2,6 @@
 
 #include "Algos.hpp"
 #include "Diag.hpp"
-#include "Rustify/Result.hpp"
 #include "TermColor.hpp"
 
 #include <algorithm>
@@ -11,6 +10,7 @@
 #include <cstdlib>
 #include <fmt/core.h>
 #include <functional>
+#include <rs/result.hpp>
 #include <span>
 #include <string>
 #include <string_view>
@@ -709,7 +709,7 @@ Cli::printHelp(const CliArgsView args) const noexcept {
 
 #ifdef CABIN_TEST
 
-#  include "Rustify/Tests.hpp"
+#  include <rs/tests.hpp>
 
 namespace cabin {
 
diff --git a/src/Cli.hpp b/src/Cli.hpp
index 09444d553..ea32d965d 100644
--- a/src/Cli.hpp
+++ b/src/Cli.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "Rustify/Result.hpp"
-
 #include <algorithm>
 #include <cstdio>
 #include <cstdlib>
@@ -9,6 +7,7 @@
 #include <initializer_list>
 #include <iterator>
 #include <optional>
+#include <rs/result.hpp>
 #include <span>
 #include <string>
 #include <string_view>
diff --git a/src/Cmd/Add.cc b/src/Cmd/Add.cc
index 3876565b6..a6cdace87 100644
--- a/src/Cmd/Add.cc
+++ b/src/Cmd/Add.cc
@@ -3,12 +3,12 @@
 #include "Cli.hpp"
 #include "Diag.hpp"
 #include "Manifest.hpp"
-#include "Rustify/Result.hpp"
 
 #include <cstdlib>
 #include <fmt/std.h>
 #include <fstream>
 #include <functional>
+#include <rs/result.hpp>
 #include <string>
 #include <string_view>
 #include <toml.hpp>
diff --git a/src/Cmd/Build.hpp b/src/Cmd/Build.hpp
index 26e924340..bde271cc6 100644
--- a/src/Cmd/Build.hpp
+++ b/src/Cmd/Build.hpp
@@ -3,8 +3,8 @@
 #include "Builder/BuildProfile.hpp"
 #include "Cli.hpp"
 #include "Manifest.hpp"
-#include "Rustify/Result.hpp"
 
+#include <rs/result.hpp>
 #include <string>
 
 namespace cabin {
diff --git a/src/Cmd/Clean.cc b/src/Cmd/Clean.cc
index c1f847147..440ec74de 100644
--- a/src/Cmd/Clean.cc
+++ b/src/Cmd/Clean.cc
@@ -3,9 +3,9 @@
 #include "Cli.hpp"
 #include "Diag.hpp"
 #include "Manifest.hpp"
-#include "Rustify/Result.hpp"
 
 #include <cstdlib>
+#include <rs/result.hpp>
 #include <string>
 #include <string_view>
 
diff --git a/src/Cmd/Fmt.cc b/src/Cmd/Fmt.cc
index 0a7331052..4c13ab048 100644
--- a/src/Cmd/Fmt.cc
+++ b/src/Cmd/Fmt.cc
@@ -7,12 +7,12 @@
 #include "Git2/Exception.hpp"
 #include "Git2/Repository.hpp"
 #include "Manifest.hpp"
-#include "Rustify/Result.hpp"
 
 #include <algorithm>
 #include <cstdlib>
 #include <filesystem>
 #include <ranges>
+#include <rs/result.hpp>
 #include <spdlog/spdlog.h>
 #include <string>
 #include <string_view>
diff --git a/src/Cmd/Init.cc b/src/Cmd/Init.cc
index 2d218b960..9bfee8d27 100644
--- a/src/Cmd/Init.cc
+++ b/src/Cmd/Init.cc
@@ -5,10 +5,10 @@
 #include "Diag.hpp"
 #include "Manifest.hpp"
 #include "New.hpp"
-#include "Rustify/Result.hpp"
 
 #include <cstdlib>
 #include <fstream>
+#include <rs/result.hpp>
 #include <string>
 #include <string_view>
 
diff --git a/src/Cmd/Lint.cc b/src/Cmd/Lint.cc
index 49487716d..b4c026866 100644
--- a/src/Cmd/Lint.cc
+++ b/src/Cmd/Lint.cc
@@ -5,11 +5,11 @@
 #include "Command.hpp"
 #include "Diag.hpp"
 #include "Manifest.hpp"
-#include "Rustify/Result.hpp"
 
 #include <cstdlib>
 #include <filesystem>
 #include <fstream>
+#include <rs/result.hpp>
 #include <spdlog/spdlog.h>
 #include <string>
 #include <string_view>
diff --git a/src/Cmd/New.cc b/src/Cmd/New.cc
index 64cc82238..62fae0e00 100644
--- a/src/Cmd/New.cc
+++ b/src/Cmd/New.cc
@@ -6,11 +6,11 @@
 #include "Diag.hpp"
 #include "Git2.hpp"
 #include "Manifest.hpp"
-#include "Rustify/Result.hpp"
 
 #include <cstdlib>
 #include <format>
 #include <fstream>
+#include <rs/result.hpp>
 #include <spdlog/spdlog.h>
 #include <string>
 #include <string_view>
diff --git a/src/Cmd/New.hpp b/src/Cmd/New.hpp
index 74186683c..afb16c809 100644
--- a/src/Cmd/New.hpp
+++ b/src/Cmd/New.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
 #include "Cli.hpp"
-#include "Rustify/Result.hpp"
 
 #include <filesystem>
+#include <rs/result.hpp>
 #include <string>
 #include <string_view>
 
diff --git a/src/Cmd/Remove.cc b/src/Cmd/Remove.cc
index 03b7f5cd2..8bb4d4377 100644
--- a/src/Cmd/Remove.cc
+++ b/src/Cmd/Remove.cc
@@ -3,11 +3,11 @@
 #include "Cli.hpp"
 #include "Diag.hpp"
 #include "Manifest.hpp"
-#include "Rustify/Result.hpp"
 
 #include <cstdlib>
 #include <fmt/ranges.h>
 #include <fstream>
+#include <rs/result.hpp>
 #include <string>
 #include <toml.hpp>
 #include <toml11/types.hpp>
diff --git a/src/Cmd/Run.cc b/src/Cmd/Run.cc
index 2587de1bf..47acfd073 100644
--- a/src/Cmd/Run.cc
+++ b/src/Cmd/Run.cc
@@ -9,12 +9,12 @@
 #include "Diag.hpp"
 #include "Manifest.hpp"
 #include "Parallelism.hpp"
-#include "Rustify/Result.hpp"
 
 #include <charconv>
 #include <cstdint>
 #include <cstdlib>
 #include <filesystem>
+#include <rs/result.hpp>
 #include <string>
 #include <string_view>
 #include <system_error>
diff --git a/src/Cmd/Search.cc b/src/Cmd/Search.cc
index e9ac906b4..94f6e5fb8 100644
--- a/src/Cmd/Search.cc
+++ b/src/Cmd/Search.cc
@@ -2,7 +2,6 @@
 
 #include "Cli.hpp"
 #include "Diag.hpp"
-#include "Rustify/Result.hpp"
 
 #include <cstddef>
 #include <cstdlib>
@@ -10,6 +9,7 @@
 #include <iomanip>
 #include <iostream>
 #include <nlohmann/json.hpp>
+#include <rs/result.hpp>
 #include <string>
 #include <string_view>
 
diff --git a/src/Cmd/Test.cc b/src/Cmd/Test.cc
index 19b02fc19..89cf911d8 100644
--- a/src/Cmd/Test.cc
+++ b/src/Cmd/Test.cc
@@ -8,10 +8,10 @@
 #include "Diag.hpp"
 #include "Manifest.hpp"
 #include "Parallelism.hpp"
-#include "Rustify/Result.hpp"
 
 #include <charconv>
 #include <cstdint>
+#include <rs/result.hpp>
 #include <string>
 #include <string_view>
 #include <system_error>
diff --git a/src/Cmd/Tidy.cc b/src/Cmd/Tidy.cc
index ae6f6065c..46999cd63 100644
--- a/src/Cmd/Tidy.cc
+++ b/src/Cmd/Tidy.cc
@@ -9,7 +9,6 @@
 #include "Diag.hpp"
 #include "Manifest.hpp"
 #include "Parallelism.hpp"
-#include "Rustify/Result.hpp"
 
 #include <array>
 #include <charconv>
@@ -17,6 +16,7 @@
 #include <cstdint>
 #include <cstdlib>
 #include <filesystem>
+#include <rs/result.hpp>
 #include <string>
 #include <string_view>
 #include <system_error>
diff --git a/src/Cmd/Version.cc b/src/Cmd/Version.cc
index 5c9f74003..f5a0e026f 100644
--- a/src/Cmd/Version.cc
+++ b/src/Cmd/Version.cc
@@ -4,10 +4,10 @@
 #include "CurlVersion.hpp"
 #include "Diag.hpp"
 #include "Git2/Version.hpp"
-#include "Rustify/Result.hpp"
 
 #include <cstdlib>
 #include <fmt/format.h>
+#include <rs/result.hpp>
 #include <string_view>
 
 #ifndef CABIN_CABIN_PKG_VERSION
diff --git a/src/Driver.cc b/src/Driver.cc
index c6fa11577..6760a8fd2 100644
--- a/src/Driver.cc
+++ b/src/Driver.cc
@@ -4,10 +4,10 @@
 #include "Cli.hpp"
 #include "Cmd.hpp"
 #include "Diag.hpp"
-#include "Rustify/Result.hpp"
 #include "TermColor.hpp"
 
 #include <cstdlib>
+#include <rs/result.hpp>
 #include <spdlog/cfg/env.h>
 #include <spdlog/version.h>
 #include <string>
diff --git a/src/Driver.hpp b/src/Driver.hpp
index 9ea7aa172..1dc751d92 100644
--- a/src/Driver.hpp
+++ b/src/Driver.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Rustify/Result.hpp"
+#include <rs/result.hpp>
 
 namespace cabin {
 
diff --git a/tests/helpers.hpp b/tests/helpers.hpp
index ea469b00e..43388885c 100644
--- a/tests/helpers.hpp
+++ b/tests/helpers.hpp
@@ -3,7 +3,6 @@
 #include "Algos.hpp"
 #include "Command.hpp"
 #include "Manifest.hpp"
-#include "Rustify/Result.hpp"
 
 #include <array>
 #include <chrono>
@@ -16,6 +15,7 @@
 #include <iterator>
 #include <random>
 #include <regex>
+#include <rs/result.hpp>
 #include <sstream>
 #include <string>
 #include <string_view>