diff --git a/src/librssguard-feedly/CMakeLists.txt b/src/librssguard-feedly/CMakeLists.txt
index 96b664ae4..3e70489f3 100644
--- a/src/librssguard-feedly/CMakeLists.txt
+++ b/src/librssguard-feedly/CMakeLists.txt
@@ -23,6 +23,9 @@ set(UI_FILES
 # Deal with .ui files.
 qt_wrap_ui(SOURCES ${UI_FILES})
 
+set(FEEDLY_CLIENT_ID "" CACHE STRING "Feedly client ID")
+set(FEEDLY_CLIENT_SECRET "" CACHE STRING "Feedly client secret")
+
 # Bundle version info.
 if(WIN32)
   enable_language("RC")
@@ -38,6 +41,20 @@ target_compile_definitions(rssguard-feedly
   RSSGUARD_DLLSPEC_EXPORT=Q_DECL_EXPORT
 )
 
+if(NOT FEEDLY_CLIENT_ID STREQUAL "" AND NOT FEEDLY_CLIENT_SECRET STREQUAL "")
+  target_compile_definitions(rssguard-feedly
+    PRIVATE
+
+    FEEDLY_OFFICIAL_SUPPORT
+    FEEDLY_CLIENT_ID="${FEEDLY_CLIENT_ID}"
+    FEEDLY_CLIENT_SECRET="${FEEDLY_CLIENT_SECRET}"
+  )
+
+  message(STATUS "Enabling official Feedly support.")
+else()
+  message(STATUS "Feedly client ID/secret variables are not set. Disabling official support.")
+endif()
+
 target_include_directories(rssguard-feedly
   PUBLIC
   ${LIBRSSGUARD_SOURCE_PATH}
diff --git a/src/librssguard-gmail/CMakeLists.txt b/src/librssguard-gmail/CMakeLists.txt
index 5c68b304c..c98ef7d93 100644
--- a/src/librssguard-gmail/CMakeLists.txt
+++ b/src/librssguard-gmail/CMakeLists.txt
@@ -42,6 +42,9 @@ set(UI_FILES
 # Deal with .ui files.
 qt_wrap_ui(SOURCES ${UI_FILES})
 
+set(GMAIL_CLIENT_ID "" CACHE STRING "GMail client ID")
+set(GMAIL_CLIENT_SECRET "" CACHE STRING "GMail client secret")
+
 # Bundle version info.
 if(WIN32)
   enable_language("RC")
@@ -57,6 +60,20 @@ target_compile_definitions(rssguard-gmail
   RSSGUARD_DLLSPEC_EXPORT=Q_DECL_EXPORT
 )
 
+if(NOT GMAIL_CLIENT_ID STREQUAL "" AND NOT GMAIL_CLIENT_SECRET STREQUAL "")
+  target_compile_definitions(rssguard-gmail
+    PRIVATE
+
+    GMAIL_OFFICIAL_SUPPORT
+    GMAIL_CLIENT_ID="${GMAIL_CLIENT_ID}"
+    GMAIL_CLIENT_SECRET="${GMAIL_CLIENT_SECRET}"
+  )
+
+  message(STATUS "Enabling official Gmail support.")
+else()
+  message(STATUS "Gmail client ID/secret variables are not set. Disabling official support.")
+endif()
+
 target_include_directories(rssguard-gmail
   PUBLIC
   ${LIBRSSGUARD_SOURCE_PATH}
diff --git a/src/librssguard-greader/CMakeLists.txt b/src/librssguard-greader/CMakeLists.txt
index 63cecb4c2..f2ce3c48c 100644
--- a/src/librssguard-greader/CMakeLists.txt
+++ b/src/librssguard-greader/CMakeLists.txt
@@ -30,6 +30,9 @@ set(UI_FILES
 # Deal with .ui files.
 qt_wrap_ui(SOURCES ${UI_FILES})
 
+set(INOREADER_CLIENT_ID "" CACHE STRING "Inoreader client ID")
+set(INOREADER_CLIENT_SECRET "" CACHE STRING "Inoreader client secret")
+
 # Bundle version info.
 if(WIN32)
   enable_language("RC")
@@ -45,6 +48,20 @@ target_compile_definitions(rssguard-greader
   RSSGUARD_DLLSPEC_EXPORT=Q_DECL_EXPORT
 )
 
+if(NOT INOREADER_CLIENT_ID STREQUAL "" AND NOT INOREADER_CLIENT_SECRET STREQUAL "")
+  target_compile_definitions(rssguard
+    PRIVATE
+
+    INOREADER_OFFICIAL_SUPPORT
+    INOREADER_CLIENT_ID="${INOREADER_CLIENT_ID}"
+    INOREADER_CLIENT_SECRET="${INOREADER_CLIENT_SECRET}"
+  )
+
+  message(STATUS "Enabling official Inoreader support.")
+else()
+  message(STATUS "Inoreader client ID/secret variables are not set. Disabling official support.")
+endif()
+
 target_include_directories(rssguard-greader
   PUBLIC
   ${LIBRSSGUARD_SOURCE_PATH}
diff --git a/src/librssguard-standard/src/standardserviceentrypoint.h b/src/librssguard-standard/src/standardserviceentrypoint.h
index 236abb709..90f88cbb1 100644
--- a/src/librssguard-standard/src/standardserviceentrypoint.h
+++ b/src/librssguard-standard/src/standardserviceentrypoint.h
@@ -5,7 +5,7 @@
 
 #include <librssguard/services/abstract/serviceentrypoint.h>
 
-class RSSGUARD_DLLSPEC_EXPORT StandardServiceEntryPoint : public QObject, public ServiceEntryPoint {
+class StandardServiceEntryPoint : public QObject, public ServiceEntryPoint {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "io.github.martinrotter.rssguard.standard" FILE "plugin.json")
     Q_INTERFACES(ServiceEntryPoint)
diff --git a/src/librssguard/CMakeLists.txt b/src/librssguard/CMakeLists.txt
index f5529c2f6..9803cc98a 100644
--- a/src/librssguard/CMakeLists.txt
+++ b/src/librssguard/CMakeLists.txt
@@ -480,16 +480,6 @@ qt_wrap_ui(SOURCES ${UI_FILES})
 qt_add_resources(SOURCES ${CMAKE_SOURCE_DIR}/resources/sql.qrc)
 qt_add_resources(SOURCES ${CMAKE_SOURCE_DIR}/resources/rssguard.qrc)
 
-# Process OAuth service secrets.
-set(FEEDLY_CLIENT_ID "" CACHE STRING "Feedly client ID")
-set(FEEDLY_CLIENT_SECRET "" CACHE STRING "Feedly client secret")
-
-set(GMAIL_CLIENT_ID "" CACHE STRING "GMail client ID")
-set(GMAIL_CLIENT_SECRET "" CACHE STRING "GMail client secret")
-
-set(INOREADER_CLIENT_ID "" CACHE STRING "Inoreader client ID")
-set(INOREADER_CLIENT_SECRET "" CACHE STRING "Inoreader client secret")
-
 if(APPLE OR WIN32 OR OS2 OR FORCE_BUNDLE_ICONS)
   qt_add_resources(SOURCES ${CMAKE_SOURCE_DIR}/resources/icons.qrc)
 endif()
@@ -513,49 +503,6 @@ if(FORCE_BUNDLE_ICONS)
   message(STATUS "Forcibly bundling icon themes.")
 endif()
 
-# Add OAuth services definitions.
-if(NOT FEEDLY_CLIENT_ID STREQUAL "" AND NOT FEEDLY_CLIENT_SECRET STREQUAL "")
-  target_compile_definitions(rssguard
-    PRIVATE
-
-    FEEDLY_OFFICIAL_SUPPORT
-    FEEDLY_CLIENT_ID="${FEEDLY_CLIENT_ID}"
-    FEEDLY_CLIENT_SECRET="${FEEDLY_CLIENT_SECRET}"
-  )
-
-  message(STATUS "Enabling official Feedly support.")
-else()
-  message(STATUS "Feedly client ID/secret variables are not set. Disabling official support.")
-endif()
-
-if(NOT GMAIL_CLIENT_ID STREQUAL "" AND NOT GMAIL_CLIENT_SECRET STREQUAL "")
-  target_compile_definitions(rssguard
-    PRIVATE
-
-    GMAIL_OFFICIAL_SUPPORT
-    GMAIL_CLIENT_ID="${GMAIL_CLIENT_ID}"
-    GMAIL_CLIENT_SECRET="${GMAIL_CLIENT_SECRET}"
-  )
-
-  message(STATUS "Enabling official Gmail support.")
-else()
-  message(STATUS "Gmail client ID/secret variables are not set. Disabling official support.")
-endif()
-
-if(NOT INOREADER_CLIENT_ID STREQUAL "" AND NOT INOREADER_CLIENT_SECRET STREQUAL "")
-  target_compile_definitions(rssguard
-    PRIVATE
-
-    INOREADER_OFFICIAL_SUPPORT
-    INOREADER_CLIENT_ID="${INOREADER_CLIENT_ID}"
-    INOREADER_CLIENT_SECRET="${INOREADER_CLIENT_SECRET}"
-  )
-
-  message(STATUS "Enabling official Inoreader support.")
-else()
-  message(STATUS "Inoreader client ID/secret variables are not set. Disabling official support.")
-endif()
-
 # Add specific definitions.
 target_compile_definitions(rssguard
   PRIVATE