diff --git a/includes/CMakeLists.txt b/includes/CMakeLists.txt
index ab85b8e2c..2b60a5027 100644
--- a/includes/CMakeLists.txt
+++ b/includes/CMakeLists.txt
@@ -1,24 +1,28 @@
 if (NOT KDEPIM_ONLY_KLEO)
 
 add_subdirectory( tests )
 
 macro(install_headers _dir)
   file(GLOB _includes "${CMAKE_CURRENT_SOURCE_DIR}/${_dir}/[A-Za-z]*")
   install(FILES ${_includes} DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/${_dir} COMPONENT Devel)
 endmacro(install_headers)
 
 if(Akonadi_FOUND)
   install_headers( Akonadi )
 endif(Akonadi_FOUND)
 install_headers( KHolidays )
 install_headers( KABC )
 install_headers( KBlog )
 install_headers( KCal )
+install_headers( KIMAP )
 install_headers( KLDAP )
+install_headers( KMime )
 install_headers( KPIMIdentities )
 install_headers( KPIMUtils )
 install_headers( KResources )
+install_headers( KTNEF )
+install_headers( Mailtransport )
 install_headers( Syndication )
 install_headers( KPIMTextEdit )
 
 endif (NOT KDEPIM_ONLY_KLEO)
diff --git a/includes/KIMAP/Acl b/includes/KIMAP/Acl
new file mode 100644
index 000000000..d9f3fa9fd
--- /dev/null
+++ b/includes/KIMAP/Acl
@@ -0,0 +1 @@
+#include "../../kimap/acl.h"
diff --git a/includes/KIMAP/AclJobBase b/includes/KIMAP/AclJobBase
new file mode 100644
index 000000000..335a6c82b
--- /dev/null
+++ b/includes/KIMAP/AclJobBase
@@ -0,0 +1 @@
+#include "../../kimap/acljobbase.h"
diff --git a/includes/KIMAP/AppendJob b/includes/KIMAP/AppendJob
new file mode 100644
index 000000000..f0be87481
--- /dev/null
+++ b/includes/KIMAP/AppendJob
@@ -0,0 +1 @@
+#include "../../kimap/appendjob.h"
diff --git a/includes/KIMAP/CapabilitiesJob b/includes/KIMAP/CapabilitiesJob
new file mode 100644
index 000000000..9192abf84
--- /dev/null
+++ b/includes/KIMAP/CapabilitiesJob
@@ -0,0 +1 @@
+#include "../../kimap/capabilitiesjob.h"
diff --git a/includes/KIMAP/CloseJob b/includes/KIMAP/CloseJob
new file mode 100644
index 000000000..a9433a7f5
--- /dev/null
+++ b/includes/KIMAP/CloseJob
@@ -0,0 +1 @@
+#include "../../kimap/closejob.h"
diff --git a/includes/KIMAP/CopyJob b/includes/KIMAP/CopyJob
new file mode 100644
index 000000000..2f987e914
--- /dev/null
+++ b/includes/KIMAP/CopyJob
@@ -0,0 +1 @@
+#include "../../kimap/copyjob.h"
diff --git a/includes/KIMAP/CreateJob b/includes/KIMAP/CreateJob
new file mode 100644
index 000000000..05217ed12
--- /dev/null
+++ b/includes/KIMAP/CreateJob
@@ -0,0 +1 @@
+#include "../../kimap/createjob.h"
diff --git a/includes/KIMAP/DeleteAclJob b/includes/KIMAP/DeleteAclJob
new file mode 100644
index 000000000..42000abd4
--- /dev/null
+++ b/includes/KIMAP/DeleteAclJob
@@ -0,0 +1 @@
+#include "../../kimap/deleteacljob.h"
diff --git a/includes/KIMAP/DeleteJob b/includes/KIMAP/DeleteJob
new file mode 100644
index 000000000..82fbc0840
--- /dev/null
+++ b/includes/KIMAP/DeleteJob
@@ -0,0 +1 @@
+#include "../../kimap/deletejob.h"
diff --git a/includes/KIMAP/ExpungeJob b/includes/KIMAP/ExpungeJob
new file mode 100644
index 000000000..8999cbef9
--- /dev/null
+++ b/includes/KIMAP/ExpungeJob
@@ -0,0 +1 @@
+#include "../../kimap/expungejob.h"
diff --git a/includes/KIMAP/FetchJob b/includes/KIMAP/FetchJob
new file mode 100644
index 000000000..8a794f88e
--- /dev/null
+++ b/includes/KIMAP/FetchJob
@@ -0,0 +1 @@
+#include "../../kimap/fetchjob.h"
diff --git a/includes/KIMAP/GetAclJob b/includes/KIMAP/GetAclJob
new file mode 100644
index 000000000..1ced249ba
--- /dev/null
+++ b/includes/KIMAP/GetAclJob
@@ -0,0 +1 @@
+#include "../../kimap/getacljob.h"
diff --git a/includes/KIMAP/GetMetadataJob b/includes/KIMAP/GetMetadataJob
new file mode 100644
index 000000000..deb2953fe
--- /dev/null
+++ b/includes/KIMAP/GetMetadataJob
@@ -0,0 +1 @@
+#include "../../kimap/getmetadatajob.h"
diff --git a/includes/KIMAP/GetQuotaJob b/includes/KIMAP/GetQuotaJob
new file mode 100644
index 000000000..3d4f714c0
--- /dev/null
+++ b/includes/KIMAP/GetQuotaJob
@@ -0,0 +1 @@
+#include "../../kimap/getquotajob.h"
diff --git a/includes/KIMAP/GetQuotaRootJob b/includes/KIMAP/GetQuotaRootJob
new file mode 100644
index 000000000..de5eef9b8
--- /dev/null
+++ b/includes/KIMAP/GetQuotaRootJob
@@ -0,0 +1 @@
+#include "../../kimap/getquotarootjob.h"
diff --git a/includes/KIMAP/ImapSet b/includes/KIMAP/ImapSet
new file mode 100644
index 000000000..0a9db314b
--- /dev/null
+++ b/includes/KIMAP/ImapSet
@@ -0,0 +1 @@
+#include "../../kimap/imapset.h"
diff --git a/includes/KIMAP/Job b/includes/KIMAP/Job
new file mode 100644
index 000000000..7d3ce3f56
--- /dev/null
+++ b/includes/KIMAP/Job
@@ -0,0 +1 @@
+#include "../../kimap/job.h"
diff --git a/includes/KIMAP/ListJob b/includes/KIMAP/ListJob
new file mode 100644
index 000000000..1145a2f25
--- /dev/null
+++ b/includes/KIMAP/ListJob
@@ -0,0 +1 @@
+#include "../../kimap/listjob.h"
diff --git a/includes/KIMAP/ListRightsJob b/includes/KIMAP/ListRightsJob
new file mode 100644
index 000000000..a7e5bbdfd
--- /dev/null
+++ b/includes/KIMAP/ListRightsJob
@@ -0,0 +1 @@
+#include "../../kimap/listrightsjob.h"
diff --git a/includes/KIMAP/LoginJob b/includes/KIMAP/LoginJob
new file mode 100644
index 000000000..49117bb63
--- /dev/null
+++ b/includes/KIMAP/LoginJob
@@ -0,0 +1 @@
+#include "../../kimap/loginjob.h"
diff --git a/includes/KIMAP/LogoutJob b/includes/KIMAP/LogoutJob
new file mode 100644
index 000000000..db7de8038
--- /dev/null
+++ b/includes/KIMAP/LogoutJob
@@ -0,0 +1 @@
+#include "../../kimap/logoutjob.h"
diff --git a/includes/KIMAP/MetadataJobBase b/includes/KIMAP/MetadataJobBase
new file mode 100644
index 000000000..828e708a6
--- /dev/null
+++ b/includes/KIMAP/MetadataJobBase
@@ -0,0 +1 @@
+#include "../../kimap/metadatajobbase.h"
diff --git a/includes/KIMAP/MyRightsJob b/includes/KIMAP/MyRightsJob
new file mode 100644
index 000000000..1f2dc6603
--- /dev/null
+++ b/includes/KIMAP/MyRightsJob
@@ -0,0 +1 @@
+#include "../../kimap/myrightsjob.h"
diff --git a/includes/KIMAP/QuotaJobBase b/includes/KIMAP/QuotaJobBase
new file mode 100644
index 000000000..3e3ee3d51
--- /dev/null
+++ b/includes/KIMAP/QuotaJobBase
@@ -0,0 +1 @@
+#include "../../kimap/quotajobbase.h"
diff --git a/includes/KIMAP/RFCCodecs b/includes/KIMAP/RFCCodecs
new file mode 100644
index 000000000..50169c4fc
--- /dev/null
+++ b/includes/KIMAP/RFCCodecs
@@ -0,0 +1 @@
+#include "../../kimap/rfccodecs.h"
diff --git a/includes/KIMAP/RenameJob b/includes/KIMAP/RenameJob
new file mode 100644
index 000000000..9867ec79e
--- /dev/null
+++ b/includes/KIMAP/RenameJob
@@ -0,0 +1 @@
+#include "../../kimap/renamejob.h"
diff --git a/includes/KIMAP/SearchJob b/includes/KIMAP/SearchJob
new file mode 100644
index 000000000..c91b90d8a
--- /dev/null
+++ b/includes/KIMAP/SearchJob
@@ -0,0 +1 @@
+#include "../../kimap/searchjob.h"
diff --git a/includes/KIMAP/SelectJob b/includes/KIMAP/SelectJob
new file mode 100644
index 000000000..18174a4a8
--- /dev/null
+++ b/includes/KIMAP/SelectJob
@@ -0,0 +1 @@
+#include "../../kimap/selectjob.h"
diff --git a/includes/KIMAP/Session b/includes/KIMAP/Session
new file mode 100644
index 000000000..f30f721d6
--- /dev/null
+++ b/includes/KIMAP/Session
@@ -0,0 +1 @@
+#include "../../kimap/session.h"
diff --git a/includes/KIMAP/SessionUiProxy b/includes/KIMAP/SessionUiProxy
new file mode 100644
index 000000000..0169de88d
--- /dev/null
+++ b/includes/KIMAP/SessionUiProxy
@@ -0,0 +1 @@
+#include "../../kimap/sessionuiproxy.h"
diff --git a/includes/KIMAP/SetAclJob b/includes/KIMAP/SetAclJob
new file mode 100644
index 000000000..1cfdabf0a
--- /dev/null
+++ b/includes/KIMAP/SetAclJob
@@ -0,0 +1 @@
+#include "../../kimap/setacljob.h"
diff --git a/includes/KIMAP/SetMetadataJob b/includes/KIMAP/SetMetadataJob
new file mode 100644
index 000000000..031213966
--- /dev/null
+++ b/includes/KIMAP/SetMetadataJob
@@ -0,0 +1 @@
+#include "../../kimap/setmetadatajob.h"
diff --git a/includes/KIMAP/SetQuotaJob b/includes/KIMAP/SetQuotaJob
new file mode 100644
index 000000000..6992bbe6e
--- /dev/null
+++ b/includes/KIMAP/SetQuotaJob
@@ -0,0 +1 @@
+#include "../../kimap/setquotajob.h"
diff --git a/includes/KIMAP/StoreJob b/includes/KIMAP/StoreJob
new file mode 100644
index 000000000..aebdd4e1e
--- /dev/null
+++ b/includes/KIMAP/StoreJob
@@ -0,0 +1 @@
+#include "../../kimap/storejob.h"
diff --git a/includes/KIMAP/SubscribeJob b/includes/KIMAP/SubscribeJob
new file mode 100644
index 000000000..94bbded67
--- /dev/null
+++ b/includes/KIMAP/SubscribeJob
@@ -0,0 +1 @@
+#include "../../kimap/subscribejob.h"
diff --git a/includes/KIMAP/UnsubscribeJob b/includes/KIMAP/UnsubscribeJob
new file mode 100644
index 000000000..c6533a6a7
--- /dev/null
+++ b/includes/KIMAP/UnsubscribeJob
@@ -0,0 +1 @@
+#include "../../kimap/unsubscribejob.h"
diff --git a/includes/KMime/BoolFlags b/includes/KMime/BoolFlags
new file mode 100644
index 000000000..bd84bd0b1
--- /dev/null
+++ b/includes/KMime/BoolFlags
@@ -0,0 +1 @@
+#include "../../kmime/boolflags.h"
diff --git a/includes/KMime/KMimeCharFreq b/includes/KMime/KMimeCharFreq
new file mode 100644
index 000000000..fa8dc0e95
--- /dev/null
+++ b/includes/KMime/KMimeCharFreq
@@ -0,0 +1 @@
+#include "../../kmime/kmime_charfreq.h"
diff --git a/includes/KMime/KMimeCodecs b/includes/KMime/KMimeCodecs
new file mode 100644
index 000000000..31c712cda
--- /dev/null
+++ b/includes/KMime/KMimeCodecs
@@ -0,0 +1 @@
+#include "../../kmime/kmime_codecs.h"
diff --git a/includes/KMime/KMimeContent b/includes/KMime/KMimeContent
new file mode 100644
index 000000000..79e0f2f02
--- /dev/null
+++ b/includes/KMime/KMimeContent
@@ -0,0 +1 @@
+#include "../../kmime/kmime_content.h"
diff --git a/includes/KMime/KMimeContentIndex b/includes/KMime/KMimeContentIndex
new file mode 100644
index 000000000..0c2c8a460
--- /dev/null
+++ b/includes/KMime/KMimeContentIndex
@@ -0,0 +1 @@
+#include "../../kmime/kmime_contentindex.h"
diff --git a/includes/KMime/KMimeDateFormatter b/includes/KMime/KMimeDateFormatter
new file mode 100644
index 000000000..c3b79ecf2
--- /dev/null
+++ b/includes/KMime/KMimeDateFormatter
@@ -0,0 +1 @@
+#include "../../kmime/kmime_dateformatter.h"
diff --git a/includes/KMime/KMimeHeaderParsing b/includes/KMime/KMimeHeaderParsing
new file mode 100644
index 000000000..b73bac8ca
--- /dev/null
+++ b/includes/KMime/KMimeHeaderParsing
@@ -0,0 +1 @@
+#include "../../kmime/kmime_header_parsing.h"
diff --git a/includes/KMime/KMimeHeaders b/includes/KMime/KMimeHeaders
new file mode 100644
index 000000000..e2ed32d27
--- /dev/null
+++ b/includes/KMime/KMimeHeaders
@@ -0,0 +1 @@
+#include "../../kmime/kmime_headers.h"
diff --git a/includes/KMime/KMimeMDN b/includes/KMime/KMimeMDN
new file mode 100644
index 000000000..78ac8d253
--- /dev/null
+++ b/includes/KMime/KMimeMDN
@@ -0,0 +1 @@
+#include "../../kmime/kmime_mdn.h"
diff --git a/includes/KMime/KMimeMessage b/includes/KMime/KMimeMessage
new file mode 100644
index 000000000..ab133146a
--- /dev/null
+++ b/includes/KMime/KMimeMessage
@@ -0,0 +1 @@
+#include "../../kmime/kmime_message.h"
diff --git a/includes/KMime/KMimeNewsArticle b/includes/KMime/KMimeNewsArticle
new file mode 100644
index 000000000..020ee431a
--- /dev/null
+++ b/includes/KMime/KMimeNewsArticle
@@ -0,0 +1 @@
+#include "../../kmime/kmime_newsarticle.h"
diff --git a/includes/KMime/KMimeUtil b/includes/KMime/KMimeUtil
new file mode 100644
index 000000000..d859241a9
--- /dev/null
+++ b/includes/KMime/KMimeUtil
@@ -0,0 +1 @@
+#include "../../kmime/kmime_util.h"
diff --git a/includes/KTNEF/Formatter b/includes/KTNEF/Formatter
new file mode 100644
index 000000000..670fc90d2
--- /dev/null
+++ b/includes/KTNEF/Formatter
@@ -0,0 +1 @@
+#include "../../ktnef/formatter.h"
diff --git a/includes/KTNEF/KTNEFAttach b/includes/KTNEF/KTNEFAttach
new file mode 100644
index 000000000..27d99b8cb
--- /dev/null
+++ b/includes/KTNEF/KTNEFAttach
@@ -0,0 +1 @@
+#include "../../ktnef/ktnefattach.h"
diff --git a/includes/KTNEF/KTNEFDefs b/includes/KTNEF/KTNEFDefs
new file mode 100644
index 000000000..1b97a551e
--- /dev/null
+++ b/includes/KTNEF/KTNEFDefs
@@ -0,0 +1 @@
+#include "../../ktnef/ktnefdefs.h"
diff --git a/includes/KTNEF/KTNEFMessage b/includes/KTNEF/KTNEFMessage
new file mode 100644
index 000000000..d37b737d7
--- /dev/null
+++ b/includes/KTNEF/KTNEFMessage
@@ -0,0 +1 @@
+#include "../../ktnef/ktnefmessage.h"
diff --git a/includes/KTNEF/KTNEFParser b/includes/KTNEF/KTNEFParser
new file mode 100644
index 000000000..d6abcfaaf
--- /dev/null
+++ b/includes/KTNEF/KTNEFParser
@@ -0,0 +1 @@
+#include "../../ktnef/ktnefparser.h"
diff --git a/includes/KTNEF/KTNEFProperty b/includes/KTNEF/KTNEFProperty
new file mode 100644
index 000000000..f2b6cbc28
--- /dev/null
+++ b/includes/KTNEF/KTNEFProperty
@@ -0,0 +1 @@
+#include "../../ktnef/ktnefproperty.h"
diff --git a/includes/KTNEF/KTNEFPropertySet b/includes/KTNEF/KTNEFPropertySet
new file mode 100644
index 000000000..68ce2da66
--- /dev/null
+++ b/includes/KTNEF/KTNEFPropertySet
@@ -0,0 +1 @@
+#include "../../ktnef/ktnefpropertyset.h"
diff --git a/includes/KTNEF/KTNEFTWriter b/includes/KTNEF/KTNEFTWriter
new file mode 100644
index 000000000..2d811c72f
--- /dev/null
+++ b/includes/KTNEF/KTNEFTWriter
@@ -0,0 +1 @@
+#include "../../ktnef/ktnefwriter.h"
diff --git a/includes/Mailtransport/SMTPJob b/includes/Mailtransport/SMTPJob
new file mode 100644
index 000000000..29052a5dd
--- /dev/null
+++ b/includes/Mailtransport/SMTPJob
@@ -0,0 +1 @@
+#include "../../mailtransport/smtpjob.h"
diff --git a/includes/Mailtransport/SendmailJob b/includes/Mailtransport/SendmailJob
new file mode 100644
index 000000000..f0b867ab7
--- /dev/null
+++ b/includes/Mailtransport/SendmailJob
@@ -0,0 +1 @@
+#include "../../mailtransport/sendmailjob.h"
diff --git a/includes/Mailtransport/ServerTest b/includes/Mailtransport/ServerTest
new file mode 100644
index 000000000..6c82532f6
--- /dev/null
+++ b/includes/Mailtransport/ServerTest
@@ -0,0 +1 @@
+#include "../../mailtransport/servertest.h"
diff --git a/includes/Mailtransport/Transport b/includes/Mailtransport/Transport
new file mode 100644
index 000000000..d9a35a240
--- /dev/null
+++ b/includes/Mailtransport/Transport
@@ -0,0 +1 @@
+#include "../../mailtransport/transport.h"
diff --git a/includes/Mailtransport/TransportBase b/includes/Mailtransport/TransportBase
new file mode 100644
index 000000000..78f1c0b40
--- /dev/null
+++ b/includes/Mailtransport/TransportBase
@@ -0,0 +1 @@
+#include "../../mailtransport/transportbase.h"
diff --git a/includes/Mailtransport/TransportCombobox b/includes/Mailtransport/TransportCombobox
new file mode 100644
index 000000000..d90d14b57
--- /dev/null
+++ b/includes/Mailtransport/TransportCombobox
@@ -0,0 +1 @@
+#include "../../mailtransport/transportcombobox.h"
diff --git a/includes/Mailtransport/TransportConfigDialog b/includes/Mailtransport/TransportConfigDialog
new file mode 100644
index 000000000..561ff5392
--- /dev/null
+++ b/includes/Mailtransport/TransportConfigDialog
@@ -0,0 +1 @@
+#include "../../mailtransport/transportconfigdialog.h"
diff --git a/includes/Mailtransport/TransportJob b/includes/Mailtransport/TransportJob
new file mode 100644
index 000000000..151cf277e
--- /dev/null
+++ b/includes/Mailtransport/TransportJob
@@ -0,0 +1 @@
+#include "../../mailtransport/transportjob.h"
diff --git a/includes/Mailtransport/TransportManagementWidget b/includes/Mailtransport/TransportManagementWidget
new file mode 100644
index 000000000..373eade13
--- /dev/null
+++ b/includes/Mailtransport/TransportManagementWidget
@@ -0,0 +1 @@
+#include "../../mailtransport/transportmanagementwidget.h"
diff --git a/includes/Mailtransport/TransportManager b/includes/Mailtransport/TransportManager
new file mode 100644
index 000000000..c1b5723b0
--- /dev/null
+++ b/includes/Mailtransport/TransportManager
@@ -0,0 +1 @@
+#include "../../mailtransport/transportmanager.h"