diff --git a/private/qtjolie-branch/CMakeLists.txt b/private/qtjolie-branch/CMakeLists.txt
index f305800c0..42903d76f 100644
--- a/private/qtjolie-branch/CMakeLists.txt
+++ b/private/qtjolie-branch/CMakeLists.txt
@@ -3,7 +3,8 @@ include(KDE4Defaults)
 include(MacroLibrary)
 
 add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES})
+#include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDES})
 
 add_subdirectory(qtjolie)
+add_subdirectory(includes)
 add_subdirectory(tests)
diff --git a/private/qtjolie-branch/includes/CMakeLists.txt b/private/qtjolie-branch/includes/CMakeLists.txt
new file mode 100644
index 000000000..a6bc7917d
--- /dev/null
+++ b/private/qtjolie-branch/includes/CMakeLists.txt
@@ -0,0 +1,7 @@
+install( FILES
+  QtJolie/Client
+  QtJolie/Fault
+  QtJolie/Message
+  QtJolie/PendingCall
+  QtJolie/Value
+DESTINATION ${INCLUDE_INSTALL_DIR}/QtJolie COMPONENT Devel)
diff --git a/private/qtjolie-branch/includes/QtJolie/Client b/private/qtjolie-branch/includes/QtJolie/Client
new file mode 100644
index 000000000..423574dd7
--- /dev/null
+++ b/private/qtjolie-branch/includes/QtJolie/Client
@@ -0,0 +1,2 @@
+#include "../qtjolie/client.h"
+
diff --git a/private/qtjolie-branch/includes/QtJolie/Fault b/private/qtjolie-branch/includes/QtJolie/Fault
new file mode 100644
index 000000000..a1136b43c
--- /dev/null
+++ b/private/qtjolie-branch/includes/QtJolie/Fault
@@ -0,0 +1,2 @@
+#include "../qtjolie/fault.h"
+
diff --git a/private/qtjolie-branch/includes/QtJolie/Message b/private/qtjolie-branch/includes/QtJolie/Message
new file mode 100644
index 000000000..f85c032d0
--- /dev/null
+++ b/private/qtjolie-branch/includes/QtJolie/Message
@@ -0,0 +1,2 @@
+#include "../qtjolie/message.h"
+
diff --git a/private/qtjolie-branch/includes/QtJolie/PendingCall b/private/qtjolie-branch/includes/QtJolie/PendingCall
new file mode 100644
index 000000000..efa110fb5
--- /dev/null
+++ b/private/qtjolie-branch/includes/QtJolie/PendingCall
@@ -0,0 +1,2 @@
+#include "../qtjolie/pendingcall.h"
+
diff --git a/private/qtjolie-branch/includes/QtJolie/Value b/private/qtjolie-branch/includes/QtJolie/Value
new file mode 100644
index 000000000..87fe9e211
--- /dev/null
+++ b/private/qtjolie-branch/includes/QtJolie/Value
@@ -0,0 +1,2 @@
+#include "../qtjolie/value.h"
+
diff --git a/private/qtjolie-branch/qtjolie/CMakeLists.txt b/private/qtjolie-branch/qtjolie/CMakeLists.txt
index 16d0f877e..5cd47de90 100644
--- a/private/qtjolie-branch/qtjolie/CMakeLists.txt
+++ b/private/qtjolie-branch/qtjolie/CMakeLists.txt
@@ -1,6 +1,7 @@
 project(QtJolie)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+                    ${CMAKE_CURRENT_SOURCE_DIR}/../
                     ${CMAKE_CURRENT_BINARY_DIR}
                     ${QT_INCLUDE_DIR})
 
diff --git a/private/qtjolie-branch/tests/CMakeLists.txt b/private/qtjolie-branch/tests/CMakeLists.txt
index b9a52d695..aef783ebd 100644
--- a/private/qtjolie-branch/tests/CMakeLists.txt
+++ b/private/qtjolie-branch/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../)
+include_directories(${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../includes ${CMAKE_CURRENT_SOURCE_DIR}/../)
 
 MACRO(SODEP_UNIT_TESTS)
   FOREACH(_testname ${ARGN})
diff --git a/private/qtjolie-branch/tests/testfault.cpp b/private/qtjolie-branch/tests/testfault.cpp
index 93c84332d..a2ee8bddd 100644
--- a/private/qtjolie-branch/tests/testfault.cpp
+++ b/private/qtjolie-branch/tests/testfault.cpp
@@ -21,7 +21,7 @@
 #include <QtCore/QObject>
 #include <QtTest/QtTest>
 
-#include <qtjolie/fault.h>
+#include <QtJolie/Fault>
 #include "testhelpers.h"
 
 using namespace Jolie;
diff --git a/private/qtjolie-branch/tests/testhelpers.h b/private/qtjolie-branch/tests/testhelpers.h
index 2cf3a6ae2..3cd305e5b 100644
--- a/private/qtjolie-branch/tests/testhelpers.h
+++ b/private/qtjolie-branch/tests/testhelpers.h
@@ -23,10 +23,10 @@
 
 #include <QtTest/QtTest>
 
-#include <qtjolie/fault.h>
-#include <qtjolie/message.h>
-#include <qtjolie/value.h>
-#include <qtjolie/sodephelpers_p.h>
+#include <QtJolie/Fault>
+#include <QtJolie/Message>
+#include <QtJolie/Value>
+#include "../qtjolie/sodephelpers_p.h"
 
 Q_DECLARE_METATYPE(Jolie::Value);
 
diff --git a/private/qtjolie-branch/tests/testmessage.cpp b/private/qtjolie-branch/tests/testmessage.cpp
index 744ca40e1..53c88cf2d 100644
--- a/private/qtjolie-branch/tests/testmessage.cpp
+++ b/private/qtjolie-branch/tests/testmessage.cpp
@@ -21,7 +21,7 @@
 #include <QtCore/QObject>
 #include <QtTest/QtTest>
 
-#include <qtjolie/message.h>
+#include <QtJolie/Message>
 #include "testhelpers.h"
 
 using namespace Jolie;
diff --git a/private/qtjolie-branch/tests/testmetaservice.cpp b/private/qtjolie-branch/tests/testmetaservice.cpp
index f5f4064d4..51dec2e3d 100644
--- a/private/qtjolie-branch/tests/testmetaservice.cpp
+++ b/private/qtjolie-branch/tests/testmetaservice.cpp
@@ -22,9 +22,9 @@
 #include <QtCore/QProcess>
 #include <QtTest/QtTest>
 
-#include <qtjolie/client.h>
-#include <qtjolie/message.h>
-#include <qtjolie/pendingcall.h>
+#include <QtJolie/Client>
+#include <QtJolie/Message>
+#include <QtJolie/PendingCall>
 #include "testhelpers.h"
 
 #ifndef DATA_DIR
diff --git a/private/qtjolie-branch/tests/testprinter.cpp b/private/qtjolie-branch/tests/testprinter.cpp
index 69e1b5b0d..ac21673c0 100644
--- a/private/qtjolie-branch/tests/testprinter.cpp
+++ b/private/qtjolie-branch/tests/testprinter.cpp
@@ -25,9 +25,9 @@
 #include <QtGui/QPushButton>
 #include <QtNetwork/QTcpSocket>
 
-#include <qtjolie/message.h>
-#include <qtjolie/value.h>
-#include <qtjolie/sodephelpers_p.h>
+#include <QtJolie/Message>
+#include <QtJolie/Value>
+#include "../qtjolie/sodephelpers_p.h"
 
 using namespace Jolie;
 
diff --git a/private/qtjolie-branch/tests/testvalue.cpp b/private/qtjolie-branch/tests/testvalue.cpp
index 217ae5383..9efff2a86 100644
--- a/private/qtjolie-branch/tests/testvalue.cpp
+++ b/private/qtjolie-branch/tests/testvalue.cpp
@@ -21,7 +21,7 @@
 #include <QtCore/QObject>
 #include <QtTest/QtTest>
 
-#include <qtjolie/value.h>
+#include <QtJolie/Value>
 
 #include "testhelpers.h"