diff --git a/CMakeLists.txt b/CMakeLists.txt
index 867941afab85548011c97ff7f32b6fb3c0abfd9b..dac043853ccd66b06d409fcd15c28a1bf8bea9c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -246,12 +246,9 @@ set(
     "${CMAKE_CURRENT_BINARY_DIR}/include/hpdf_config.h"
 )
 
-if (NOT VTK_INSTALL_NO_DEVELOPMENT)
-  install(FILES
-    ${haru_HDRS}
-    DESTINATION "${VTK_INSTALL_INCLUDE_DIR}/vtklibharu/include"
-    COMPONENT Development)
-endif()
+vtk_module_install_headers(
+  FILES   ${haru_HDRS}
+  SUBDIR  "vtklibharu/include")
 
 # install header files
 if (FALSE) # XXX(kitware): VTK handles installation
diff --git a/include/hpdf.h b/include/hpdf.h
index cfebfc4eb7bef4d69a71bb9aa919263103ce49b2..568ab4a892da076770fc50ed778872836fb1735f 100644
--- a/include/hpdf.h
+++ b/include/hpdf.h
@@ -56,6 +56,7 @@
 #include "hpdf_types.h"
 
 typedef void         *HPDF_HANDLE;
+typedef HPDF_HANDLE   HPDF_Boolean;
 typedef HPDF_HANDLE   HPDF_Doc;
 typedef HPDF_HANDLE   HPDF_Page;
 typedef HPDF_HANDLE   HPDF_Pages;
@@ -80,7 +81,6 @@ typedef HPDF_HANDLE   HPDF_EmbeddedFile;
 typedef HPDF_HANDLE   HPDF_OutputIntent;
 typedef HPDF_HANDLE   HPDF_Xref;
 typedef HPDF_HANDLE   HPDF_Shading;
-typedef HPDF_HANDLE   HPDF_Boolean;
 
 #else
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ec2df22aac8057c9281d35b285ce9e3be2c5914d..cd80bbc2160c6787c8d41f518780c58bca0390b8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -101,14 +101,14 @@ if(LIBHPDF_SHARED)
   )
 endif(LIBHPDF_SHARED)
 else ()
-  vtk_add_library(vtklibharu ${LIBHPDF_SRCS})
-  target_link_libraries(vtklibharu PRIVATE ${vtkzlib_LIBRARIES} ${vtkpng_LIBRARIES})
+  vtk_module_add_module(VTK::libharu
+    SOURCES ${LIBHPDF_SRCS})
   if (WIN32)
-    set_target_properties(vtklibharu
+    set_target_properties(libharu
       PROPERTIES
         DEFINE_SYMBOL HPDF_DLL_MAKE)
   endif ()
-  target_include_directories(vtklibharu
+  target_include_directories(libharu
     PUBLIC
       "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>"
       "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/../include>")