diff --git a/kompare/libkomparediff2/tests/CMakeLists.txt b/kompare/libkomparediff2/tests/CMakeLists.txt
index e28979fc..fe1b532c 100644
--- a/kompare/libkomparediff2/tests/CMakeLists.txt
+++ b/kompare/libkomparediff2/tests/CMakeLists.txt
@@ -1,4 +1,7 @@
-include_directories(..)
+include_directories(
+    ${CMAKE_CURRENT_BINARY_DIR}/..
+    ..
+)
 
 set(interactiveDiffTest_SRCS
     interactivedifftest.cpp
diff --git a/ksystemlog/CMakeLists.txt b/ksystemlog/CMakeLists.txt
index fdf6454a..10cd7ff8 100644
--- a/ksystemlog/CMakeLists.txt
+++ b/ksystemlog/CMakeLists.txt
@@ -14,6 +14,12 @@ include(CheckFunctionExists)
 include(CheckLibraryExists)
 include(CheckTypeSize)
 
+
+if(ENABLE_TESTING)
+    set(CMAKE_C_VISIBILITY_PRESET "default")
+    set(CMAKE_CXX_VISIBILITY_PRESET "default")
+endif()
+
 ########### Subfolders ##########
 
 add_subdirectory(src)
diff --git a/ksystemlog/tests/CMakeLists.txt b/ksystemlog/tests/CMakeLists.txt
index c6faeb2a..adcb5e27 100644
--- a/ksystemlog/tests/CMakeLists.txt
+++ b/ksystemlog/tests/CMakeLists.txt
@@ -1,10 +1,10 @@
 include_directories( 
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_SOURCE_DIR}/src
-    ${CMAKE_BINARY_DIR}/src
-    ${CMAKE_SOURCE_DIR}/src/lib
-    ${CMAKE_SOURCE_DIR}/src/modes/system
-    ${CMAKE_SOURCE_DIR}/src/modes/kernel
+    ${CMAKE_CURRENT_SOURCE_DIR}/../src
+    ${CMAKE_CURRENT_BINARY_DIR}/../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../src/lib
+    ${CMAKE_CURRENT_SOURCE_DIR}/../src/modes/system
+    ${CMAKE_CURRENT_SOURCE_DIR}/../src/modes/kernel
 )
 
 macro(ksystemlog_unit_tests)
diff --git a/libktorrent/src/datachecker/tests/datacheckertest.cpp b/libktorrent/src/datachecker/tests/datacheckertest.cpp
index c7c2b877..cabe0e1a 100644
--- a/libktorrent/src/datachecker/tests/datacheckertest.cpp
+++ b/libktorrent/src/datachecker/tests/datacheckertest.cpp
@@ -1,7 +1,6 @@
 #include <unistd.h>
 #include <time.h>
 
-#define QT_GUI_LIB
 #include <QtTest>
 #include <QEventLoop>
 #include <KLocale>
diff --git a/libktorrent/src/download/tests/streamingchunkselectortest.cpp b/libktorrent/src/download/tests/streamingchunkselectortest.cpp
index 41ccd338..e433c69f 100644
--- a/libktorrent/src/download/tests/streamingchunkselectortest.cpp
+++ b/libktorrent/src/download/tests/streamingchunkselectortest.cpp
@@ -1,5 +1,3 @@
-#define QT_GUI_LIB
-
 #include <time.h>
 #include <QtTest>
 #include <KGlobal>
diff --git a/libktorrent/src/torrent/tests/torrentfilestreammultitest.cpp b/libktorrent/src/torrent/tests/torrentfilestreammultitest.cpp
index 9a68509e..ec2bfc89 100644
--- a/libktorrent/src/torrent/tests/torrentfilestreammultitest.cpp
+++ b/libktorrent/src/torrent/tests/torrentfilestreammultitest.cpp
@@ -1,5 +1,3 @@
-#define QT_GUI_LIB
-
 #include <QtTest>
 #include <QObject>
 #include <QFile>
diff --git a/libktorrent/src/torrent/tests/torrentfilestreamtest.cpp b/libktorrent/src/torrent/tests/torrentfilestreamtest.cpp
index cdc0b15c..f8414031 100644
--- a/libktorrent/src/torrent/tests/torrentfilestreamtest.cpp
+++ b/libktorrent/src/torrent/tests/torrentfilestreamtest.cpp
@@ -1,5 +1,3 @@
-#define QT_GUI_LIB
-
 #include <QtTest>
 #include <QObject>
 #include <QFile>