diff --git a/src/librssguard-standard/CMakeLists.txt b/src/librssguard-standard/CMakeLists.txt
index b4d6d2585..5450c2b68 100644
--- a/src/librssguard-standard/CMakeLists.txt
+++ b/src/librssguard-standard/CMakeLists.txt
@@ -106,6 +106,22 @@ if(QT_VERSION_MAJOR EQUAL 6)
   )
 endif()
 
+if(ZLIB_FOUND)
+  target_include_directories(rssguard-standard AFTER
+    PRIVATE
+    ${ZLIB_INCLUDE_DIRS}
+  )
+
+  target_compile_definitions(rssguard-standard
+    PRIVATE
+    ENABLE_COMPRESSED_SITEMAP
+  )
+
+  target_link_libraries(rssguard-standard PRIVATE
+    ${ZLIB_LIBRARIES}
+  )
+endif(ZLIB_FOUND)
+
 if(WIN32 OR OS2)
   install(TARGETS rssguard-standard DESTINATION plugins)
 elseif(UNIX AND NOT APPLE AND NOT ANDROID)
diff --git a/src/librssguard-standard/src/parsers/sitemapparser.cpp b/src/librssguard-standard/src/parsers/sitemapparser.cpp
index 7e5215d2a..31344570f 100644
--- a/src/librssguard-standard/src/parsers/sitemapparser.cpp
+++ b/src/librssguard-standard/src/parsers/sitemapparser.cpp
@@ -3,15 +3,15 @@
 #include "src/parsers/sitemapparser.h"
 
 #if defined(ENABLE_COMPRESSED_SITEMAP)
-#include <librssguard/3rd-party/qcompressor/qcompressor.h>
+#include "src/3rd-party/qcompressor/qcompressor.h"
 #endif
 
+#include "src/definitions.h"
 #include <librssguard/definitions/definitions.h>
 #include <librssguard/exceptions/applicationexception.h>
 #include <librssguard/exceptions/feedrecognizedbutfailedexception.h>
 #include <librssguard/miscellaneous/settings.h>
 #include <librssguard/miscellaneous/textfactory.h>
-#include "src/definitions.h"
 
 #include <QDomDocument>
 #include <QTextCodec>
diff --git a/src/librssguard-standard/src/standardfeed.cpp b/src/librssguard-standard/src/standardfeed.cpp
index d1f61481b..f51d7f016 100644
--- a/src/librssguard-standard/src/standardfeed.cpp
+++ b/src/librssguard-standard/src/standardfeed.cpp
@@ -2,6 +2,8 @@
 
 #include "src/standardfeed.h"
 
+#include "src/gui/formstandardfeeddetails.h"
+#include "src/standardserviceroot.h"
 #include <librssguard/database/databasequeries.h>
 #include <librssguard/definitions/definitions.h>
 #include <librssguard/exceptions/applicationexception.h>
@@ -10,8 +12,6 @@
 #include <librssguard/exceptions/scriptexception.h>
 #include <librssguard/miscellaneous/settings.h>
 #include <librssguard/miscellaneous/textfactory.h>
-#include "src/gui/formstandardfeeddetails.h"
-#include "src/standardserviceroot.h"
 
 #if defined(NO_LITE)
 #include <librssguard/gui/webviewers/webengine/webengineviewer.h>
@@ -26,7 +26,7 @@
 #include "src/parsers/sitemapparser.h"
 
 #if defined(ENABLE_COMPRESSED_SITEMAP)
-#include <librssguard/3rd-party/qcompressor/qcompressor.h>
+#include "src/3rd-party/qcompressor/qcompressor.h"
 #endif
 
 #include <QCommandLineParser>
diff --git a/src/librssguard-standard/src/standardserviceentrypoint.cpp b/src/librssguard-standard/src/standardserviceentrypoint.cpp
index 5281b7cce..0202f9d9e 100644
--- a/src/librssguard-standard/src/standardserviceentrypoint.cpp
+++ b/src/librssguard-standard/src/standardserviceentrypoint.cpp
@@ -10,9 +10,7 @@
 
 StandardServiceEntryPoint::StandardServiceEntryPoint(QObject* parent) : QObject(parent) {}
 
-StandardServiceEntryPoint::~StandardServiceEntryPoint() {
-  qDebugNN << LOGSEC_CORE << "Destructing plugin.";
-}
+StandardServiceEntryPoint::~StandardServiceEntryPoint() {}
 
 QString StandardServiceEntryPoint::name() const {
   return QSL("RSS/RDF/ATOM/JSON");
diff --git a/src/librssguard-standard/src/standardserviceroot.cpp b/src/librssguard-standard/src/standardserviceroot.cpp
index 1ad1290f3..80df7fa6c 100644
--- a/src/librssguard-standard/src/standardserviceroot.cpp
+++ b/src/librssguard-standard/src/standardserviceroot.cpp
@@ -37,7 +37,7 @@
 #endif
 
 #if defined(ENABLE_COMPRESSED_SITEMAP)
-#include <librssguard/3rd-party/qcompressor/qcompressor.h>
+#include "src/3rd-party/qcompressor/qcompressor.h"
 #endif
 
 #include <QAction>
diff --git a/src/librssguard/CMakeLists.txt b/src/librssguard/CMakeLists.txt
index 54aefdb8f..4a15dd54a 100644
--- a/src/librssguard/CMakeLists.txt
+++ b/src/librssguard/CMakeLists.txt
@@ -711,23 +711,6 @@ if(SQLite3_FOUND)
   )
 endif()
 
-if(ZLIB_FOUND)
-  target_include_directories(rssguard AFTER
-    PRIVATE
-    ${ZLIB_INCLUDE_DIRS}
-  )
-
-  target_compile_definitions(rssguard
-    PRIVATE
-
-    ENABLE_COMPRESSED_SITEMAP
-  )
-
-  target_link_libraries(rssguard PRIVATE
-    ${ZLIB_LIBRARIES}
-  )
-endif(ZLIB_FOUND)
-
 # Qt.
 target_link_libraries(rssguard PUBLIC
   Qt${QT_VERSION_MAJOR}::Core
diff --git a/src/librssguard/miscellaneous/pluginfactory.cpp b/src/librssguard/miscellaneous/pluginfactory.cpp
index 817b4a0b3..74188340f 100644
--- a/src/librssguard/miscellaneous/pluginfactory.cpp
+++ b/src/librssguard/miscellaneous/pluginfactory.cpp
@@ -60,8 +60,9 @@ QStringList PluginFactory::pluginPaths() const {
 #if defined(Q_OS_LINUX)
   paths << QCoreApplication::applicationDirPath() + QDir::separator() + QL1S("..") + QDir::separator() + QL1S("lib") +
              QDir::separator() + QL1S(APP_LOW_NAME);
-#else
+#elif defined(Q_OS_WIN)
   paths << QCoreApplication::applicationDirPath() + QDir::separator() + QL1S("plugins");
+#else
   paths << QCoreApplication::applicationDirPath();
 #endif