diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3db5442..64fa14a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,7 +89,6 @@ target_include_directories(
   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
   $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${module-dir}>
 )
 target_include_directories(
   "${PROJECT_NAME}-lib"
@@ -132,7 +131,7 @@ install(
 install(
   DIRECTORY
   "${CMAKE_CURRENT_BINARY_DIR}/include/"
-  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${module-dir}"
+  DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/"
 )
 if(WITH_API)
   enable_language("C")
diff --git a/config/template.cmake b/config/template.cmake
index 8b5141d..76654d1 100644
--- a/config/template.cmake
+++ b/config/template.cmake
@@ -5,8 +5,7 @@ set("@PROJECT_NAME@_WITH_API_V2" @WITH_API_V2@)
 set("@PROJECT_NAME@_WITH_OpenMP" @WITH_OpenMP@)
 set(
   "@PROJECT_NAME@_INCLUDE_DIRS"
-  "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@"
-  "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/@module-dir@"
+  "@CMAKE_INSTALL_FULL_INCLUDEDIR@"
 )
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}")
 
diff --git a/config/template.pc b/config/template.pc
index 3d6efbb..55b899f 100644
--- a/config/template.pc
+++ b/config/template.pc
@@ -1,9 +1,9 @@
 prefix=@CMAKE_INSTALL_PREFIX@
-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
 
 Name: @PROJECT_NAME@
 Description: @PROJECT_DESCRIPTION@
 Version: @PROJECT_VERSION@
 Libs: -L${libdir} -l@PROJECT_NAME@
-Cflags: -I${includedir} -I${includedir}/@module-dir@
+Cflags: -I${includedir} -I${includedir}/
diff --git a/meson.build b/meson.build
index 7de7d61..81b8a7d 100644
--- a/meson.build
+++ b/meson.build
@@ -83,7 +83,7 @@ if install
     )
   endif
 
-  module_id = meson.project_name() / fc_id + '-' + fc.version()
+  module_id = meson.project_name()
   meson.add_install_script(
     find_program(files('config'/'install-mod.py')),
     get_option('includedir') / module_id,