diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9389fd6..bafdbe8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -83,13 +83,27 @@ jobs:
           echo ${{ matrix.config.cmake_args }}
           echo ${{ matrix.config.toolchain }}
           rm -rf .build
-          cmake ${{ matrix.config.cmake_args }} -DCMAKE_TOOLCHAIN_FILE="etc/${{ matrix.config.toolchain }}-toolchain.cmake" -B .build -S .
-      - name: CMake Build
+          cmake ${{ matrix.config.cmake_args }} -DCMAKE_INSTALL_PREFIX=.install -DCMAKE_TOOLCHAIN_FILE="etc/${{ matrix.config.toolchain }}-toolchain.cmake" -B .build -S .
+      - name: CMake ASAN Build
         run: |
           set -x
+          cmake --build .build --config Asan --target all_verify_interface_header_sets -- -k 0
           cmake --build .build --config Asan --target all -- -k 0
-      - name: CMake Test
+      - name: CMake ASAN Test
         run: |
           set -x
           [[ ! -z "${{ matrix.config.asan_options }}" ]]  && export ASAN_OPTIONS="${{ matrix.config.asan_options }}"
           ctest --build-config Asan --output-on-failure --test-dir .build
+      - name: CMake RWDI Build
+        run: |
+          set -x
+          cmake --build .build --config RelWithDebInfo --target all_verify_interface_header_sets -- -k 0
+          cmake --build .build --config RelWithDebInfo --target all -- -k 0
+      - name: CMake RWDI Test
+        run: |
+          set -x
+          ctest --build-config RelWithDebInfo --output-on-failure --test-dir .build
+      - name: Install
+        run: |
+          set -x
+          cmake --install .build --config RelWithDebInfo --component beman_optional26_development --verbose
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f012e3..5b4897d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,11 +31,13 @@ if(OPTIONAL26_ENABLE_TESTING)
     FetchContent_MakeAvailable(googletest)
 endif()
 
+set(CMAKE_VERIFY_INTERFACE_HEADER_SETS ON)
+
 # Create the library target and named header set for beman_optional26
-add_library(beman_optional26 STATIC)
+add_library(beman_optional26 INTERFACE)
 target_sources(
     beman_optional26
-    PUBLIC FILE_SET beman_optional26_headers TYPE HEADERS BASE_DIRS src include
+    PUBLIC FILE_SET beman_optional26_headers TYPE HEADERS BASE_DIRS include
 )
 
 if(OPTIONAL26_ENABLE_TESTING)
@@ -49,13 +51,33 @@ if(OPTIONAL26_ENABLE_TESTING)
             TYPE HEADERS
             BASE_DIRS src
     )
+
+    add_subdirectory(src/beman/optional26/tests)
 endif()
 
-add_subdirectory(src/beman/optional26)
 add_subdirectory(include/beman/optional26)
 
 add_subdirectory(examples)
 
+include(CMakePackageConfigHelpers)
+
+# This will be used to replace @PACKAGE_cmakeModulesDir@
+set(cmakeModulesDir cmake/beman)
+configure_package_config_file(
+    cmake/Config.cmake.in
+    BemanOptional26Config.cmake
+    INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/beman/optional26/
+    PATH_VARS cmakeModulesDir
+    NO_SET_AND_CHECK_MACRO
+    NO_CHECK_REQUIRED_COMPONENTS_MACRO
+)
+
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/BemanOptional26Config.cmake
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/beman/optional26/
+    COMPONENT beman_optional26_development
+)
+
 # Coverage
 configure_file("cmake/gcovr.cfg.in" gcovr.cfg @ONLY)
 
diff --git a/CMakePresets.json b/CMakePresets.json
index e88642e..42d3d6c 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -85,22 +85,38 @@
     {
       "name": "common",
       "hidden": true,
-      "configuration": "Asan"
+      "configuration": "Asan",
+      "targets": [
+        "all_verify_interface_header_sets",
+        "all"
+      ]
     },
     {
       "name": "system",
       "inherits": "common",
-      "configurePreset": "system"
+      "configurePreset": "system",
+      "targets": [
+        "all_verify_interface_header_sets",
+        "all"
+      ]
     },
     {
       "name": "gcc-14",
       "inherits": "common",
-      "configurePreset": "gcc-14"
+      "configurePreset": "gcc-14",
+      "targets": [
+        "all_verify_interface_header_sets",
+        "all"
+      ]
     },
     {
       "name": "gcc-13",
       "inherits": "common",
-      "configurePreset": "gcc-13"
+      "configurePreset": "gcc-13",
+      "targets": [
+        "all_verify_interface_header_sets",
+        "all"
+      ]
     },
     {
       "name": "gcc-12",
@@ -115,22 +131,38 @@
     {
       "name": "clang-19",
       "inherits": "common",
-      "configurePreset": "clang-19"
+      "configurePreset": "clang-19",
+      "targets": [
+        "all_verify_interface_header_sets",
+        "all"
+      ]
     },
     {
       "name": "clang-18",
       "inherits": "common",
-      "configurePreset": "clang-18"
+      "configurePreset": "clang-18",
+      "targets": [
+        "all_verify_interface_header_sets",
+        "all"
+      ]
     },
     {
       "name": "clang-17",
       "inherits": "common",
-      "configurePreset": "clang-17"
+      "configurePreset": "clang-17",
+      "targets": [
+        "all_verify_interface_header_sets",
+        "all"
+      ]
     },
     {
       "name": "clang-16",
       "inherits": "common",
       "configurePreset": "clang-16"
+      "targets": [
+        "all_verify_interface_header_sets",
+        "all"
+      ]
     }
   ],
   "testPresets": [
diff --git a/Makefile b/Makefile
index 90e9175..c98ab60 100755
--- a/Makefile
+++ b/Makefile
@@ -61,6 +61,7 @@ $(_build_path)/CMakeCache.txt: | $(_build_path) .gitmodules
 
 TARGET:=all
 compile: $(_build_path)/CMakeCache.txt ## Compile the project
+	cmake --build $(_build_path)  --config $(CONFIG) --target all_verify_interface_header_sets -- -k 0
 	cmake --build $(_build_path)  --config $(CONFIG) --target all -- -k 0
 
 install: $(_build_path)/CMakeCache.txt compile ## Install the project
diff --git a/cmake/Config.cmake.in b/cmake/Config.cmake.in
index 050aedb..4c786be 100644
--- a/cmake/Config.cmake.in
+++ b/cmake/Config.cmake.in
@@ -1,4 +1,4 @@
-# cmake/Config.cmake.in -*-makefile-*-
+# cmake/Config.cmake.in -*-cmake-*-
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 @PACKAGE_INIT@
diff --git a/include/beman/optional26/CMakeLists.txt b/include/beman/optional26/CMakeLists.txt
index 2915023..e43fc93 100644
--- a/include/beman/optional26/CMakeLists.txt
+++ b/include/beman/optional26/CMakeLists.txt
@@ -13,3 +13,29 @@ target_sources(
             detail/stl_interfaces/fwd.hpp
             detail/stl_interfaces/iterator_interface.hpp
 )
+
+install(
+    TARGETS beman_optional26
+    FILE_SET beman_optional26_headers
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+        COMPONENT beman_optional26_development
+)
+
+install(
+    TARGETS beman_optional26
+    EXPORT beman_optional26_export
+    DESTINATION
+    ${CMAKE_INSTALL_LIBDIR}
+    FILE_SET beman_optional26_headers
+        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+        COMPONENT beman_optional26_development
+)
+
+install(
+    EXPORT beman_optional26_export
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/beman/optional26/
+    NAMESPACE Beman::Optional26::
+    FILE beman_optional26.cmake
+    EXPORT_LINK_INTERFACE_LIBRARIES
+    COMPONENT beman_optional26_development
+)
diff --git a/src/beman/optional26/CMakeLists.txt b/src/beman/optional26/CMakeLists.txt
deleted file mode 100644
index 1bd7439..0000000
--- a/src/beman/optional26/CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-# src/beman/optional26/CMakeLists.txt -*-cmake-*-
-# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-
-# Ensure that optional and iterator get compiled at least once
-target_sources(beman_optional26 PUBLIC optional.cpp detail/iterator.cpp)
-
-# The library is empty -- exclude it
-install(
-    TARGETS beman_optional26
-    ARCHIVE
-        DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        COMPONENT beman_optional26_library
-        EXCLUDE_FROM_ALL
-)
-
-install(
-    TARGETS beman_optional26
-    FILE_SET beman_optional26_headers
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-        COMPONENT beman_optional26_development
-)
-
-# Tests
-if(OPTIONAL26_ENABLE_TESTING)
-    add_subdirectory(tests)
-endif()
diff --git a/src/beman/optional26/detail/iterator.cpp b/src/beman/optional26/detail/iterator.cpp
deleted file mode 100644
index c01fe5d..0000000
--- a/src/beman/optional26/detail/iterator.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-// src/beman/optional26/detail/iterator.cpp -*-C++-*-
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-
-#include <beman/optional26/detail/iterator.hpp>
diff --git a/src/beman/optional26/optional.cpp b/src/beman/optional26/optional.cpp
deleted file mode 100644
index f5b151c..0000000
--- a/src/beman/optional26/optional.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-// src/beman/optional26/optional.cpp                                  -*-C++-*-
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-
-#include <beman/optional26/optional.hpp>
diff --git a/src/beman/optional26/tests/CMakeLists.txt b/src/beman/optional26/tests/CMakeLists.txt
index a35e019..5a2c1ad 100644
--- a/src/beman/optional26/tests/CMakeLists.txt
+++ b/src/beman/optional26/tests/CMakeLists.txt
@@ -17,8 +17,6 @@ target_sources(
         optional_range_support.t.cpp
         optional_ref.t.cpp
         optional_ref_monadic.t.cpp
-        test_types.cpp
-        test_utilities.cpp
 )
 
 target_sources(
diff --git a/src/beman/optional26/tests/test_types.cpp b/src/beman/optional26/tests/test_types.cpp
deleted file mode 100644
index a851377..0000000
--- a/src/beman/optional26/tests/test_types.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-// src/beman/optional26/test/test_types.cpp                           -*-C++-*-
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-
-#include <beman/optional26/tests/test_types.hpp>
diff --git a/src/beman/optional26/tests/test_utilities.cpp b/src/beman/optional26/tests/test_utilities.cpp
deleted file mode 100644
index 0c48cce..0000000
--- a/src/beman/optional26/tests/test_utilities.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-// src/beman/optional26/test/test_utilities.cpp                       -*-C++-*-
-// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-
-#include <beman/optional26/tests/test_utilities.hpp>