4 files changed, 10 insertions, 20 deletions
diff --git a/src/platform/CMakeLists.txt b/src/platform/CMakeLists.txt
index c9eef482..01952106 100644
--- a/src/platform/CMakeLists.txt
+++ b/src/platform/CMakeLists.txt
@@ -1,12 +1,12 @@
 set(CRU_PLATFORM_BASE_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/platform)
 add_library(cru_platform_base INTERFACE)
 target_sources(cru_platform_base INTERFACE
+	${CRU_PLATFORM_BASE_INCLUDE_DIR}/check.hpp
 	${CRU_PLATFORM_BASE_INCLUDE_DIR}/exception.hpp
-	${CRU_PLATFORM_BASE_INCLUDE_DIR}/graphic_base.hpp
+	${CRU_PLATFORM_BASE_INCLUDE_DIR}/graph_base.hpp
 	${CRU_PLATFORM_BASE_INCLUDE_DIR}/heap_debug.hpp
 	${CRU_PLATFORM_BASE_INCLUDE_DIR}/matrix.hpp
-	${CRU_PLATFORM_BASE_INCLUDE_DIR}/native_resource.hpp
-	${CRU_PLATFORM_BASE_INCLUDE_DIR}/string_util.hpp
+	${CRU_PLATFORM_BASE_INCLUDE_DIR}/resource.hpp
 )
 target_link_libraries(cru_platform_base INTERFACE cru_base)
 
diff --git a/src/platform/graph/CMakeLists.txt b/src/platform/graph/CMakeLists.txt
index da76d296..dac28370 100644
--- a/src/platform/graph/CMakeLists.txt
+++ b/src/platform/graph/CMakeLists.txt
@@ -1,12 +1,14 @@
 set(CRU_PLATFORM_GRAPH_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/platform/graph)
 add_library(cru_platform_graph INTERFACE)
 target_sources(cru_platform_graph INTERFACE
+	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/base.hpp
 	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/brush.hpp
 	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/font.hpp
 	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/geometry.hpp
-	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/graph_factory.hpp
+	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/factory.hpp
+	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/resource.hpp
 	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/painter.hpp
 	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/text_layout.hpp
-	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/util/painter_util.hpp
+	${CRU_PLATFORM_GRAPH_INCLUDE_DIR}/util/painter.hpp
 )
 target_link_libraries(cru_platform_graph INTERFACE cru_platform_base)
diff --git a/src/platform/native/CMakeLists.txt b/src/platform/native/CMakeLists.txt
index 0e44fd55..bc7c4a63 100644
--- a/src/platform/native/CMakeLists.txt
+++ b/src/platform/native/CMakeLists.txt
@@ -1,12 +1,10 @@
 set(CRU_PLATFORM_NATIVE_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/platform/native)
-add_library(cru_platform_native STATIC
-    cursor.cpp
-)
-target_sources(cru_platform_native PUBLIC
+add_library(cru_platform_native INTERFACE)
+target_sources(cru_platform_native INTERFACE
 	${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/basic_types.hpp
 	${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/cursor.hpp
 	${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/native_event.hpp
 	${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/native_window.hpp
 	${CRU_PLATFORM_NATIVE_INCLUDE_DIR}/ui_application.hpp
 )
-target_link_libraries(cru_platform_native PUBLIC cru_platform_graph)
+target_link_libraries(cru_platform_native INTERFACE cru_platform_graph)
diff --git a/src/platform/native/cursor.cpp b/src/platform/native/cursor.cpp
deleted file mode 100644
index b12aec40..00000000
--- a/src/platform/native/cursor.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "cru/platform/native/cursor.hpp"
-
-#include "cru/platform/native/ui_application.hpp"
-
-namespace cru::platform::native {
-std::shared_ptr<Cursor> GetSystemCursor(SystemCursor type) {
-  return UiApplication::GetInstance()->GetCursorManager()->GetSystemCursor(
-      type);
-}
-}  // namespace cru::platform::native