diff --git a/CMakeLists.txt b/CMakeLists.txt
index b560ec71..ede8b83d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,13 @@
 #VER_MAJOR = 1
 #VER_MINOR = 0.0
 
+# Headers file are located here:
+INCLUDE_DIRECTORIES(
+  ${CMAKE_CURRENT_SOURCE_DIR}/codec
+  ${CMAKE_CURRENT_SOURCE_DIR}/libjp3dvm
+  )
+
+
 SUBDIRS(
   libjp3dvm
   codec
diff --git a/codec/CMakeLists.txt b/codec/CMakeLists.txt
index 87bdc025..5ed13e70 100644
--- a/codec/CMakeLists.txt
+++ b/codec/CMakeLists.txt
@@ -25,11 +25,6 @@ IF(DONT_HAVE_GETOPT)
 ENDIF(DONT_HAVE_GETOPT)
 
 
-# Headers file are located here:
-INCLUDE_DIRECTORIES(
-  ${CMAKE_CURRENT_SOURCE_DIR}/../libjp3dvm
-  )
-
 # Do the proper thing when building static...if only there was configured
 # headers or def files instead
 #IF(NOT BUILD_SHARED_LIBS)