diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a0b94b..b59c362 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ find_package(JsonCpp REQUIRED)
 include_directories(
 	${kodiplatform_INCLUDE_DIRS}
 	${p8-platform_INCLUDE_DIRS}
-	${KODI_INCLUDE_DIR}
+	${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways
 	${JSONCPP_INCLUDE_DIRS})
 
 set(DEPLIBS
diff --git a/src/Socket.cpp b/src/Socket.cpp
index 9f687a2..fec6bd9 100644
--- a/src/Socket.cpp
+++ b/src/Socket.cpp
@@ -16,7 +16,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "libXBMC_addon.h"
+#include "kodi/libXBMC_addon.h"
 #include <string>
 #include "p8-platform/os.h"
 #include "client.h"
diff --git a/src/client.cpp b/src/client.cpp
index f2e5a9e..e016711 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -21,10 +21,10 @@
  */
 
 #include "client.h"
-#include <xbmc_pvr_dll.h>
-#include <libXBMC_addon.h>
+#include <kodi/xbmc_pvr_dll.h>
+#include <kodi/libXBMC_addon.h>
 #include <p8-platform/util/util.h>
-#include <libKODI_guilib.h>
+#include <kodi/libKODI_guilib.h>
 
 #include "OctonetData.h"
 #include "rtsp_client.hpp"
diff --git a/src/client.h b/src/client.h
index 15f7177..ce9bdfd 100644
--- a/src/client.h
+++ b/src/client.h
@@ -21,8 +21,8 @@
  *
  */
 
-#include "libXBMC_addon.h"
-#include "libXBMC_pvr.h"
+#include "kodi/libXBMC_addon.h"
+#include "kodi/libXBMC_pvr.h"
 
 #ifndef __func__
 #define __func__ __FUNCTION__
diff --git a/src/rtsp_client.cpp b/src/rtsp_client.cpp
index e0123a9..fee28c0 100644
--- a/src/rtsp_client.cpp
+++ b/src/rtsp_client.cpp
@@ -5,7 +5,7 @@
 #include "Socket.h"
 #include "client.h"
 #include <p8-platform/util/util.h>
-#include <libXBMC_addon.h>
+#include <kodi/libXBMC_addon.h>
 #include <cstring>
 #include <sstream>
 
diff --git a/src/rtsp_client.hpp b/src/rtsp_client.hpp
index 04ced37..9538766 100644
--- a/src/rtsp_client.hpp
+++ b/src/rtsp_client.hpp
@@ -2,7 +2,7 @@
 #define _RTSP_CLIENT_HPP_
 
 #include <string>
-#include <xbmc_pvr_types.h>
+#include <kodi/xbmc_pvr_types.h>
 
 bool rtsp_open(const std::string& name, const std::string& url_str);
 void rtsp_close();