diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4a128397b4192d556ff46bea6eecf20688e767e0..e6d799cbe84406acc5e4af82f79335f3464a0754 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -599,13 +599,17 @@ ELSE(Ceres_FOUND)
 ENDIF(Ceres_FOUND)
 
 IF (laser_scan_utils_FOUND)
-    SET(HDRS ${HDRS}
-include/base/capture/capture_laser_2D.h
-include/base/sensor/sensor_laser_2D.h
-include/base/processor/processor_tracker_feature_corner.h
-include/base/processor/processor_tracker_landmark_corner.h
-include/base/processor/processor_tracker_landmark_polyline.h
+      SET(HDRS_CAPTURE ${HDRS_CAPTURE}
+        include/base/capture/capture_laser_2D.h
         )
+    SET(HDRS_PROCESSOR ${HDRS_PROCESSOR}
+      include/base/processor/processor_tracker_feature_corner.h
+      include/base/processor/processor_tracker_landmark_corner.h
+      include/base/processor/processor_tracker_landmark_polyline.h
+      )
+    SET(HDRS_SENSOR ${HDRS_SENSOR}
+      include/base/sensor/sensor_laser_2D.h
+      )
     SET(SRCS ${SRCS}
 src/sensor/sensor_laser_2D.cpp
 src/processor/processor_tracker_feature.cpp
@@ -618,10 +622,12 @@ src/processor/processor_tracker_landmark_dummy.cpp
 ENDIF(laser_scan_utils_FOUND)
 
 IF (raw_gps_utils_FOUND)
-    SET(HDRS ${HDRS}
-include/base/capture/capture_GPS.h
-include/base/processor/processor_GPS.h
-        )
+    SET(HDRS_CAPTURE ${HDRS_CAPTURE}
+      include/base/capture/capture_GPS.h
+      )
+    SET(HDRS_PROCESSOR ${HDRS_PROCESSOR}
+      include/base/processor/processor_GPS.h
+      )
     SET(SRCS ${SRCS}
 src/capture/capture_GPS.cpp
 src/processor/processor_GPS.cpp
@@ -630,10 +636,12 @@ ENDIF(raw_gps_utils_FOUND)
 
 # Vision
 IF (vision_utils_FOUND)
-    SET(HDRS ${HDRS}
-include/base/capture/capture_image.h
-include/base/feature/feature_point_image.h
-        )
+    SET(HDRS_CAPTURE ${HDRS_CAPTURE}
+      include/base/capture/capture_image.h
+    )
+  SET(HDRS_FEATURE ${HDRS_FEATURE}
+    include/base/feature/feature_point_image.h
+    )
     SET(HDRS_PROCESSOR ${HDRS_PROCESSOR}
 include/base/processor/processor_tracker_feature_trifocal.h
 include/base/processor/processor_params_image.h
diff --git a/cmake_modules/wolfConfig.cmake b/cmake_modules/wolfConfig.cmake
index ed9ca5a7637881296727dcaa4efcb587a6534697..82bb7cf0a5523302eb3d6c7fd5064e382a6c59f5 100644
--- a/cmake_modules/wolfConfig.cmake
+++ b/cmake_modules/wolfConfig.cmake
@@ -140,7 +140,7 @@ if (NOT EXISTS ${wolf_INCLUDE_DIR}/wolf)
     "partially relocated outside of CMake after wolf was built.")
 # endif (NOT EXISTS ${wolf_INCLUDE_DIR}/wolf/wolf.h)
 endif (NOT EXISTS ${wolf_INCLUDE_DIR}/wolf)
-list(APPEND wolf_INCLUDE_DIRS ${wolf_INCLUDE_DIR})
+list(APPEND wolf_INCLUDE_DIRS ${wolf_INCLUDE_DIR}/wolf)
 
 # Set the version.
 set(wolf_VERSION 0.0.1)