diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index bfb2af0..482771d 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -1,9 +1,5 @@
 cmake_minimum_required(VERSION 3.6)
 
-set(CMAKE_CXX_STANDARD 11)
-
-add_definitions(-DRPI)
-
 add_subdirectory(RCSwitch)
 add_subdirectory(sniffer)
 add_subdirectory(qsniff)
diff --git a/source/RCSwitch/CMakeLists.txt b/source/RCSwitch/CMakeLists.txt
index 0834e87..09322a5 100644
--- a/source/RCSwitch/CMakeLists.txt
+++ b/source/RCSwitch/CMakeLists.txt
@@ -11,6 +11,11 @@ target_link_libraries(${PROJECT_NAME}
 )
 
 target_include_directories(${PROJECT_NAME}
-	PUBLIC .
+	PUBLIC rc-switch
 )
 
+target_compile_definitions(${PROJECT_NAME}
+	PUBLIC RPI
+)
+
+
diff --git a/source/sniffer/sniffer.h b/source/sniffer/sniffer.h
index 8b2747a..16e9dc0 100644
--- a/source/sniffer/sniffer.h
+++ b/source/sniffer/sniffer.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "rc-switch/RCSwitch.h"
+#include "RCSwitch.h"
 
 class Sniffer
 {