diff --git a/src/collectionmanagerinterface.h b/src/collectionmanagerinterface.h
index 0bc97a556fe2ff5a6092057ab38f80ff1284076f..8f1ddc0066d025c7a01500cf43166c70b8756e55 100644
--- a/src/collectionmanagerinterface.h
+++ b/src/collectionmanagerinterface.h
@@ -199,4 +199,3 @@ private:
 };
 
 #include "collectionmanagerinterface.hpp"
-
diff --git a/src/collectionmediator.h b/src/collectionmediator.h
index e43aa9fc984e7a6420d43d231cf2fe5c88e97634..de8df5023e19b092407998c66c002b7fd2a58ca5 100644
--- a/src/collectionmediator.h
+++ b/src/collectionmediator.h
@@ -36,7 +36,7 @@ class CollectionMediatorPrivate;
  * The later objective make it easier to later implement the decorator pattern.
  */
 template<typename T>
-class LIB_EXPORT CollectionMediator {
+class CollectionMediator {
 public:
    CollectionMediator(CollectionManagerInterface<T>* parentManager, QAbstractItemModel* m);
    virtual ~CollectionMediator();
@@ -50,4 +50,3 @@ private:
 };
 
 #include <collectionmediator.hpp>
-
diff --git a/src/dbuserrorhandlerdefault.h b/src/dbuserrorhandlerdefault.h
index 439503c83e172d377df96d45028a13f27a192509..2b233d3de60ffaae54c722b4cfc85b401382d6f2 100644
--- a/src/dbuserrorhandlerdefault.h
+++ b/src/dbuserrorhandlerdefault.h
@@ -26,7 +26,7 @@ namespace Interfaces {
 /**
  * This implementation of the DBusErrorHandler interface throws an exception with the given message.
  */
-class LIB_EXPORT DBusErrorHandlerDefault : public DBusErrorHandlerI {
+class DBusErrorHandlerDefault : public DBusErrorHandlerI {
 public:
     [[noreturn]] void connectionError(const QString& error) override;
     [[noreturn]] void invalidInterfaceError(const QString& error) override;
diff --git a/src/globalinstances.h b/src/globalinstances.h
index 83b727ad7c091ee946cd74da314b1cd7771e145b..efd94f7c44f02d25afe32756269411a48e07d6a8 100644
--- a/src/globalinstances.h
+++ b/src/globalinstances.h
@@ -52,7 +52,7 @@ void LIB_EXPORT setAccountListColorizer(std::unique_ptr<Interfaces::AccountListC
 LIB_EXPORT Interfaces::ContactMethodSelectorI& contactMethodSelector();
 void LIB_EXPORT setContactMethodSelector(std::unique_ptr<Interfaces::ContactMethodSelectorI> instance);
 
-LIB_EXPORT Interfaces::DBusErrorHandlerI& dBusErrorHandler();
+Interfaces::DBusErrorHandlerI& dBusErrorHandler();
 void setDBusErrorHandler(std::unique_ptr<Interfaces::DBusErrorHandlerI> instance);
 
 /**
@@ -96,7 +96,7 @@ void setInterfaceInternal(Interfaces::ActionExtenderI          *);
  * can be passed.
  */
 template<class I, typename ...Ts>
-void LIB_EXPORT setInterface(Ts... args)
+void setInterface(Ts... args)
 {
    try {
       auto i = new I(args...);
diff --git a/src/itembase.h b/src/itembase.h
index cb1c772966e83dcba4adbe7f3096f729f7747527..cc6e92b2c6cbb2749cdebd76d1250ee32ddc47fe 100644
--- a/src/itembase.h
+++ b/src/itembase.h
@@ -58,4 +58,3 @@ private:
 };
 
 #include <itembase.hpp>
-
diff --git a/src/typedefs.h b/src/typedefs.h
index d7067d3bd9f6712fae744184cfe1c141bac0a0e0..59f73425c3eced8a5a1d50d4cd6be85b633fe718 100644
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -47,8 +47,11 @@ template<typename A> constexpr int enum_class_size() {
    return static_cast<int>(A::COUNT__);
 }
 
+#ifdef LRC_IMPORT
+#define LIB_EXPORT Q_DECL_IMPORT
+#else
 #define LIB_EXPORT Q_DECL_EXPORT
-#define LIB_IMPORT Q_DECL_IMPORT
+#endif
 
 //Doesn't work
 #if ((__GNUC_MINOR__ > 8) || (__GNUC_MINOR__ == 8))