diff --git a/Findtrajectory.cmake b/Findtrajectory.cmake
index 466b4655e2601a68165418843ff5246321e65744..b2239c59a937e7eb6ec2e5a4b1dd1f9741633cde 100644
--- a/Findtrajectory.cmake
+++ b/Findtrajectory.cmake
@@ -1,5 +1,5 @@
 #edit the following line to add the librarie's header files
-FIND_PATH(trajectory_INCLUDE_DIR trajectory.h /usr/include/iri/trajectory /usr/local/include/iri/trajectory)
+FIND_PATH(trajectory_INCLUDE_DIR trajectory.h trajectory_exceptions.h /usr/include/iri/trajectory /usr/local/include/iri/trajectory)
 
 FIND_LIBRARY(trajectory_LIBRARY
     NAMES trajectory
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index be93c4e9b2eeb8dd974e16768325f629804f61aa..94a58d22365439746721de0df294f899a06cdd9f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -3,11 +3,11 @@ ADD_SUBDIRECTORY(xml)
 # driver source files
 SET(sources trajectory.cpp trajectory_exceptions.cpp)
 # application header files
-SET(headers trajectory.h trajectory_exceptions.h)
+SET(headers ../include/trajectory.h ../include/trajectory_exceptions.h)
 # locate the necessary dependencies
 FIND_PACKAGE(iriutils REQUIRED)
 # add the necessary include directories
-INCLUDE_DIRECTORIES(.)
+INCLUDE_DIRECTORIES(. ../include/)
 INCLUDE_DIRECTORIES(${iriutils_INCLUDE_DIR})
 
 SET_SOURCE_FILES_PROPERTIES(${XSD_SOURCES} PROPERTIES GENERATED 1)