diff --git a/include/hueplusplus/BaseHttpHandler.h b/include/hueplusplus/BaseHttpHandler.h
index 836e952..e0bf4de 100644
--- a/include/hueplusplus/BaseHttpHandler.h
+++ b/include/hueplusplus/BaseHttpHandler.h
@@ -20,8 +20,8 @@
     along with hueplusplus.  If not, see <http://www.gnu.org/licenses/>.
 **/
 
-#ifndef _BASE_HTTPHANDLER_H
-#define _BASE_HTTPHANDLER_H
+#ifndef INCLUDE_HUEPLUSPLUS_BASE_HTTP_HANDLER_H
+#define INCLUDE_HUEPLUSPLUS_BASE_HTTP_HANDLER_H
 
 #include <iostream>
 #include <memory>
diff --git a/include/hueplusplus/BrightnessStrategy.h b/include/hueplusplus/BrightnessStrategy.h
index c080486..2a365de 100644
--- a/include/hueplusplus/BrightnessStrategy.h
+++ b/include/hueplusplus/BrightnessStrategy.h
@@ -20,8 +20,8 @@
     along with hueplusplus.  If not, see <http://www.gnu.org/licenses/>.
 **/
 
-#ifndef _BRIGHTNESS_STRATEGY_H
-#define _BRIGHTNESS_STRATEGY_H
+#ifndef INCLUDE_HUEPLUSPLUS_BRIGHTNESS_STRATEGY_H
+#define INCLUDE_HUEPLUSPLUS_BRIGHTNESS_STRATEGY_H
 
 #include <cstdint>
 
diff --git a/include/hueplusplus/ColorTemperatureStrategy.h b/include/hueplusplus/ColorTemperatureStrategy.h
index 948d693..e0b455f 100644
--- a/include/hueplusplus/ColorTemperatureStrategy.h
+++ b/include/hueplusplus/ColorTemperatureStrategy.h
@@ -20,8 +20,8 @@
     along with hueplusplus.  If not, see <http://www.gnu.org/licenses/>.
 **/
 
-#ifndef _COLOR_TEMPERATURE_STRATEGY_H
-#define _COLOR_TEMPERATURE_STRATEGY_H
+#ifndef INCLUDE_HUEPLUSPLUS_COLOR_TEMPERATURE_STRATEGY_H
+#define INCLUDE_HUEPLUSPLUS_COLOR_TEMPERATURE_STRATEGY_H
 
 #include <stdint.h>
 
diff --git a/include/hueplusplus/ExtendedColorHueStrategy.h b/include/hueplusplus/ExtendedColorHueStrategy.h
index 28ad1d3..777bcba 100644
--- a/include/hueplusplus/ExtendedColorHueStrategy.h
+++ b/include/hueplusplus/ExtendedColorHueStrategy.h
@@ -20,8 +20,8 @@
     along with hueplusplus.  If not, see <http://www.gnu.org/licenses/>.
 **/
 
-#ifndef _EXTENDED_COLOR_HUE_STRATEGY_H
-#define _EXTENDED_COLOR_HUE_STRATEGY_H
+#ifndef INCLUDE_HUEPLUSPLUS_EXTENDED_COLOR_HUE_STRATEGY_H
+#define INCLUDE_HUEPLUSPLUS_EXTENDED_COLOR_HUE_STRATEGY_H
 
 #include "HueLight.h"
 #include "SimpleColorHueStrategy.h"
diff --git a/include/hueplusplus/ExtendedColorTemperatureStrategy.h b/include/hueplusplus/ExtendedColorTemperatureStrategy.h
index a4afff4..04dda25 100644
--- a/include/hueplusplus/ExtendedColorTemperatureStrategy.h
+++ b/include/hueplusplus/ExtendedColorTemperatureStrategy.h
@@ -20,8 +20,8 @@
     along with hueplusplus.  If not, see <http://www.gnu.org/licenses/>.
 **/
 
-#ifndef _EXTENDED_COLOR_TEMPERATURE_STRATEGY_H
-#define _EXTENDED_COLOR_TEMPERATURE_STRATEGY_H
+#ifndef INCLUDE_HUEPLUSPLUS_EXTENDED_COLOR_TEMPERATURE_STRATEGY_H
+#define INCLUDE_HUEPLUSPLUS_EXTENDED_COLOR_TEMPERATURE_STRATEGY_H
 
 #include "HueLight.h"
 #include "SimpleColorTemperatureStrategy.h"
diff --git a/include/hueplusplus/Hue.h b/include/hueplusplus/Hue.h
index 3134ca7..ad7323f 100644
--- a/include/hueplusplus/Hue.h
+++ b/include/hueplusplus/Hue.h
@@ -20,8 +20,8 @@
     along with hueplusplus.  If not, see <http://www.gnu.org/licenses/>.
 **/
 
-#ifndef _HUE_H
-#define _HUE_H
+#ifndef INCLUDE_HUEPLUSPLUS_HUE_H
+#define INCLUDE_HUEPLUSPLUS_HUE_H
 
 #include <map>
 #include <memory>
diff --git a/include/hueplusplus/HueCommandAPI.h b/include/hueplusplus/HueCommandAPI.h
index 4d978dc..c7c343f 100644
--- a/include/hueplusplus/HueCommandAPI.h
+++ b/include/hueplusplus/HueCommandAPI.h
@@ -20,8 +20,8 @@
     along with hueplusplus.  If not, see <http://www.gnu.org/licenses/>.
 **/
 
-#ifndef _HUECOMMANDAPI_H
-#define _HUECOMMANDAPI_H
+#ifndef INCLUDE_HUEPLUSPLUS_HUECOMMANDAPI_H
+#define INCLUDE_HUEPLUSPLUS_HUECOMMANDAPI_H
 
 #include <atomic>
 #include <chrono>
diff --git a/include/hueplusplus/HueConfig.h b/include/hueplusplus/HueConfig.h
index a64adb3..83fcc71 100644
--- a/include/hueplusplus/HueConfig.h
+++ b/include/hueplusplus/HueConfig.h
@@ -20,8 +20,8 @@
     along with hueplusplus.  If not, see <http://www.gnu.org/licenses/>.
 **/
 
-#ifndef _HUE_CONFIG_H
-#define _HUE_CONFIG_H
+#ifndef INCLUDE_HUEPLUSPLUS_HUE_CONFIG_H
+#define INCLUDE_HUEPLUSPLUS_HUE_CONFIG_H
 
 namespace hueplusplus
 {
diff --git a/include/hueplusplus/HueDeviceTypes.h b/include/hueplusplus/HueDeviceTypes.h
index 5e6ced7..347b5a9 100644
--- a/include/hueplusplus/HueDeviceTypes.h
+++ b/include/hueplusplus/HueDeviceTypes.h
@@ -20,8 +20,8 @@
     along with hueplusplus.  If not, see <http://www.gnu.org/licenses/>.
 **/
 
-#ifndef _HUEDEVICETYPES_H
-#define _HUEDEVICETYPES_H
+#ifndef INCLUDE_HUEPLUSPLUS_HUEDEVICETYPES_H
+#define INCLUDE_HUEPLUSPLUS_HUEDEVICETYPES_H
 
 #include <memory>
 #include <string>
diff --git a/include/hueplusplus/HueException.h b/include/hueplusplus/HueException.h
index ba3ceb4..74eba48 100644
--- a/include/hueplusplus/HueException.h
+++ b/include/hueplusplus/HueException.h
@@ -20,8 +20,8 @@
     along with hueplusplus.  If not, see <http://www.gnu.org/licenses/>.
 **/
 
-#ifndef _HUE_EXCEPTION_H
-#define _HUE_EXCEPTION_H
+#ifndef INCLUDE_HUEPLUSPLUS_HUE_EXCEPTION_H
+#define INCLUDE_HUEPLUSPLUS_HUE_EXCEPTION_H
 
 #include <exception>
 #include <string>
diff --git a/include/hueplusplus/HueLight.h b/include/hueplusplus/HueLight.h
index 1e981cd..a61bc02 100644
--- a/include/hueplusplus/HueLight.h
+++ b/include/hueplusplus/HueLight.h
@@ -20,8 +20,8 @@
     along with hueplusplus.  If not, see <http://www.gnu.org/licenses/>.
 **/
 
-#ifndef _HUE_LIGHT_H
-#define _HUE_LIGHT_H
+#ifndef INCLUDE_HUEPLUSPLUS_HUE_LIGHT_H
+#define INCLUDE_HUEPLUSPLUS_HUE_LIGHT_H
 
 #include <memory>
 
diff --git a/include/hueplusplus/IHttpHandler.h b/include/hueplusplus/IHttpHandler.h
index 67156a1..8d1cfeb 100644
--- a/include/hueplusplus/IHttpHandler.h
+++ b/include/hueplusplus/IHttpHandler.h
@@ -20,8 +20,8 @@
     along with hueplusplus.  If not, see <http://www.gnu.org/licenses/>.
 **/
 
-#ifndef _IHTTPHANDLER_H
-#define _IHTTPHANDLER_H
+#ifndef INCLUDE_HUEPLUSPLUS_IHTTPHANDLER_H
+#define INCLUDE_HUEPLUSPLUS_IHTTPHANDLER_H
 
 #include <iostream>
 #include <memory>
diff --git a/include/hueplusplus/LinHttpHandler.h b/include/hueplusplus/LinHttpHandler.h
index ed56c00..2a88380 100644
--- a/include/hueplusplus/LinHttpHandler.h
+++ b/include/hueplusplus/LinHttpHandler.h
@@ -20,8 +20,8 @@
     along with hueplusplus.  If not, see <http://www.gnu.org/licenses/>.
 **/
 
-#ifndef _LINHTTPHANDLER_H
-#define _LINHTTPHANDLER_H
+#ifndef INCLUDE_HUEPLUSPLUS_LINHTTPHANDLER_H
+#define INCLUDE_HUEPLUSPLUS_LINHTTPHANDLER_H
 
 #include <string>
 #include <vector>
diff --git a/include/hueplusplus/SimpleBrightnessStrategy.h b/include/hueplusplus/SimpleBrightnessStrategy.h
index 7c2cdce..85cc65b 100644
--- a/include/hueplusplus/SimpleBrightnessStrategy.h
+++ b/include/hueplusplus/SimpleBrightnessStrategy.h
@@ -20,8 +20,8 @@
     along with hueplusplus.  If not, see <http://www.gnu.org/licenses/>.
 **/
 
-#ifndef _SIMPLE_BRIGHTNESS_STRATEGY_H
-#define _SIMPLE_BRIGHTNESS_STRATEGY_H
+#ifndef INCLUDE_HUEPLUSPLUS_SIMPLE_BRIGHTNESS_STRATEGY_H
+#define INCLUDE_HUEPLUSPLUS_SIMPLE_BRIGHTNESS_STRATEGY_H
 
 #include "BrightnessStrategy.h"
 #include "HueLight.h"
diff --git a/include/hueplusplus/SimpleColorHueStrategy.h b/include/hueplusplus/SimpleColorHueStrategy.h
index ae7c378..61bd502 100644
--- a/include/hueplusplus/SimpleColorHueStrategy.h
+++ b/include/hueplusplus/SimpleColorHueStrategy.h
@@ -20,8 +20,8 @@
     along with hueplusplus.  If not, see <http://www.gnu.org/licenses/>.
 **/
 
-#ifndef _SIMPLE_COLOR_HUE_STRATEGY_H
-#define _SIMPLE_COLOR_HUE_STRATEGY_H
+#ifndef INCLUDE_HUEPLUSPLUS_SIMPLE_COLOR_HUE_STRATEGY_H
+#define INCLUDE_HUEPLUSPLUS_SIMPLE_COLOR_HUE_STRATEGY_H
 
 #include "ColorHueStrategy.h"
 #include "HueLight.h"
diff --git a/include/hueplusplus/SimpleColorTemperatureStrategy.h b/include/hueplusplus/SimpleColorTemperatureStrategy.h
index 40b40e1..13651aa 100644
--- a/include/hueplusplus/SimpleColorTemperatureStrategy.h
+++ b/include/hueplusplus/SimpleColorTemperatureStrategy.h
@@ -20,8 +20,8 @@
     along with hueplusplus.  If not, see <http://www.gnu.org/licenses/>.
 **/
 
-#ifndef _SIMPLE_COLOR_TEMPERATURE_STRATEGY_H
-#define _SIMPLE_COLOR_TEMPERATURE_STRATEGY_H
+#ifndef INCLUDE_HUEPLUSPLUS_SIMPLE_COLOR_TEMPERATURE_STRATEGY_H
+#define INCLUDE_HUEPLUSPLUS_SIMPLE_COLOR_TEMPERATURE_STRATEGY_H
 
 #include "ColorTemperatureStrategy.h"
 #include "HueLight.h"
diff --git a/include/hueplusplus/UPnP.h b/include/hueplusplus/UPnP.h
index 9754f7e..fbb796b 100644
--- a/include/hueplusplus/UPnP.h
+++ b/include/hueplusplus/UPnP.h
@@ -20,8 +20,8 @@
     along with hueplusplus.  If not, see <http://www.gnu.org/licenses/>.
 **/
 
-#ifndef _UPNP_H
-#define _UPNP_H
+#ifndef INCLUDE_HUEPLUSPLUS_UPNP_H
+#define INCLUDE_HUEPLUSPLUS_UPNP_H
 
 #include <memory>
 #include <string>
diff --git a/include/hueplusplus/Units.h b/include/hueplusplus/Units.h
index 4095fa3..af5f5a5 100644
--- a/include/hueplusplus/Units.h
+++ b/include/hueplusplus/Units.h
@@ -20,8 +20,8 @@
     along with hueplusplus.  If not, see <http://www.gnu.org/licenses/>.
 **/
 
-#ifndef _UNITS_H
-#define _UNITS_H
+#ifndef INCLUDE_HUEPLUSPLUS_UNITS_H
+#define INCLUDE_HUEPLUSPLUS_UNITS_H
 
 namespace hueplusplus
 {
diff --git a/include/hueplusplus/Utils.h b/include/hueplusplus/Utils.h
index 51eb85a..ca31d77 100644
--- a/include/hueplusplus/Utils.h
+++ b/include/hueplusplus/Utils.h
@@ -20,8 +20,8 @@
     along with hueplusplus.  If not, see <http://www.gnu.org/licenses/>.
 **/
 
-#ifndef _UTILS_H
-#define _UTILS_H
+#ifndef INCLUDE_HUEPLUSPLUS_UTILS_H
+#define INCLUDE_HUEPLUSPLUS_UTILS_H
 
 #include "json/json.hpp"
 
diff --git a/include/hueplusplus/WinHttpHandler.h b/include/hueplusplus/WinHttpHandler.h
index 12719b3..ec470f8 100644
--- a/include/hueplusplus/WinHttpHandler.h
+++ b/include/hueplusplus/WinHttpHandler.h
@@ -20,8 +20,8 @@
     along with hueplusplus.  If not, see <http://www.gnu.org/licenses/>.
 **/
 
-#ifndef _WINHTTPHANDLER_H
-#define _WINHTTPHANDLER_H
+#ifndef INCLUDE_HUEPLUSPLUS_WINHTTPHANDLER_H
+#define INCLUDE_HUEPLUSPLUS_WINHTTPHANDLER_H
 
 #include <string>
 #include <vector>
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d11944e..06b4800 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -2,14 +2,14 @@
 configure_file(CMakeLists.txt.in googletest-download/CMakeLists.txt)
 execute_process(COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} .
     RESULT_VARIABLE result
-    WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/test/googletest-download"
+    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/googletest-download"
 )
 if(result)
     message(FATAL_ERROR "CMake step for googletest failed: ${result}")
 endif()
 execute_process(COMMAND "${CMAKE_COMMAND}" --build .
     RESULT_VARIABLE result
-    WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/test/googletest-download"
+    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/googletest-download"
 )
 if(result)
     message(FATAL_ERROR "Build step for googletest failed: ${result}")
@@ -21,8 +21,8 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
 
 # Add googletest directly to our build. This defines
 # the gtest and gtest_main targets.
-add_subdirectory(${CMAKE_BINARY_DIR}/googletest-src EXCLUDE_FROM_ALL
-                 ${CMAKE_BINARY_DIR}/googletest-build EXCLUDE_FROM_ALL
+add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/googletest-src EXCLUDE_FROM_ALL
+                 ${CMAKE_CURRENT_BINARY_DIR}/googletest-build EXCLUDE_FROM_ALL
 )
 
 # define all test sources
diff --git a/test/CMakeLists.txt.in b/test/CMakeLists.txt.in
index 4c67ef5..c6247af 100644
--- a/test/CMakeLists.txt.in
+++ b/test/CMakeLists.txt.in
@@ -6,8 +6,8 @@ include(ExternalProject)
 ExternalProject_Add(googletest
   GIT_REPOSITORY    https://github.com/google/googletest.git
   GIT_TAG           master
-  SOURCE_DIR        "${CMAKE_BINARY_DIR}/googletest-src"
-  BINARY_DIR        "${CMAKE_BINARY_DIR}/googletest-build"
+  SOURCE_DIR        "${CMAKE_CURRENT_BINARY_DIR}/googletest-src"
+  BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/googletest-build"
   CONFIGURE_COMMAND ""
   BUILD_COMMAND     ""
   INSTALL_COMMAND   ""