diff --git a/identitydialog.cpp b/identitydialog.cpp
index 13e3d1db3..da547e0b1 100644
--- a/identitydialog.cpp
+++ b/identitydialog.cpp
@@ -51,7 +51,7 @@ using KMail::FolderRequester;
 #include <kpimidentities/identity.h>
 #include <libkdepim/addresseelineedit.h>
 // libkleopatra:
-#include "kleo/ui/keyrequester.h"
+#include "libkleo/ui/keyrequester.h"
 #include "kleo/cryptobackendfactory.h"
 
 #include <kpimutils/email.h>
diff --git a/keyresolver.cpp b/keyresolver.cpp
index 4eadfeb9f..56c0f7996 100644
--- a/keyresolver.cpp
+++ b/keyresolver.cpp
@@ -40,7 +40,7 @@
 #include "kleo_util.h"
 
 #include <kpimutils/email.h>
-#include "kleo/ui/keyselectiondialog.h"
+#include "libkleo/ui/keyselectiondialog.h"
 #include "kleo/cryptobackendfactory.h"
 #include "kleo/keylistjob.h"
 #include "kleo/dn.h"
diff --git a/keyresolver.h b/keyresolver.h
index 4a9ab6517..51907092e 100644
--- a/keyresolver.h
+++ b/keyresolver.h
@@ -37,7 +37,7 @@
 #ifndef __KLEO_KEYRESOLVER_H__
 #define __KLEO_KEYRESOLVER_H__
 
-#include "kleo/ui/keyapprovaldialog.h"
+#include "libkleo/ui/keyapprovaldialog.h"
 #include "kleo/enum.h"
 
 #include <libkpgp/kpgp.h> // for Kpgp::Result
diff --git a/kmcomposewin.cpp b/kmcomposewin.cpp
index ec21a5d23..b1365cd36 100644
--- a/kmcomposewin.cpp
+++ b/kmcomposewin.cpp
@@ -69,8 +69,8 @@ using KRecentAddress::RecentAddresses;
 #include "kleo/cryptobackendfactory.h"
 #include "kleo/exportjob.h"
 #include "kleo/specialjob.h"
-#include "kleo/ui/progressdialog.h"
-#include "kleo/ui/keyselectiondialog.h"
+#include "libkleo/ui/progressdialog.h"
+#include "libkleo/ui/keyselectiondialog.h"
 
 #include <mailtransport/transportcombobox.h>
 #include <mailtransport/transportmanager.h>
diff --git a/messagecomposer.cpp b/messagecomposer.cpp
index 6a1452789..9d3370fa6 100644
--- a/messagecomposer.cpp
+++ b/messagecomposer.cpp
@@ -55,8 +55,8 @@
 #include <kpimidentities/identity.h>
 #include <kpimidentities/identitymanager.h>
 
-#include "kleo/ui/keyselectiondialog.h"
-#include "kleo/ui/keyapprovaldialog.h"
+#include "libkleo/ui/keyselectiondialog.h"
+#include "libkleo/ui/keyapprovaldialog.h"
 #include "kleo/cryptobackendfactory.h"
 #include "kleo/keylistjob.h"
 #include "kleo/encryptjob.h"