diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61f5906..9cfab31 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,8 +60,9 @@ set_property(
 
 target_include_directories(
   cfd950
-  PUBLIC
-    ${CMAKE_CURRENT_SOURCE_DIR}
+  PUBLIC  
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/device>
+    $<INSTALL_INTERFACE:include>
 )
 
 target_link_libraries(
diff --git a/frontend/cfd950_scfe.cxx b/frontend/cfd950_scfe.cxx
index 8d268b5..be0da16 100644
--- a/frontend/cfd950_scfe.cxx
+++ b/frontend/cfd950_scfe.cxx
@@ -16,7 +16,7 @@
 #include "mfe.h"
 
 #include "class/generic.h"
-#include "device/cfd950.h"
+#include "cfd950.h"
 #include "bus/null.h"
 
 //-- Globals -------------------------------------------------------