diff --git a/src/asterx1_gps.h b/include/asterx1_gps.h
similarity index 100%
rename from src/asterx1_gps.h
rename to include/asterx1_gps.h
diff --git a/src/asterx1_process.h b/include/asterx1_process.h
similarity index 100%
rename from src/asterx1_process.h
rename to include/asterx1_process.h
diff --git a/src/asterx1exceptions.h b/include/asterx1exceptions.h
similarity index 100%
rename from src/asterx1exceptions.h
rename to include/asterx1exceptions.h
diff --git a/src/gps_types.h b/include/gps_types.h
similarity index 100%
rename from src/gps_types.h
rename to include/gps_types.h
diff --git a/src/stream_gps.h b/include/stream_gps.h
similarity index 100%
rename from src/stream_gps.h
rename to include/stream_gps.h
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8765b478eafefb90ba370fc9b0147673c2721f90..8b034767b5b8109d1baeb4c852267a9815de9d08 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,20 +2,20 @@
 SET(sources asterx1_gps.cpp stream_gps.cpp asterx1exceptions.cpp)
 
 # application header files
-SET(headers asterx1_gps.h stream_gps.h asterx1exceptions.h gps_types.h)
+SET(headers ../include/asterx1_gps.h ../include/stream_gps.h ../include/asterx1exceptions.h ../include/gps_types.h)
 
 # driver source files
 SET(process_sources asterx1_process.cpp)
 
 # application header files
-SET(process_headers asterx1_process.h)
+SET(process_headers ../include/asterx1_process.h)
 
 # locate the the necessary dependencies
 FIND_PACKAGE(iriutils)
 FIND_PACKAGE(comm)
 
 # add the necessary include directories
-INCLUDE_DIRECTORIES(.)
+INCLUDE_DIRECTORIES(../include/)
 INCLUDE_DIRECTORIES(${iriutils_INCLUDE_DIR})
 INCLUDE_DIRECTORIES(${comm_INCLUDE_DIR})