diff --git a/containments/homescreen/package/contents/code/LayoutManager.js b/containments/homescreen/package/contents/code/LayoutManager.js
index c3dc37ee..34f0d306 100644
--- a/containments/homescreen/package/contents/code/LayoutManager.js
+++ b/containments/homescreen/package/contents/code/LayoutManager.js
@@ -17,8 +17,6 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-.pragma library
-
 
 var layout;
 var root;
diff --git a/containments/homescreen/package/contents/ui/AppletsArea.qml b/containments/homescreen/package/contents/ui/AppletsArea.qml
index 7f4b9b28..3becfa19 100644
--- a/containments/homescreen/package/contents/ui/AppletsArea.qml
+++ b/containments/homescreen/package/contents/ui/AppletsArea.qml
@@ -24,8 +24,6 @@ import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 import org.kde.kquickcontrolsaddons 2.0
 
-import "LayoutManager.js" as LayoutManager
-
 MouseEventListener {
     id: headerItem
     z: 999
@@ -69,7 +67,7 @@ MouseEventListener {
             if (draggingApplet) {
                 draggingApplet.animationsEnabled = false;
                 dndSpacer.height = draggingApplet.height;
-                LayoutManager.insertBefore(draggingApplet, dndSpacer);
+                root.layoutManager.insertBefore(draggingApplet, dndSpacer);
                 draggingApplet.parent = headerItem;
 
                 pos = mapToItem(headerItem, mouse.x, mouse.y);
@@ -98,9 +96,9 @@ MouseEventListener {
         if (itemUnderMouse && itemUnderMouse != dndSpacer) {
             dndSpacer.parent = colorScope;
             if (pos.y < itemUnderMouse.y + itemUnderMouse.height/2) {
-                LayoutManager.insertBefore(itemUnderMouse, dndSpacer);
+                root.layoutManager.insertBefore(itemUnderMouse, dndSpacer);
             } else {
-                LayoutManager.insertAfter(itemUnderMouse, dndSpacer);
+                root.layoutManager.insertAfter(itemUnderMouse, dndSpacer);
             }
         }
 
@@ -123,7 +121,7 @@ MouseEventListener {
 
         if (draggingApplet.x > -draggingApplet.width/4 && draggingApplet.x < draggingApplet.width/4) {
             draggingApplet.x = 0;
-            LayoutManager.insertBefore( dndSpacer, draggingApplet);
+            root.layoutManager.insertBefore( dndSpacer, draggingApplet);
             draggingApplet.animationsEnabled = true;
         } else {
             removeAnim.target = draggingApplet;
diff --git a/containments/homescreen/package/contents/ui/main.qml b/containments/homescreen/package/contents/ui/main.qml
index 9d94de59..4a79cc85 100644
--- a/containments/homescreen/package/contents/ui/main.qml
+++ b/containments/homescreen/package/contents/ui/main.qml
@@ -37,6 +37,7 @@ Item {
     property int buttonHeight: width/4
     property bool reorderingApps: false
     property bool locked: applicationsView.contentY < -applicationsView.headerItem.height + plasmoid.availableScreenRect.height
+    property var layoutManager: LayoutManager
 //END properties
 
 //BEGIN functions
diff --git a/containments/panel/contents/code/LayoutManager.js b/containments/panel/contents/code/LayoutManager.js
index c3dc37ee..34f0d306 100644
--- a/containments/panel/contents/code/LayoutManager.js
+++ b/containments/panel/contents/code/LayoutManager.js
@@ -17,8 +17,6 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 
-.pragma library
-
 
 var layout;
 var root;
diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml
index 423433a1..7af373f4 100644
--- a/containments/panel/contents/ui/main.qml
+++ b/containments/panel/contents/ui/main.qml
@@ -37,6 +37,7 @@ PlasmaCore.ColorScope {
     property int buttonHeight: width/4
     property bool reorderingApps: false
     property QtObject expandedApplet
+    property var layoutManager: LayoutManager
 
     Containment.onAppletAdded: {
         addApplet(applet, x, y);