diff --git a/src/examples/lidar_lite_test.cpp b/src/examples/lidar_lite_test.cpp
index 936bed8d869fed2bc910b051a440a7c25e6e79c5..ecd2cc3bf57808c8c7691defccde2093edf9c84a 100644
--- a/src/examples/lidar_lite_test.cpp
+++ b/src/examples/lidar_lite_test.cpp
@@ -1,4 +1,5 @@
 #include "lidar_lite.h"
+#include "exceptions/lidar_lite_exceptions.h"
 
 int main(int argc, char *argv[])
 {
diff --git a/src/exceptions/lidar_lite_exceptions.cpp b/src/exceptions/lidar_lite_exceptions.cpp
index c288ce5e0845ec019fa077ef4330fe650c4c3d6b..6c7199e418da987658f0a2b97d49722959cd55fd 100644
--- a/src/exceptions/lidar_lite_exceptions.cpp
+++ b/src/exceptions/lidar_lite_exceptions.cpp
@@ -3,8 +3,6 @@
 #include <string.h>
 #include <stdio.h>
 
-#include "exceptions/lidar_lite_exceptions.h"
-
 const std::string lidar_lite_error_message="LidarLite - ";
 
 CLidarLiteException::CLidarLiteException(const std::string& where,const std::string &error_msg):CException(where,lidar_lite_error_message)
diff --git a/src/lidar_lite.cpp b/src/lidar_lite.cpp
index f9581fb1e8e000ded4d52ad1d9d1d198877c962b..9df5c7da50fc1dce2e197df960d0618c5d43d8ac 100644
--- a/src/lidar_lite.cpp
+++ b/src/lidar_lite.cpp
@@ -1,9 +1,15 @@
 #include "lidar_lite.h"
+#include <exceptions/lidar_lite_exceptions.h>
 
 //******************************************************************************
 // PUBLIC API 
 //******************************************************************************
 
+// The device has a 7-bit slave address with a default value of 0x62.
+// Fill in new address here if changed. 
+// See operating manual for instructions.
+unsigned char DEVICE_ID = 0x62;
+
 CLidarLite::CLidarLite(const std::string &serial, const int config)
 {
   this->serial_ = serial;
diff --git a/src/lidar_lite.h b/src/lidar_lite.h
index 00e4c287a94994f6ae35a5a29162d26be62dc0b6..c1f381b5a9be8a0e88e6d82f6c571f2067243cb1 100644
--- a/src/lidar_lite.h
+++ b/src/lidar_lite.h
@@ -7,12 +7,6 @@
 #include <iomanip>
 #include <cmath>
 #include <usb_i2c.h>
-#include "exceptions/lidar_lite_exceptions.h"
-
-// The device has a 7-bit slave address with a default value of 0x62.
-// Fill in new address here if changed. 
-// See operating manual for instructions.
-unsigned char DEVICE_ID = 0x62;
 
 enum V3_REGISTER_DEF
 {