diff --git a/CMakeLists.txt b/CMakeLists.txt
index 977df09f7ceca94773e97fff4328ce6a7a64d977..b648ccebd4d87d8bc3f00d534da5d53449e1a248 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,11 +14,10 @@ find_package(Boost REQUIRED COMPONENTS thread)
 # ******************************************************************** 
 #           Add system and labrobotica dependencies here
 # ******************************************************************** 
-
-find_package(lidar_lite REQUIRED)
-find_package(comm REQUIRED)
 find_package(iriutils REQUIRED)
+find_package(comm REQUIRED)
 find_package(usb_i2c_adapter REQUIRED)
+find_package(lidar_lite REQUIRED)
 
 # ******************************************************************** 
 #           Add topic, service and action definition here
@@ -95,10 +94,10 @@ endif()
 include_directories(include)
 include_directories(${catkin_INCLUDE_DIRS})
 include_directories(${Boost_INCLUDE_DIRS})
-include_directories(${lidar_lite_INCLUDE_DIRS})
-include_directories(${comm_INCLUDE_DIRS})
-include_directories(${iriutils_INCLUDE_DIRS})
-include_directories(${usb_i2c_adapter_INCLUDE_DIRS})
+include_directories(${iriutils_INCLUDE_DIR})
+include_directories(${comm_INCLUDE_DIR})
+include_directories(${usb_i2c_adapter_INCLUDE_DIR})
+include_directories(${lidar_lite_INCLUDE_DIR})
 # include_directories(${<dependency>_INCLUDE_DIR})
 
 ## Declare a cpp library
@@ -111,11 +110,11 @@ add_executable(${PROJECT_NAME} src/lidar_lite_driver.cpp src/lidar_lite_driver_n
 #                   Add the libraries
 # ******************************************************************** 
 target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES})
-target_link_libraries(${PROJECT_NAME} ${Boost_SYSTEM_LIBRARIES})
-target_link_libraries(${PROJECT_NAME} ${lidar_lite_LIBRARIES})
-target_link_libraries(${PROJECT_NAME} ${comm_LIBRARIES})
-target_link_libraries(${PROJECT_NAME} ${iriutils_LIBRARIES})
-target_link_libraries(${PROJECT_NAME} ${usb_i2c_adapter_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} ${Boost_SYSTEM_LIBRARY})
+target_link_libraries(${PROJECT_NAME} ${iriutils_LIBRARY})
+target_link_libraries(${PROJECT_NAME} ${comm_LIBRARY})
+target_link_libraries(${PROJECT_NAME} ${usb_i2c_adapter_LIBRARY})
+target_link_libraries(${PROJECT_NAME} ${lidar_lite_LIBRARY})
 # target_link_libraries(${PROJECT_NAME} ${<dependency>_LIBRARY})
 
 # ******************************************************************** 
diff --git a/include/lidar_lite_driver.h b/include/lidar_lite_driver.h
index ba1764faae3590912ccfb5fd89a215bbd426421b..ba77be851ce8a31cafa9112070a19fac995c6f01 100644
--- a/include/lidar_lite_driver.h
+++ b/include/lidar_lite_driver.h
@@ -30,8 +30,8 @@
 #include <iri_base_driver/iri_base_driver.h>
 #include <iri_lidar_lite_driver/LidarLiteDriverConfig.h>
 
-#include <lidar_lite.h>
-#include <lidar_lite_exceptions.h>
+#include "lidar_lite.h"
+#include "lidar_lite_exceptions.h"
 
 /**
  * \brief IRI ROS Specific Driver Class