diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index b14c4a767..943649f64 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -1117,6 +1117,10 @@ jobs:
           create-dmg
           taglib
 
+      - name: Delete conflicting taglib system headers
+        shell: bash
+        run: rm -rf /usr/local/include/taglib
+
       - name: Create Build Environment
         shell: bash
         run: cmake -E make_directory build
@@ -1129,7 +1133,7 @@ jobs:
           GST_SCANNER_PATH: /usr/local/opt/gstreamer/libexec/gstreamer-1.0/gst-plugin-scanner
           GST_PLUGIN_PATH: /usr/local/lib/gstreamer-1.0
         working-directory: build
-        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DUSE_BUNDLE=ON -DUSE_SYSTEM_TAGLIB=ON
+        run: cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DUSE_BUNDLE=ON -DUSE_SYSTEM_TAGLIB=OFF
       - name: Build
         working-directory: build
         shell: bash
diff --git a/.travis.yml b/.travis.yml
index 45abeea42..8747102bc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ before_install:
     fi
 before_script:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker exec build cmake -Hstrawberry -Bbuild ; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir build; cd build; cmake .. -DUSE_BUNDLE=ON -DUSE_SYSTEM_TAGLIB=ON ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then mkdir build; cd build; cmake .. -DUSE_BUNDLE=ON -DUSE_SYSTEM_TAGLIB=OFF ; fi
 script:
 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker exec build make -C build -j8 ; fi
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
diff --git a/3rdparty/singleapplication/CMakeLists.txt b/3rdparty/singleapplication/CMakeLists.txt
index 7ef92b01b..32171d99f 100644
--- a/3rdparty/singleapplication/CMakeLists.txt
+++ b/3rdparty/singleapplication/CMakeLists.txt
@@ -12,14 +12,32 @@ set(SINGLEAPP-SOURCES singleapplication.cpp singleapplication_p.cpp)
 set(SINGLEAPP-MOC-HEADERS singleapplication.h singleapplication_p.h)
 QT5_WRAP_CPP(SINGLEAPP-SOURCES-MOC ${SINGLEAPP-MOC-HEADERS})
 add_library(singleapplication STATIC ${SINGLEAPP-SOURCES} ${SINGLEAPP-SOURCES-MOC})
-target_link_libraries(singleapplication Qt5::Core Qt5::Widgets Qt5::Network)
+target_include_directories(singleapplication PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${Qt5Core_INCLUDE_DIRS}
+  ${Qt5Widgets_INCLUDE_DIRS}
+  ${Qt5Network_INCLUDE_DIRS}
+)
+target_link_libraries(singleapplication PRIVATE
+  ${Qt5Core_LIBRARIES}
+  ${Qt5Widgets_LIBRARIES}
+  ${Qt5Network_LIBRARIES}
+)
 
 set(SINGLECOREAPP-SOURCES singlecoreapplication.cpp singlecoreapplication_p.cpp)
 set(SINGLECOREAPP-MOC-HEADERS singlecoreapplication.h singlecoreapplication_p.h)
 QT5_WRAP_CPP(SINGLECOREAPP-SOURCES-MOC ${SINGLECOREAPP-MOC-HEADERS})
 add_library(singlecoreapplication STATIC ${SINGLECOREAPP-SOURCES} ${SINGLECOREAPP-SOURCES-MOC})
-target_link_libraries(singlecoreapplication Qt5::Core Qt5::Widgets Qt5::Network)
+target_include_directories(singlecoreapplication PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${Qt5Core_INCLUDE_DIRS}
+  ${Qt5Network_INCLUDE_DIRS}
+)
+target_link_libraries(singlecoreapplication PRIVATE
+  ${Qt5Core_LIBRARIES}
+  ${Qt5Network_LIBRARIES}
+)
 
 configure_file(config.h.in "${CMAKE_CURRENT_BINARY_DIR}/config.h")
-
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
diff --git a/3rdparty/taglib/CMakeLists.txt b/3rdparty/taglib/CMakeLists.txt
index 9eeda3bd1..39d10106f 100644
--- a/3rdparty/taglib/CMakeLists.txt
+++ b/3rdparty/taglib/CMakeLists.txt
@@ -19,54 +19,15 @@ endif()
 
 include(ConfigureChecks.cmake)
 configure_file(config.h.cmake "${CMAKE_CURRENT_BINARY_DIR}/config.h")
-configure_file(taglib_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/taglib_config.h)
 
 add_definitions(-DHAVE_CONFIG_H)
 add_definitions(-DTAGLIB_STATIC)
 
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}/toolkit
-  ${CMAKE_CURRENT_SOURCE_DIR}/asf
-  ${CMAKE_CURRENT_SOURCE_DIR}/mpeg
-  ${CMAKE_CURRENT_SOURCE_DIR}/ogg
-  ${CMAKE_CURRENT_SOURCE_DIR}/ogg/flac
-  ${CMAKE_CURRENT_SOURCE_DIR}/flac
-  ${CMAKE_CURRENT_SOURCE_DIR}/mpc
-  ${CMAKE_CURRENT_SOURCE_DIR}/mp4
-  ${CMAKE_CURRENT_SOURCE_DIR}/ogg/vorbis
-  ${CMAKE_CURRENT_SOURCE_DIR}/ogg/speex
-  ${CMAKE_CURRENT_SOURCE_DIR}/ogg/opus
-  ${CMAKE_CURRENT_SOURCE_DIR}/mpeg/id3v2
-  ${CMAKE_CURRENT_SOURCE_DIR}/mpeg/id3v2/frames
-  ${CMAKE_CURRENT_SOURCE_DIR}/mpeg/id3v1
-  ${CMAKE_CURRENT_SOURCE_DIR}/ape
-  ${CMAKE_CURRENT_SOURCE_DIR}/wavpack
-  ${CMAKE_CURRENT_SOURCE_DIR}/trueaudio
-  ${CMAKE_CURRENT_SOURCE_DIR}/riff
-  ${CMAKE_CURRENT_SOURCE_DIR}/riff/aiff
-  ${CMAKE_CURRENT_SOURCE_DIR}/riff/wav
-  ${CMAKE_CURRENT_SOURCE_DIR}/mod
-  ${CMAKE_CURRENT_SOURCE_DIR}/s3m
-  ${CMAKE_CURRENT_SOURCE_DIR}/it
-  ${CMAKE_CURRENT_SOURCE_DIR}/xm
-  ${CMAKE_CURRENT_SOURCE_DIR}/dsf
-  ${CMAKE_CURRENT_SOURCE_DIR}/dsdiff
-  ${CMAKE_SOURCE_DIR}/3rdparty
-)
-
-if(ZLIB_FOUND)
-  include_directories(${ZLIB_INCLUDE_DIR})
-elseif(HAVE_ZLIB_SOURCE)
-  include_directories(${ZLIB_SOURCE})
-endif()
-
 set(tag_HDRS
   tag.h
   fileref.h
   audioproperties.h
   taglib_export.h
-  ${CMAKE_CURRENT_BINARY_DIR}/taglib_config.h
   toolkit/taglib.h
   toolkit/tstring.h
   toolkit/tlist.h
@@ -354,22 +315,32 @@ set(toolkit_SRCS
   toolkit/tzlib.cpp
 )
 
-if(HAVE_ZLIB_SOURCE)
-  set(zlib_SRCS
-    ${ZLIB_SOURCE}/adler32.c
-    ${ZLIB_SOURCE}/crc32.c
-    ${ZLIB_SOURCE}/inffast.c
-    ${ZLIB_SOURCE}/inflate.c
-    ${ZLIB_SOURCE}/inftrees.c
-    ${ZLIB_SOURCE}/zutil.c
-  )
-endif()
-
 set(tag_LIB_SRCS
-  ${mpeg_SRCS} ${id3v1_SRCS} ${id3v2_SRCS} ${frames_SRCS} ${ogg_SRCS}
-  ${vorbis_SRCS} ${oggflacs_SRCS} ${mpc_SRCS} ${ape_SRCS} ${toolkit_SRCS} ${flacs_SRCS}
-  ${wavpack_SRCS} ${speex_SRCS} ${trueaudio_SRCS} ${riff_SRCS} ${aiff_SRCS} ${wav_SRCS}
-  ${asf_SRCS} ${mp4_SRCS} ${mod_SRCS} ${s3m_SRCS} ${it_SRCS} ${xm_SRCS} ${opus_SRCS} ${dsf_SRCS} ${dsdiff_SRCS}
+  ${mpeg_SRCS}
+  ${id3v1_SRCS}
+  ${id3v2_SRCS}
+  ${frames_SRCS}
+  ${ogg_SRCS}
+  ${vorbis_SRCS}
+  ${oggflacs_SRCS}
+  ${mpc_SRCS}
+  ${ape_SRCS}
+  ${toolkit_SRCS}
+  ${flacs_SRCS}
+  ${wavpack_SRCS}
+  ${speex_SRCS}
+  ${trueaudio_SRCS}
+  ${riff_SRCS}
+  ${aiff_SRCS} ${wav_SRCS}
+  ${asf_SRCS}
+  ${mp4_SRCS}
+  ${mod_SRCS}
+  ${s3m_SRCS}
+  ${it_SRCS}
+  ${xm_SRCS}
+  ${opus_SRCS}
+  ${dsf_SRCS}
+  ${dsdiff_SRCS}
   ${zlib_SRCS}
   tag.cpp
   tagunion.cpp
@@ -380,9 +351,40 @@ set(tag_LIB_SRCS
 
 add_library(tag STATIC ${tag_LIB_SRCS} ${tag_HDRS})
 
-if(HAVE_ZLIB AND NOT HAVE_ZLIB_SOURCE)
-  target_link_libraries(tag ${ZLIB_LIBRARIES})
-endif()
+target_include_directories(tag PRIVATE
+  ${ZLIB_INCLUDE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}/toolkit
+  ${CMAKE_CURRENT_SOURCE_DIR}/asf
+  ${CMAKE_CURRENT_SOURCE_DIR}/mpeg
+  ${CMAKE_CURRENT_SOURCE_DIR}/ogg
+  ${CMAKE_CURRENT_SOURCE_DIR}/ogg/flac
+  ${CMAKE_CURRENT_SOURCE_DIR}/flac
+  ${CMAKE_CURRENT_SOURCE_DIR}/mpc
+  ${CMAKE_CURRENT_SOURCE_DIR}/mp4
+  ${CMAKE_CURRENT_SOURCE_DIR}/ogg/vorbis
+  ${CMAKE_CURRENT_SOURCE_DIR}/ogg/speex
+  ${CMAKE_CURRENT_SOURCE_DIR}/ogg/opus
+  ${CMAKE_CURRENT_SOURCE_DIR}/mpeg/id3v2
+  ${CMAKE_CURRENT_SOURCE_DIR}/mpeg/id3v2/frames
+  ${CMAKE_CURRENT_SOURCE_DIR}/mpeg/id3v1
+  ${CMAKE_CURRENT_SOURCE_DIR}/ape
+  ${CMAKE_CURRENT_SOURCE_DIR}/wavpack
+  ${CMAKE_CURRENT_SOURCE_DIR}/trueaudio
+  ${CMAKE_CURRENT_SOURCE_DIR}/riff
+  ${CMAKE_CURRENT_SOURCE_DIR}/riff/aiff
+  ${CMAKE_CURRENT_SOURCE_DIR}/riff/wav
+  ${CMAKE_CURRENT_SOURCE_DIR}/mod
+  ${CMAKE_CURRENT_SOURCE_DIR}/s3m
+  ${CMAKE_CURRENT_SOURCE_DIR}/it
+  ${CMAKE_CURRENT_SOURCE_DIR}/xm
+  ${CMAKE_CURRENT_SOURCE_DIR}/dsf
+  ${CMAKE_CURRENT_SOURCE_DIR}/dsdiff
+  ${CMAKE_SOURCE_DIR}/3rdparty
+)
+
+target_link_libraries(tag PRIVATE ${ZLIB_LIBRARIES})
 
 set_target_properties(tag PROPERTIES
   VERSION ${TAGLIB_SOVERSION_MAJOR}.${TAGLIB_SOVERSION_MINOR}.${TAGLIB_SOVERSION_PATCH}
@@ -399,4 +401,3 @@ foreach(header ${tag_HDRS})
     COPYONLY
   )
 endforeach()
-
diff --git a/3rdparty/taglib/taglib_config.h.cmake b/3rdparty/taglib/taglib_config.h.cmake
deleted file mode 100644
index 179953f13..000000000
--- a/3rdparty/taglib/taglib_config.h.cmake
+++ /dev/null
@@ -1,6 +0,0 @@
-/* taglib_config.h. Generated by cmake from taglib_config.h.cmake */
-
-#ifndef TAGLIB_TAGLIB_CONFIG_H
-#define TAGLIB_TAGLIB_CONFIG_H
-
-#endif
diff --git a/3rdparty/taglib/toolkit/taglib.h b/3rdparty/taglib/toolkit/taglib.h
index 3f70fd1ea..6a004c66c 100644
--- a/3rdparty/taglib/toolkit/taglib.h
+++ b/3rdparty/taglib/toolkit/taglib.h
@@ -26,8 +26,6 @@
 #ifndef TAGLIB_H
 #define TAGLIB_H
 
-#include "taglib_config.h"
-
 #define TAGLIB_MAJOR_VERSION 1
 #define TAGLIB_MINOR_VERSION 11
 #define TAGLIB_PATCH_VERSION 1
diff --git a/3rdparty/utf8-cpp/CMakeLists.txt b/3rdparty/utf8-cpp/CMakeLists.txt
index e438780c8..b7575fe4e 100644
--- a/3rdparty/utf8-cpp/CMakeLists.txt
+++ b/3rdparty/utf8-cpp/CMakeLists.txt
@@ -1,2 +1,2 @@
-cmake_minimum_required(VERSION 2.8.11)
+cmake_minimum_required(VERSION 3.0)
 set(CMAKE_CXX_STANDARD 11)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c10340d2..6b5c9276b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,8 +110,8 @@ if(X11_FOUND)
   set(HAVE_X11 ON)
 endif()
 pkg_check_modules(GLIB REQUIRED glib-2.0)
-pkg_check_modules(GIO REQUIRED gio-2.0)
 pkg_check_modules(GOBJECT REQUIRED gobject-2.0)
+pkg_check_modules(GIO REQUIRED gio-2.0)
 pkg_check_modules(LIBCDIO libcdio)
 pkg_check_modules(GSTREAMER gstreamer-1.0)
 pkg_check_modules(GSTREAMER_BASE gstreamer-base-1.0)
@@ -152,19 +152,24 @@ endif()
 find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS ${QT_COMPONENTS})
 
 set(QT_LIBRARIES ${Qt5Core_LIBRARIES} ${Qt5Concurrent_LIBRARIES} ${Qt5Widgets_LIBRARIES} ${Qt5Network_LIBRARIES} ${Qt5Sql_LIBRARIES})
+set(QT_INCLUDE_DIRS ${Qt5Core_INCLUDE_DIRS} ${Qt5Concurrent_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5Sql_INCLUDE_DIRS})
 
 if(Qt5DBus_FOUND)
   list(APPEND QT_LIBRARIES ${Qt5DBus_LIBRARIES})
+  list(APPEND QT_INCLUDE_DIRS ${Qt5DBus_INCLUDE_DIRS})
   get_target_property(QT_DBUSXML2CPP_EXECUTABLE Qt5::qdbusxml2cpp LOCATION)
 endif()
 if(Qt5X11Extras_FOUND)
   list(APPEND QT_LIBRARIES ${Qt5X11Extras_LIBRARIES})
+  list(APPEND QT_INCLUDE_DIRS ${Qt5X11Extras_INCLUDE_DIRS})
 endif()
 if(Qt5MacExtras_FOUND)
   list(APPEND QT_LIBRARIES ${Qt5MacExtras_LIBRARIES})
+  list(APPEND QT_INCLUDE_DIRS ${Qt5MacExtras_INCLUDE_DIRS})
 endif()
 if(Qt5WinExtras_FOUND)
   list(APPEND QT_LIBRARIES ${Qt5WinExtras_LIBRARIES})
+  list(APPEND QT_INCLUDE_DIRS ${Qt5WinExtras_INCLUDE_DIRS})
 endif()
 
 find_package(Qt5 ${QT_MIN_VERSION} QUIET COMPONENTS LinguistTools CONFIG)
diff --git a/ext/gstmoodbar/CMakeLists.txt b/ext/gstmoodbar/CMakeLists.txt
index d15ba7a0c..a06d7d327 100644
--- a/ext/gstmoodbar/CMakeLists.txt
+++ b/ext/gstmoodbar/CMakeLists.txt
@@ -1,23 +1,36 @@
 cmake_minimum_required(VERSION 3.0)
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${GLIB_INCLUDE_DIRS})
-include_directories(${GOBJECT_INCLUDE_DIRS})
-include_directories(${GSTREAMER_INCLUDE_DIRS})
-include_directories(${GSTREAMER_AUDIO_INCLUDE_DIRS})
-include_directories(${FFTW3_INCLUDE_DIR})
-
 set(SOURCES gstfastspectrum.cpp gstmoodbarplugin.cpp)
 
-add_library(gstmoodbar STATIC ${SOURCES})
-
-target_link_libraries(gstmoodbar
-  ${GOBJECT_LIBRARIES}
-  ${GLIB_LIBRARIES}
-  ${GSTREAMER_LIBRARIES}
-  ${GSTREAMER_AUDIO_LIBRARIES}
-  ${GSTREAMER_BASE_LIBRARIES}
-  ${FFTW3_FFTW_LIBRARY}
+link_directories(
+  ${GLIB_LIBRARY_DIRS}
+  ${GOBJECT_LIBRARY_DIRS}
+  ${GSTREAMER_LIBRARY_DIRS}
+  ${GSTREAMER_BASE_LIBRARY_DIRS}
+  ${GSTREAMER_AUDIO_LIBRARY_DIRS}
+  ${FFTW3_LIBRARY_DIRS}
+  ${Qt5Core_LIBRARY_DIRS}
 )
 
-target_link_libraries(gstmoodbar Qt5::Core)
+add_library(gstmoodbar STATIC ${SOURCES})
+
+target_include_directories(gstmoodbar PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${GLIB_INCLUDE_DIRS}
+  ${GOBJECT_INCLUDE_DIRS}
+  ${GSTREAMER_INCLUDE_DIRS}
+  ${GSTREAMER_BASE_INCLUDE_DIRS}
+  ${GSTREAMER_AUDIO_INCLUDE_DIRS}
+  ${FFTW3_INCLUDE_DIR}
+  ${Qt5Core_INCLUDE_DIRS}
+)
+
+target_link_libraries(gstmoodbar PRIVATE
+  ${GLIB_LIBRARIES}
+  ${GOBJECT_LIBRARIES}
+  ${GSTREAMER_LIBRARIES}
+  ${GSTREAMER_BASE_LIBRARIES}
+  ${GSTREAMER_AUDIO_LIBRARIES}
+  ${FFTW3_FFTW_LIBRARY}
+  ${Qt5Core_LIBRARIES}
+)
diff --git a/ext/libstrawberry-common/CMakeLists.txt b/ext/libstrawberry-common/CMakeLists.txt
index 7e50a1ee2..4ea7ad919 100644
--- a/ext/libstrawberry-common/CMakeLists.txt
+++ b/ext/libstrawberry-common/CMakeLists.txt
@@ -1,20 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-include_directories(${CMAKE_SOURCE_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/src)
-include_directories(${CMAKE_BINARY_DIR}/src)
-
-if (Backtrace_FOUND)
-  include_directories(${Backtrace_INCLUDE_DIRS})
-endif(Backtrace_FOUND)
-
-include_directories(${GLIB_INCLUDE_DIRS})
-include_directories(${GLIBCONFIG_INCLUDE_DIRS})
-include_directories(${PROTOBUF_INCLUDE_DIRS})
-
 set(SOURCES
   core/closure.cpp
   core/logging.cpp
@@ -37,11 +22,32 @@ endif(APPLE)
 
 qt5_wrap_cpp(MOC ${HEADERS})
 
+link_directories(
+  ${GLIB_LIBRARY_DIRS}
+  ${Qt5Core_LIBRARY_DIRS}
+  ${Qt5Network_LIBRARY_DIRS}
+)
+
 add_library(libstrawberry-common STATIC ${SOURCES} ${MOC})
 
-if(Backtrace_FOUND)
-  target_link_libraries(libstrawberry-common ${Backtrace_LIBRARIES})
-endif(Backtrace_FOUND)
+target_include_directories(libstrawberry-common PRIVATE
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+  ${GLIB_INCLUDE_DIRS}
+  ${Qt5Core_INCLUDE_DIRS}
+  ${Qt5Network_INCLUDE_DIRS}
+)
 
-target_link_libraries(libstrawberry-common ${TAGLIB_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
-target_link_libraries(libstrawberry-common Qt5::Core Qt5::Network)
+target_link_libraries(libstrawberry-common PRIVATE
+  ${CMAKE_THREAD_LIBS_INIT}
+  ${GLIB_LIBRARIES}
+  ${Qt5Core_LIBRARIES}
+  ${Qt5Network_LIBRARIES}
+)
+
+if(Backtrace_FOUND)
+  target_include_directories(libstrawberry-common PRIVATE ${Backtrace_INCLUDE_DIRS})
+  target_link_libraries(libstrawberry-common PRIVATE ${Backtrace_LIBRARIES})
+endif(Backtrace_FOUND)
diff --git a/ext/libstrawberry-tagreader/CMakeLists.txt b/ext/libstrawberry-tagreader/CMakeLists.txt
index 7d1722d26..5f3a4f98b 100644
--- a/ext/libstrawberry-tagreader/CMakeLists.txt
+++ b/ext/libstrawberry-tagreader/CMakeLists.txt
@@ -1,21 +1,36 @@
 cmake_minimum_required(VERSION 3.0)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/ext/libstrawberry-common)
-include_directories(${CMAKE_SOURCE_DIR}/src)
-include_directories(${CMAKE_BINARY_DIR}/src)
-
-link_directories(${PROTOBUF_LIBRARY_DIRS})
-include_directories(${PROTOBUF_INCLUDE_DIRS})
-
-link_directories(${TAGLIB_LIBRARY_DIRS})
-include_directories(${TAGLIB_INCLUDE_DIRS})
-
 set(MESSAGES tagreadermessages.proto)
 set(SOURCES fmpsparser.cpp tagreader.cpp)
 
 protobuf_generate_cpp(PROTO_SOURCES PROTO_HEADERS ${MESSAGES})
 
+link_directories(
+  ${GLIB_LIBRARY_DIRS}
+  ${PROTOBUF_LIBRARY_DIRS}
+  ${TAGLIB_LIBRARY_DIRS}
+  ${Qt5Core_LIBRARY_DIRS}
+)
+
 add_library(libstrawberry-tagreader STATIC ${PROTO_SOURCES} ${SOURCES})
-target_link_libraries(libstrawberry-tagreader ${PROTOBUF_LIBRARY} libstrawberry-common)
+
+target_include_directories(libstrawberry-tagreader PRIVATE
+  ${GLIB_INCLUDE_DIRS}
+  ${PROTOBUF_INCLUDE_DIRS}
+  ${TAGLIB_INCLUDE_DIRS}
+  ${Qt5Core_INCLUDE_DIRS}
+  ${Qt5Network_INCLUDE_DIRS}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/ext/libstrawberry-common
+  ${CMAKE_SOURCE_DIR}/src
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(libstrawberry-tagreader PRIVATE
+  ${GLIB_LIBRARIES}
+  ${PROTOBUF_LIBRARY}
+  ${TAGLIB_LIBRARIES}
+  ${Qt5Core_LIBRARIES}
+  libstrawberry-common
+)
diff --git a/ext/libstrawberry-tagreader/tagreader.cpp b/ext/libstrawberry-tagreader/tagreader.cpp
index 24673117c..490e21e87 100644
--- a/ext/libstrawberry-tagreader/tagreader.cpp
+++ b/ext/libstrawberry-tagreader/tagreader.cpp
@@ -26,7 +26,6 @@
 #include <sys/stat.h>
 
 #include <taglib/taglib.h>
-#include <taglib/taglib_config.h>
 #include <taglib/fileref.h>
 #include <taglib/tbytevector.h>
 #include <taglib/tfile.h>
diff --git a/ext/strawberry-tagreader/CMakeLists.txt b/ext/strawberry-tagreader/CMakeLists.txt
index d8c062cda..a86d4f718 100644
--- a/ext/strawberry-tagreader/CMakeLists.txt
+++ b/ext/strawberry-tagreader/CMakeLists.txt
@@ -1,19 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
 
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/ext/libstrawberry-common)
-include_directories(${CMAKE_SOURCE_DIR}/ext/libstrawberry-tagreader)
-include_directories(${CMAKE_BINARY_DIR}/ext/libstrawberry-tagreader)
-include_directories(${CMAKE_SOURCE_DIR}/src)
-include_directories(${CMAKE_BINARY_DIR}/src)
-
-link_directories(${PROTOBUF_LIBRARY_DIRS})
-include_directories(${PROTOBUF_INCLUDE_DIRS})
-
-link_directories(${TAGLIB_LIBRARY_DIRS})
-include_directories(${TAGLIB_INCLUDE_DIRS})
-
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
 
 set(SOURCES main.cpp tagreaderworker.cpp)
@@ -21,22 +7,42 @@ set(SOURCES main.cpp tagreaderworker.cpp)
 qt5_wrap_cpp(MOC ${HEADERS})
 qt5_add_resources(QRC data/data.qrc)
 
+link_directories(
+  ${GLIB_LIBRARY_DIRS}
+  ${TAGLIB_LIBRARY_DIRS}
+  ${Qt5Core_LIBRARY_DIRS}
+  ${Qt5Network_LIBRARY_DIRS}
+)
+
 add_executable(strawberry-tagreader ${SOURCES} ${MOC} ${QRC})
 
-target_link_libraries(strawberry-tagreader
+target_include_directories(strawberry-tagreader PRIVATE
+  ${GLIB_INCLUDE_DIRS}
+  ${PROTOBUF_INCLUDE_DIRS}
+  ${TAGLIB_INCLUDE_DIRS}
+  ${Qt5Core_INCLUDE_DIRS}
+  ${Qt5Network_INCLUDE_DIRS}
+  ${CMAKE_SOURCE_DIR}/ext/libstrawberry-common
+  ${CMAKE_SOURCE_DIR}/ext/libstrawberry-tagreader
+  ${CMAKE_BINARY_DIR}/ext/libstrawberry-tagreader
+  ${CMAKE_BINARY_DIR}/src
+)
+
+target_link_libraries(strawberry-tagreader PRIVATE
+  ${GLIB_LIBRARIES}
   ${TAGLIB_LIBRARIES}
-  ${QT_QTCORE_LIBRARY}
-  ${QT_QTNETWORK_LIBRARY}
+  ${Qt5Core_LIBRARIES}
+  ${Qt5Network_LIBRARIES}
   libstrawberry-common
   libstrawberry-tagreader
 )
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-  target_link_libraries(strawberry-tagreader execinfo)
+  target_link_libraries(strawberry-tagreader PRIVATE execinfo)
 endif(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
 
 if(APPLE)
-  target_link_libraries(strawberry-tagreader /System/Library/Frameworks/Foundation.framework)
+  target_link_libraries(strawberry-tagreader PRIVATE /System/Library/Frameworks/Foundation.framework)
 endif(APPLE)
 
 install(TARGETS strawberry-tagreader RUNTIME DESTINATION bin)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8ab3668d0..bebc68ee4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,61 +4,6 @@ if(HAVE_TRANSLATIONS)
   include(../cmake/Translations.cmake)
 endif(HAVE_TRANSLATIONS)
 
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
-
-include_directories(${CMAKE_SOURCE_DIR}/ext/libstrawberry-common)
-include_directories(${CMAKE_SOURCE_DIR}/ext/libstrawberry-tagreader)
-include_directories(${CMAKE_BINARY_DIR}/ext/libstrawberry-tagreader)
-
-include_directories(${Boost_INCLUDE_DIRS})
-include_directories(${GLIBCONFIG_INCLUDE_DIRS})
-include_directories(${GLIB_INCLUDE_DIRS})
-include_directories(${GOBJECT_INCLUDE_DIRS})
-include_directories(${GNUTLS_INCLUDE_DIR})
-
-if (X11_FOUND)
-  include_directories(${X11_INCLUDE_DIR})
-endif(X11_FOUND)
-
-if(HAVE_GSTREAMER)
-  link_directories(${GSTREAMER_LIBRARY_DIRS})
-  include_directories(${GSTREAMER_INCLUDE_DIRS})
-  link_directories(${GSTREAMER_BASE_LIBRARY_DIRS})
-  include_directories(${GSTREAMER_BASE_INCLUDE_DIRS})
-  link_directories(${GSTREAMER_APP_LIBRARY_DIRS})
-  include_directories(${GSTREAMER_APP_INCLUDE_DIRS})
-  link_directories(${GSTREAMER_AUDIO_LIBRARY_DIRS})
-  include_directories(${GSTREAMER_AUDIO_INCLUDE_DIRS})
-  link_directories(${GSTREAMER_TAG_LIBRARY_DIRS})
-  include_directories(${GSTREAMER_TAG_INCLUDE_DIRS})
-  link_directories(${GSTREAMER_PBUTILS_LIBRARY_DIRS})
-  include_directories(${GSTREAMER_PBUTILS_INCLUDE_DIRS})
-endif(HAVE_GSTREAMER)
-
-if(HAVE_CHROMAPRINT)
-  link_directories(${CHROMAPRINT_LIBRARY_DIRS})
-  include_directories(${CHROMAPRINT_INCLUDE_DIRS})
-endif(HAVE_CHROMAPRINT)
-
-if(HAVE_AUDIOCD)
-  link_directories(${LIBCDIO_LIBRARY_DIRS})
-  include_directories(${LIBCDIO_INCLUDE_DIRS})
-endif(HAVE_AUDIOCD)
-
-link_directories(${TAGLIB_LIBRARY_DIRS})
-include_directories(${TAGLIB_INCLUDE_DIRS})
-
-link_directories(${SINGLEAPPLICATION_LIBRARY_DIRS})
-link_directories(${SINGLECOREAPPLICATION_LIBRARY_DIRS})
-include_directories(${SINGLEAPPLICATION_INCLUDE_DIRS})
-include_directories(${SINGLECOREAPPLICATION_INCLUDE_DIRS})
-
-if(HAVE_LIBMTP)
-  link_directories(${LIBMTP_LIBRARY_DIRS})
-  include_directories(${LIBMTP_INCLUDE_DIRS})
-endif(HAVE_LIBMTP)
-
 set(SOURCES
   core/mainwindow.cpp
   core/application.cpp
@@ -729,7 +674,6 @@ optional_source(UNIX
 
 # Libgpod device backend
 optional_source(HAVE_LIBGPOD
-  INCLUDE_DIRECTORIES ${LIBGPOD_INCLUDE_DIRS}
   SOURCES
     device/gpoddevice.cpp
     device/gpodloader.cpp
@@ -740,17 +684,12 @@ optional_source(HAVE_LIBGPOD
 
 # GIO device backend
 optional_source(HAVE_GIO
-  INCLUDE_DIRECTORIES ${GIO_INCLUDE_DIRS}
   SOURCES device/giolister.cpp
   HEADERS device/giolister.h
 )
 
 # imobiledevice backend and device
 optional_source(HAVE_IMOBILEDEVICE
-  INCLUDE_DIRECTORIES
-    ${LIBIMOBILEDEVICE_INCLUDE_DIRS}
-    ${LIBPLIST_INCLUDE_DIRS}
-    ${LIBPLISTPP_INCLUDE_DIRS}
   SOURCES
     device/afcdevice.cpp
     device/afcfile.cpp
@@ -766,7 +705,6 @@ optional_source(HAVE_IMOBILEDEVICE
 
 # mtp device
 optional_source(HAVE_LIBMTP
-  INCLUDE_DIRECTORIES ${LIBMTP_INCLUDE_DIRS}
   SOURCES
     device/mtpconnection.cpp
     device/mtpdevice.cpp
@@ -778,8 +716,6 @@ optional_source(HAVE_LIBMTP
 
 # Pulse audio integration
 optional_source(HAVE_LIBPULSE
-  INCLUDE_DIRECTORIES
-    ${LIBPULSE_INCLUDE_DIRS}
   SOURCES
     engine/pulsedevicefinder.cpp
 )
@@ -822,24 +758,23 @@ UI
 
 # CDIO backend and device
 if(HAVE_GSTREAMER)
-optional_source(HAVE_CHROMAPRINT
-SOURCES
-  musicbrainz/chromaprinter.cpp
-  musicbrainz/tagfetcher.cpp
-HEADERS
-  musicbrainz/tagfetcher.h
-)
-optional_source(HAVE_AUDIOCD
-  SOURCES
-    device/cddadevice.cpp
-    device/cddalister.cpp
-    device/cddasongloader.cpp
-  HEADERS
-    device/cddadevice.h
-    device/cddalister.h
-    device/cddasongloader.h
-  UI
-)
+  optional_source(HAVE_CHROMAPRINT
+    SOURCES
+      musicbrainz/chromaprinter.cpp
+      musicbrainz/tagfetcher.cpp
+    HEADERS
+      musicbrainz/tagfetcher.h
+  )
+  optional_source(HAVE_AUDIOCD
+    SOURCES
+      device/cddadevice.cpp
+      device/cddalister.cpp
+      device/cddasongloader.cpp
+    HEADERS
+      device/cddadevice.h
+      device/cddalister.h
+      device/cddasongloader.h
+  )
 endif()
 
 # Platform specific - macOS
@@ -981,6 +916,81 @@ if(HAVE_TRANSLATIONS)
 
 endif(HAVE_TRANSLATIONS)
 
+link_directories(
+  ${Boost_LIBRARY_DIRS}
+  ${GLIB_LIBRARY_DIRS}
+  ${GOBJECT_LIBRARY_DIRS}
+  ${GNUTLS_LIBRARY_DIRS}
+  ${SQLITE_LIBRARY_DIRS}
+  ${TAGLIB_LIBRARY_DIRS}
+  ${QT_LIBRARY_DIRS}
+  ${SINGLEAPPLICATION_LIBRARY_DIRS}
+  ${SINGLECOREAPPLICATION_LIBRARY_DIRS}
+)
+
+if(HAVE_ALSA)
+  link_directories(${ALSA_LIBRARY_DIRS})
+endif(HAVE_ALSA)
+
+if(HAVE_LIBPULSE)
+  link_directories(${LIBPULSE_LIBRARY_DIRS})
+endif()
+
+if(HAVE_GSTREAMER)
+  link_directories(
+    ${GSTREAMER_LIBRARY_DIRS}
+    ${GSTREAMER_BASE_LIBRARY_DIRS}
+    ${GSTREAMER_APP_LIBRARY_DIRS}
+    ${GSTREAMER_AUDIO_LIBRARY_DIRS}
+    ${GSTREAMER_TAG_LIBRARY_DIRS}
+    ${GSTREAMER_PBUTILS_LIBRARY_DIRS}
+  )
+endif(HAVE_GSTREAMER)
+
+if(HAVE_XINE)
+  link_directories(${LIBXINE_LIBRARY_DIRS})
+endif()
+
+if(HAVE_VLC)
+  link_directories(${LIBVLC_LIBRARY_DIRS})
+endif()
+
+if(HAVE_CHROMAPRINT)
+  link_directories(${CHROMAPRINT_LIBRARY_DIRS})
+endif(HAVE_CHROMAPRINT)
+
+if(X11_FOUND)
+  link_directories(${X11_LIBRARY_DIRS})
+endif(X11_FOUND)
+
+if(XCB_FOUND)
+  link_directories(${XCB_LIBRARY_DIRS})
+endif(XCB_FOUND)
+
+if(HAVE_GIO)
+  link_directories(${GIO_LIBRARY_DIRS})
+endif(HAVE_GIO)
+
+if(HAVE_AUDIOCD)
+  link_directories(${LIBCDIO_LIBRARY_DIRS})
+endif(HAVE_AUDIOCD)
+
+if(HAVE_LIBGPOD)
+  link_directories(${LIBGPOD_LIBRARIES})
+endif(HAVE_LIBGPOD)
+
+if(HAVE_LIBMTP)
+  link_directories(${LIBMTP_LIBRARY_DIRS})
+endif(HAVE_LIBMTP)
+
+if(HAVE_IMOBILEDEVICE)
+  link_directories(
+    ${LIBUSBMUXD_LIBRARY_DIRS}
+    ${LIBPLIST_LIBRARY_DIRS}
+    ${LIBIMOBILEDEVICE_LIBRARY_DIRS}
+  )
+endif(HAVE_IMOBILEDEVICE)
+
 add_library(strawberry_lib STATIC
   ${SOURCES}
   ${MOC}
@@ -991,82 +1001,133 @@ add_library(strawberry_lib STATIC
   ${OTHER_UIC_SOURCES}
 )
 
-target_link_libraries(strawberry_lib
-  libstrawberry-common
-  libstrawberry-tagreader
-  ${CMAKE_THREAD_LIBS_INIT}
-  ${GLIB_LIBRARIES}
-  ${GIO_LIBRARIES}
-  ${GOBJECT_LIBRARIES}
-  ${GNUTLS_LIBRARIES}
-  ${QT_LIBRARIES}
-  ${SQLITE_LIBRARIES}
-  ${TAGLIB_LIBRARIES}
-  ${SINGLEAPPLICATION_LIBRARIES}
-  ${SINGLECOREAPPLICATION_LIBRARIES}
-  z
+target_include_directories(strawberry_lib PUBLIC
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_SOURCE_DIR}/ext/libstrawberry-common
+  ${CMAKE_SOURCE_DIR}/ext/libstrawberry-tagreader
+  ${CMAKE_BINARY_DIR}/ext/libstrawberry-tagreader
+  ${Boost_INCLUDE_DIRS}
+  ${GLIB_INCLUDE_DIRS}
+  ${GOBJECT_INCLUDE_DIRS}
+  ${GNUTLS_INCLUDE_DIRS}
+  ${SQLITE_INCLUDE_DIRS}
+  ${TAGLIB_INCLUDE_DIRS}
+  ${QT_INCLUDE_DIRS}
+  ${SINGLEAPPLICATION_INCLUDE_DIRS}
+  ${SINGLECOREAPPLICATION_INCLUDE_DIRS}
 )
 
-if(X11_FOUND)
-  target_link_libraries(strawberry_lib ${X11_LIBRARIES})
-endif(X11_FOUND)
-
-if(XCB_FOUND)
-  target_link_libraries(strawberry_lib ${XCB_LIBRARIES})
-endif(XCB_FOUND)
+target_link_libraries(strawberry_lib PUBLIC
+  ${CMAKE_THREAD_LIBS_INIT}
+  ${GLIB_LIBRARIES}
+  ${GOBJECT_LIBRARIES}
+  ${GNUTLS_LIBRARIES}
+  ${SQLITE_LIBRARIES}
+  ${TAGLIB_LIBRARIES}
+  ${QT_LIBRARIES}
+  ${SINGLEAPPLICATION_LIBRARIES}
+  ${SINGLECOREAPPLICATION_LIBRARIES}
+  libstrawberry-common
+  libstrawberry-tagreader
+)
 
 if(HAVE_ALSA)
-  target_link_libraries(strawberry_lib ${ALSA_LIBRARIES})
+  target_include_directories(strawberry_lib PRIVATE ${ALSA_INCLUDE_DIRS})
+  target_link_libraries(strawberry_lib PRIVATE ${ALSA_LIBRARIES})
 endif(HAVE_ALSA)
 
-if(HAVE_GSTREAMER)
-  target_link_libraries(strawberry_lib ${GSTREAMER_LIBRARIES} ${GSTREAMER_BASE_LIBRARIES} ${GSTREAMER_AUDIO_LIBRARIES} ${GSTREAMER_APP_LIBRARIES} ${GSTREAMER_TAG_LIBRARIES} ${GSTREAMER_PBUTILS_LIBRARIES})
+if(HAVE_LIBPULSE)
+  target_include_directories(strawberry_lib PRIVATE ${LIBPULSE_INCLUDE_DIRS})
+  target_link_libraries(strawberry_lib PRIVATE ${LIBPULSE_LIBRARIES})
 endif()
 
-if(HAVE_CHROMAPRINT)
-  target_link_libraries(strawberry_lib ${CHROMAPRINT_LIBRARIES})
+if(HAVE_GSTREAMER)
+  target_include_directories(strawberry_lib PRIVATE
+    ${GSTREAMER_INCLUDE_DIRS}
+    ${GSTREAMER_BASE_INCLUDE_DIRS}
+    ${GSTREAMER_APP_INCLUDE_DIRS}
+    ${GSTREAMER_AUDIO_INCLUDE_DIRS}
+    ${GSTREAMER_TAG_INCLUDE_DIRS}
+    ${GSTREAMER_PBUTILS_INCLUDE_DIRS}
+  )
+  target_link_libraries(strawberry_lib PRIVATE
+    ${GSTREAMER_LIBRARIES}
+    ${GSTREAMER_BASE_LIBRARIES}
+    ${GSTREAMER_AUDIO_LIBRARIES}
+    ${GSTREAMER_APP_LIBRARIES}
+    ${GSTREAMER_TAG_LIBRARIES}
+    ${GSTREAMER_PBUTILS_LIBRARIES}
+  )
+endif(HAVE_GSTREAMER)
+
+if(HAVE_MOODBAR)
+  target_link_libraries(strawberry_lib PRIVATE gstmoodbar)
 endif()
 
 if(HAVE_XINE)
-  target_link_libraries(strawberry_lib ${LIBXINE_LIBRARIES})
+  target_include_directories(strawberry_lib PRIVATE ${LIBXINE_INCLUDE_DIRS})
+  target_link_libraries(strawberry_lib PRIVATE ${LIBXINE_LIBRARIES})
 endif()
 
 if(HAVE_VLC)
-  target_link_libraries(strawberry_lib ${LIBVLC_LIBRARIES})
+  target_include_directories(strawberry_lib PRIVATE ${LIBVLC_INCLUDE_DIRS})
+  target_link_libraries(strawberry_lib PRIVATE ${LIBVLC_LIBRARIES})
 endif()
 
-if(HAVE_LIBGPOD)
-  target_link_libraries(strawberry_lib ${LIBGPOD_LIBRARIES})
-endif(HAVE_LIBGPOD)
+if(HAVE_CHROMAPRINT)
+  target_include_directories(strawberry_lib PRIVATE ${CHROMAPRINT_INCLUDE_DIRS})
+  target_link_libraries(strawberry_lib PRIVATE ${CHROMAPRINT_LIBRARIES})
+endif(HAVE_CHROMAPRINT)
+
+if(X11_FOUND)
+  target_include_directories(strawberry_lib PRIVATE ${X11_INCLUDE_DIR})
+  target_link_libraries(strawberry_lib PRIVATE ${X11_LIBRARIES})
+endif(X11_FOUND)
+
+if(XCB_FOUND)
+  target_include_directories(strawberry_lib PRIVATE ${XCB_INCLUDE_DIR})
+  target_link_libraries(strawberry_lib PRIVATE ${XCB_LIBRARIES})
+endif(XCB_FOUND)
 
 if(HAVE_GIO)
-  target_link_libraries(strawberry_lib ${GIO_LIBRARIES})
+  target_include_directories(strawberry_lib PRIVATE ${GIO_INCLUDE_DIRS})
+  target_link_libraries(strawberry_lib PRIVATE ${GIO_LIBRARIES})
 endif(HAVE_GIO)
 
 if(HAVE_AUDIOCD)
-  target_link_libraries(strawberry_lib ${LIBCDIO_LIBRARIES})
+  target_include_directories(strawberry_lib PRIVATE ${LIBCDIO_INCLUDE_DIRS})
+  target_link_libraries(strawberry_lib PRIVATE ${LIBCDIO_LIBRARIES})
 endif(HAVE_AUDIOCD)
 
-if(HAVE_IMOBILEDEVICE)
-  target_link_libraries(strawberry_lib ${LIBIMOBILEDEVICE_LIBRARIES} ${LIBPLIST_LIBRARIES} ${LIBUSBMUXD_LIBRARIES})
-  link_directories(${LIBIMOBILEDEVICE_LIBRARY_DIRS})
-  link_directories(${LIBUSBMUXD_LIBRARY_DIRS})
-endif(HAVE_IMOBILEDEVICE)
+if(HAVE_LIBGPOD)
+  target_include_directories(strawberry_lib PRIVATE ${LIBGPOD_INCLUDE_DIRS})
+  target_link_libraries(strawberry_lib PRIVATE ${LIBGPOD_LIBRARIES})
+endif(HAVE_LIBGPOD)
 
 if(HAVE_LIBMTP)
-  target_link_libraries(strawberry_lib ${LIBMTP_LIBRARIES})
+  target_include_directories(strawberry_lib PRIVATE ${LIBMTP_INCLUDE_DIRS})
+  target_link_libraries(strawberry_lib PRIVATE ${LIBMTP_LIBRARIES})
 endif(HAVE_LIBMTP)
 
-if(HAVE_LIBPULSE)
-  target_link_libraries(strawberry_lib ${LIBPULSE_LIBRARIES})
-endif()
+if(HAVE_IMOBILEDEVICE)
+  target_include_directories(strawberry_lib PRIVATE
+    ${LIBUSBMUXD_INCLUDE_DIRS}
+    ${LIBPLIST_INCLUDE_DIRS}
+    ${LIBIMOBILEDEVICE_INCLUDE_DIRS}
+  )
+  target_link_libraries(strawberry_lib PRIVATE
+    ${LIBUSBMUXD_LIBRARIES}
+    ${LIBPLIST_LIBRARIES}
+    ${LIBIMOBILEDEVICE_LIBRARIES}
+  )
+endif(HAVE_IMOBILEDEVICE)
 
-if(HAVE_MOODBAR)
-  target_link_libraries(strawberry_lib gstmoodbar)
-endif()
 
-if (APPLE)
-  target_link_libraries(strawberry_lib
+if(APPLE)
+  target_link_libraries(strawberry_lib PRIVATE
     "-framework AppKit"
     "-framework Carbon"
     "-framework CoreAudio"
@@ -1075,41 +1136,40 @@ if (APPLE)
     "-framework IOKit"
     "-framework ScriptingBridge"
   )
+  if(HAVE_SPARKLE)
+    target_include_directories(strawberry_lib PRIVATE ${SPARKLE}/Headers)
+    target_link_libraries(strawberry_lib PRIVATE ${SPARKLE})
+  endif(HAVE_SPARKLE)
+endif(APPLE)
 
-  if (HAVE_SPARKLE)
-    include_directories(${SPARKLE}/Headers)
-    target_link_libraries(strawberry_lib ${SPARKLE})
-  endif (HAVE_SPARKLE)
-endif (APPLE)
+if(WIN32)
+  target_link_libraries(strawberry_lib PRIVATE dsound)
+endif(WIN32)
 
-if (WIN32)
-  target_link_libraries(strawberry_lib dsound)
-endif (WIN32)
-
-if (UNIX AND NOT APPLE)
+if(UNIX AND NOT APPLE)
   # Hack: the Gold linker pays attention to the order that libraries are specified on the link line.
   # -lX11 and -ldl are provided earlier in the link command but they're actually used by libraries that appear after them, so they end up getting ignored.
   # This appends them to the very end of the link line, ensuring they're always used.
   find_package(X11)
-  if (FREEBSD)
-    target_link_libraries(strawberry_lib ${X11_X11_LIB})
-  else ()
-    target_link_libraries(strawberry_lib ${X11_X11_LIB} ${CMAKE_DL_LIBS})
-  endif ()
-endif ()
+  if(FREEBSD)
+    target_link_libraries(strawberry_lib PRIVATE ${X11_X11_LIB})
+  else()
+    target_link_libraries(strawberry_lib PRIVATE ${X11_X11_LIB} ${CMAKE_DL_LIBS})
+  endif()
+endif()
 
-if (NOT USE_SYSTEM_SINGLEAPPLICATION)
+if(NOT USE_SYSTEM_SINGLEAPPLICATION)
   add_dependencies(strawberry_lib ${SINGLEAPPLICATION_LIBRARIES} ${SINGLECOREAPPLICATION_LIBRARIES})
-endif ()
+endif()
 
 ###############################################################################
 
 set(EXECUTABLE_OUTPUT_PATH ..)
 
 # Show the console window in debug mode on Windows
-if (NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT ENABLE_WIN32_CONSOLE)
+if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT ENABLE_WIN32_CONSOLE)
   set(STRAWBERRY-WIN32-FLAG WIN32)
-endif (NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT ENABLE_WIN32_CONSOLE)
+endif(NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT ENABLE_WIN32_CONSOLE)
 
 # Resource file for windows
 if(WIN32)
@@ -1125,18 +1185,18 @@ add_executable(strawberry
 )
 
 if(FREEBSD)
-  target_link_libraries(strawberry execinfo)
+  target_link_libraries(strawberry PRIVATE execinfo)
 endif()
 
-target_link_libraries(strawberry strawberry_lib)
+target_link_libraries(strawberry PRIVATE strawberry_lib)
 
 # macdeploy.py relies on the blob being built first.
 add_dependencies(strawberry strawberry-tagreader)
 
-if (NOT APPLE)
+if(NOT APPLE)
   install(TARGETS strawberry RUNTIME DESTINATION bin)
 endif()
 
-if (APPLE)
+if(APPLE)
   set_target_properties(strawberry PROPERTIES MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/../dist/macos/Info.plist")
 endif (APPLE)
diff --git a/src/widgets/osd.h b/src/widgets/osd.h
index 63f727bfe..698c8ef02 100644
--- a/src/widgets/osd.h
+++ b/src/widgets/osd.h
@@ -98,9 +98,8 @@ class OSD : public QObject {
  private slots:
 #ifdef HAVE_DBUS
   void CallFinished(QDBusPendingCallWatcher *watcher);
-#else
-  void CallFinished();
 #endif
+  void CallFinished();
   void AlbumCoverLoaded(const Song &song, const QUrl &cover_url, const QImage &image);
 
  private:
diff --git a/src/widgets/osd_x11.cpp b/src/widgets/osd_x11.cpp
index 5eb87911c..2b4a17396 100644
--- a/src/widgets/osd_x11.cpp
+++ b/src/widgets/osd_x11.cpp
@@ -184,6 +184,6 @@ void OSD::CallFinished(QDBusPendingCallWatcher *watcher) {
     last_notification_time_ = QDateTime::currentDateTime();
   }
 }
-#else
-void OSD::CallFinished() {}
 #endif
+void OSD::CallFinished() {}
+