diff --git a/src/declarative/CMakeLists.txt b/src/declarative/CMakeLists.txt
--- a/src/declarative/CMakeLists.txt
+++ b/src/declarative/CMakeLists.txt
@@ -1,9 +1,4 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR}/.. ${CMAKE_CURRENT_SOURCE_DIR}/..)
-
-add_library(kaccountsdeclarativeplugin SHARED kaccountsdeclarativeplugin.cpp
-                            ../jobs/createaccount.cpp
-                            ../jobs/accountservicetoggle.cpp
-                            ../lib/uipluginsmanager.cpp)
+add_library(kaccountsdeclarativeplugin SHARED kaccountsdeclarativeplugin.cpp)
 
 target_link_libraries(kaccountsdeclarativeplugin Qt5::Qml
                                                  KF5::I18n
diff --git a/src/declarative/kaccountsdeclarativeplugin.cpp b/src/declarative/kaccountsdeclarativeplugin.cpp
--- a/src/declarative/kaccountsdeclarativeplugin.cpp
+++ b/src/declarative/kaccountsdeclarativeplugin.cpp
@@ -17,8 +17,8 @@
  *************************************************************************************/
 
 #include "kaccountsdeclarativeplugin.h"
-#include "../jobs/createaccount.h"
-#include "../jobs/accountservicetoggle.h"
+#include "createaccount.h"
+#include "accountservicetoggle.h"
 #include <qqml.h>
 
 void KAccountsDeclarativePlugin::registerTypes(const char* uri)
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -21,10 +21,13 @@
   SOVERSION ${KACCOUNTS_SOVERSION})
 
 set (kaccountslib_SRCS
+     accountservicetoggle.cpp
+     createaccount.cpp
      kaccountsuiplugin.cpp
      kaccountsdplugin.cpp
      getcredentialsjob.cpp
      core.cpp
+     uipluginsmanager.cpp
 )
 
 ecm_generate_headers(kaccountslib_HEADERS
@@ -44,6 +47,7 @@
 target_link_libraries (kaccounts
     PUBLIC
         KF5::CoreAddons
+        KF5::I18n
         ${ACCOUNTSQT_LIBRARIES}
         Qt5::Xml
         Qt5::Gui
diff --git a/src/jobs/accountservicetoggle.h b/src/lib/accountservicetoggle.h
rename from src/jobs/accountservicetoggle.h
rename to src/lib/accountservicetoggle.h
--- a/src/jobs/accountservicetoggle.h
+++ b/src/lib/accountservicetoggle.h
@@ -19,12 +19,13 @@
 #ifndef ACCOUNTSERVICETOGGLE_H
 #define ACCOUNTSERVICETOGGLE_H
 
+#include "kaccounts_export.h"
 
 #include <kjob.h>
 
 #include <QStringList>
 
-class AccountServiceToggle : public KJob
+class KACCOUNTS_EXPORT AccountServiceToggle : public KJob
 {
     Q_OBJECT
     Q_PROPERTY(QString accountId READ accountId WRITE setAccountId NOTIFY accountIdChanged)
diff --git a/src/jobs/accountservicetoggle.cpp b/src/lib/accountservicetoggle.cpp
rename from src/jobs/accountservicetoggle.cpp
rename to src/lib/accountservicetoggle.cpp
diff --git a/src/jobs/createaccount.h b/src/lib/createaccount.h
rename from src/jobs/createaccount.h
rename to src/lib/createaccount.h
--- a/src/jobs/createaccount.h
+++ b/src/lib/createaccount.h
@@ -19,6 +19,8 @@
 #ifndef CREATE_ACCOUNT_JOB_H
 #define CREATE_ACCOUNT_JOB_H
 
+#include "kaccounts_export.h"
+
 #include <kjob.h>
 
 #include <QStringList>
@@ -37,7 +39,7 @@
     class IdentityInfo;
 }
 
-class CreateAccount : public KJob
+class KACCOUNTS_EXPORT CreateAccount : public KJob
 {
     Q_OBJECT
     Q_PROPERTY(QString providerName READ providerName WRITE setProviderName NOTIFY providerNameChanged)
diff --git a/src/jobs/createaccount.cpp b/src/lib/createaccount.cpp
rename from src/jobs/createaccount.cpp
rename to src/lib/createaccount.cpp
--- a/src/jobs/createaccount.cpp
+++ b/src/lib/createaccount.cpp
@@ -17,8 +17,8 @@
  *************************************************************************************/
 
 #include "createaccount.h"
-#include "lib/kaccountsuiplugin.h"
-#include "lib/core.h"
+#include "kaccountsuiplugin.h"
+#include "core.h"
 #include "uipluginsmanager.h"
 
 #include <QDebug>
diff --git a/src/lib/uipluginsmanager.cpp b/src/lib/uipluginsmanager.cpp
--- a/src/lib/uipluginsmanager.cpp
+++ b/src/lib/uipluginsmanager.cpp
@@ -18,7 +18,7 @@
 
 #include "uipluginsmanager.h"
 
-#include "lib/kaccountsuiplugin.h"
+#include "kaccountsuiplugin.h"
 
 #include <QHash>
 #include <QStringList>