diff --git a/applet.cpp b/applet.cpp
index 6c652c897..eca0417c1 100644
--- a/applet.cpp
+++ b/applet.cpp
@@ -60,7 +60,7 @@
 #include "plasma/widgets/widget.h"
 #include "plasma/widgets/lineedit.h"
 #include "plasma/widgets/pushbutton.h"
-#include "plasma/widgets/boxlayout.h"
+#include "plasma/layouts/boxlayout.h"
 
 //#define DYNAMIC_SHADOWS
 namespace Plasma
diff --git a/layouts/borderlayout.h b/layouts/borderlayout.h
index c18a05a81..b3ccdb355 100644
--- a/layouts/borderlayout.h
+++ b/layouts/borderlayout.h
@@ -24,7 +24,7 @@
 
 #include <plasma/plasma_export.h>
 #include <plasma/plasma.h>
-#include <plasma/widgets/layout.h>
+#include <plasma/layouts/layout.h>
 
 namespace Plasma {
 
diff --git a/layouts/boxlayout.h b/layouts/boxlayout.h
index 88739addd..bc35eb916 100644
--- a/layouts/boxlayout.h
+++ b/layouts/boxlayout.h
@@ -25,7 +25,7 @@
 #include <QtCore/QList>
 
 #include <plasma/plasma_export.h>
-#include <plasma/widgets/layout.h>
+#include <plasma/layouts/layout.h>
 
 namespace Plasma
 {
diff --git a/layouts/freelayout.cpp b/layouts/freelayout.cpp
index d9326d2c6..0e4f8557f 100644
--- a/layouts/freelayout.cpp
+++ b/layouts/freelayout.cpp
@@ -22,7 +22,7 @@
 
 #include <KDebug>
 
-#include <plasma/widgets/layout.h>
+#include <plasma/layouts/layout.h>
 
 namespace Plasma
 {
diff --git a/layouts/freelayout.h b/layouts/freelayout.h
index db0c7b99d..b24300c55 100644
--- a/layouts/freelayout.h
+++ b/layouts/freelayout.h
@@ -24,7 +24,7 @@
 #include <QtCore/QList>
 
 #include <plasma/plasma_export.h>
-#include <plasma/widgets/layout.h>
+#include <plasma/layouts/layout.h>
 
 namespace Plasma
 {
diff --git a/layouts/layout.h b/layouts/layout.h
index 6b154fa2d..5baa6b2fa 100644
--- a/layouts/layout.h
+++ b/layouts/layout.h
@@ -24,7 +24,7 @@
 #include <QtCore/QRectF>
 #include <QtCore/QSizeF>
 
-#include <plasma/widgets/layoutitem.h>
+#include <plasma/layouts/layoutitem.h>
 #include <plasma/plasma_export.h>
 
 namespace Plasma
diff --git a/layouts/nodelayout.h b/layouts/nodelayout.h
index d86a2ce4c..7c6fc5049 100644
--- a/layouts/nodelayout.h
+++ b/layouts/nodelayout.h
@@ -25,7 +25,7 @@
 
 #include <plasma/plasma_export.h>
 #include <plasma/plasma.h>
-#include <plasma/widgets/layout.h>
+#include <plasma/layouts/layout.h>
 
 namespace Plasma {
 
diff --git a/widgets/lineedit.h b/widgets/lineedit.h
index f43a2f309..32838d7bd 100644
--- a/widgets/lineedit.h
+++ b/widgets/lineedit.h
@@ -28,7 +28,7 @@
 
 #include <plasma/dataengine.h>
 #include <plasma/plasma.h>
-#include <plasma/widgets/layoutitem.h>
+#include <plasma/layouts/layoutitem.h>
 
 namespace Plasma
 {
diff --git a/widgets/widget.h b/widgets/widget.h
index 088a40d75..6b1175158 100644
--- a/widgets/widget.h
+++ b/widgets/widget.h
@@ -27,7 +27,7 @@
 #include <QtCore/QRectF>
 #include <QtCore/QSizeF>
 
-#include <plasma/widgets/layoutitem.h>
+#include <plasma/layouts/layoutitem.h>
 #include <plasma/plasma_export.h>
 
 namespace Plasma