diff --git a/local/code/CMakeLists.txt b/local/code/CMakeLists.txt
index 1b98095a..9670e43b 100644
--- a/local/code/CMakeLists.txt
+++ b/local/code/CMakeLists.txt
@@ -3,7 +3,7 @@
 #
 icm_add_lib(ac-local AC_LOCAL)
 add_library(ac::local ALIAS ac-local)
-target_include_directories(ac-local INTERFACE .)
+
 target_link_libraries(ac-local
     PRIVATE
         jalog::jalog
@@ -13,20 +13,27 @@ target_link_libraries(ac-local
         ac::dict
         ac::schema
 )
-target_sources(ac-local PRIVATE
-    ac/local/export.h
+target_sources(ac-local
+    INTERFACE FILE_SET HEADERS FILES
+        ac/local/export.h
+
+        ac/local/ModelDesc.hpp
+        ac/local/ProgressCb.hpp
+        ac/local/ModelPtr.hpp
+        ac/local/ModelLoader.hpp
+        ac/local/Model.hpp
+        ac/local/Instance.hpp
 
-    ac/local/Logging.hpp
-    ac/local/Logging.cpp
+        ac/local/ModelFactory.hpp
+    PRIVATE
+        ac/local/Logging.hpp
+        ac/local/Logging.cpp
 
-    ac/local/ModelDesc.hpp
-    ac/local/ProgressCb.hpp
-    ac/local/ModelPtr.hpp
-    ac/local/ModelLoader.hpp
-    ac/local/Model.hpp
-    ac/local/Instance.hpp
-    ac/local/VtableExports.cpp
+        ac/local/VtableExports.cpp
+
+        ac/local/ModelFactory.cpp
+)
 
-    ac/local/ModelFactory.hpp
-    ac/local/ModelFactory.cpp
+install(TARGETS ac-local
+    FILE_SET HEADERS
 )
diff --git a/local/schema/CMakeLists.txt b/local/schema/CMakeLists.txt
index 858444c0..9449efb3 100644
--- a/local/schema/CMakeLists.txt
+++ b/local/schema/CMakeLists.txt
@@ -2,13 +2,5 @@
 # SPDX-License-Identifier: MIT
 #
 ac_dep(magic_enum)
-
-add_library(ac-schema INTERFACE)
-add_library(ac::schema ALIAS ac-schema)
-target_link_libraries(ac-schema INTERFACE
-    ac::astl-private
-    ac::dict
-    magic_enum::magic_enum
-)
-target_include_directories(ac-schema INTERFACE code)
+add_subdirectory(code)
 ac_add_test_subdir()
diff --git a/local/schema/code/CMakeLists.txt b/local/schema/code/CMakeLists.txt
new file mode 100644
index 00000000..1c4f508a
--- /dev/null
+++ b/local/schema/code/CMakeLists.txt
@@ -0,0 +1,20 @@
+# Copyright (c) Alpaca Core
+# SPDX-License-Identifier: MIT
+#
+add_library(ac-schema INTERFACE)
+add_library(ac::schema ALIAS ac-schema)
+target_link_libraries(ac-schema INTERFACE
+    ac::astl-private
+    ac::dict
+    magic_enum::magic_enum
+)
+target_sources(ac-schema INTERFACE FILE_SET HEADERS FILES
+    ac/schema/ModelSchema.hpp
+    ac/schema/ModelSchemaGenHelper.hpp
+    # ac/schema/SchemaEnum.hpp
+    ac/schema/SchemaItem.hpp
+)
+
+install(TARGETS ac-schema
+    FILE_SET HEADERS
+)