diff --git a/kmcommands.h b/kmcommands.h
index 251f3a027..24c4446af 100644
--- a/kmcommands.h
+++ b/kmcommands.h
@@ -6,7 +6,7 @@
 #include "kmail_export.h"
 #include "messagecomposer/messagefactory.h"
 #include "messagelist/core/view.h"
-#include "searchpattern.h"
+#include "search/searchpattern.h"
 
 #include <akonadi/kmime/messagestatus.h>
 #include <kio/job.h>
diff --git a/searchdialog/searchwindow.cpp b/searchdialog/searchwindow.cpp
index 3e8d21922..e3b762dbf 100644
--- a/searchdialog/searchwindow.cpp
+++ b/searchdialog/searchwindow.cpp
@@ -27,7 +27,7 @@
 #include "kmcommands.h"
 #include "kmmainwidget.h"
 #include "mailcommon/kernel/mailkernel.h"
-#include "mailcommon/searchpatternedit.h"
+#include "mailcommon/search/searchpatternedit.h"
 #include "mailcommon/widgets/regexplineedit.h"
 #include "searchdescriptionattribute.h"
 #include "foldertreeview.h"
diff --git a/searchdialog/searchwindow.h b/searchdialog/searchwindow.h
index 6d1164618..881a8d600 100644
--- a/searchdialog/searchwindow.h
+++ b/searchdialog/searchwindow.h
@@ -22,7 +22,7 @@
 #ifndef KMAIL_SEARCHWINDOW_H
 #define KMAIL_SEARCHWINDOW_H
 
-#include "mailcommon/searchpattern.h"
+#include "mailcommon/search/searchpattern.h"
 #include "ui_searchwindow.h"
 
 #include <akonadi/collection.h>
diff --git a/ui/searchwindow.ui b/ui/searchwindow.ui
index 3fba10f9b..3b146de1e 100644
--- a/ui/searchwindow.ui
+++ b/ui/searchwindow.ui
@@ -167,7 +167,7 @@
   <customwidget>
    <class>MailCommon::SearchPatternEdit</class>
    <extends>QWidget</extends>
-   <header location="global">mailcommon/searchpatternedit.h</header>
+   <header location="global">mailcommon/search/searchpatternedit.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>