diff --git a/FindIonobase.cmake b/FindIonobase.cmake
index d527a52..f70f63f 100644
--- a/FindIonobase.cmake
+++ b/FindIonobase.cmake
@@ -12,8 +12,8 @@ if(NOT IONOBASE_IS_EXTERNAL_PROJECT)
   endif()
   find_path(
     IONOBASE_INCLUDE_DIRS
-    NAMES ionobase/interchfor.h
-    PATHS ${_search_paths})
+    NAMES interchfor.h
+    HINTS ${_search_paths})
 
   set(_search_paths "")
   if(IONOBASE_LIBRARY_DIR AND EXISTS ${IONOBASE_LIBRARY_DIR})
diff --git a/FindIonobaseThirdparty.cmake b/FindIonobaseThirdparty.cmake
index e22cbc0..88de228 100644
--- a/FindIonobaseThirdparty.cmake
+++ b/FindIonobaseThirdparty.cmake
@@ -27,10 +27,10 @@ set(IONOBASE_PREFIX
     ${CMAKE_BINARY_DIR}
     CACHE FILEPATH "" FORCE)
 set(IONOBASE_INCLUDE_DIR
-    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}
+    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/ionobase
     CACHE PATH "" FORCE)
 set(IONOBASE_INCLUDE_DIRS
-    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}
+    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/ionobase
     CACHE PATH "" FORCE)
 set(IONOBASE_LIBRARY_DIR
     ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}