diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04674124cc..c7869a58ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -420,6 +420,8 @@ IF(IS_DIRECTORY "${PROJECT_SOURCE_DIR}/library/src/tensor_operation_instance/gpu
 ENDIF()
 ENDFOREACH()
 
+add_subdirectory(include/ck)
+
 add_custom_target(instances DEPENDS utility;${CK_DEVICE_INSTANCES}  SOURCES ${INSTANCE_FILES})
 add_subdirectory(library)
 
diff --git a/client_example/25_tensor_transforms/CMakeLists.txt b/client_example/25_tensor_transforms/CMakeLists.txt
index a11d12ae85..cdc13b3160 100644
--- a/client_example/25_tensor_transforms/CMakeLists.txt
+++ b/client_example/25_tensor_transforms/CMakeLists.txt
@@ -1,2 +1,4 @@
 add_executable(client_tensor_transform tensor_transform.cpp)
+target_include_directories(client_tensor_transform INTERFACE composable_kernel::wrapper)
 add_executable(client_tensor_transform_using_wrapper tensor_transform_using_wrapper.cpp)
+target_include_directories(client_tensor_transform_using_wrapper INTERFACE composable_kernel::wrapper)
diff --git a/include/ck/CMakeLists.txt b/include/ck/CMakeLists.txt
new file mode 100644
index 0000000000..a5c126bfd1
--- /dev/null
+++ b/include/ck/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(wrapper)
diff --git a/include/ck/wrapper/CMakeLists.txt b/include/ck/wrapper/CMakeLists.txt
new file mode 100644
index 0000000000..fca927066b
--- /dev/null
+++ b/include/ck/wrapper/CMakeLists.txt
@@ -0,0 +1,9 @@
+add_library(wrapper INTERFACE)
+add_library(composable_kernel::wrapper ALIAS wrapper)
+
+target_include_directories(wrapper INTERFACE
+            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ck>
+            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ck/utility>
+            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ck/tensor_description>
+            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/ck/wrapper>
+)