      }
  
      /**
+diff --git a/src/include/bootloader/routines/popups.ycp b/src/include/bootloader/routines/popups.ycp
+index c3e8bd3..ad8627f 100644
+--- a/src/include/bootloader/routines/popups.ycp
++++ b/src/include/bootloader/routines/popups.ycp
+@@ -28,6 +28,7 @@
+     import "Popup";
+     import "Report";
+     import "String";
++    import "BootCommon";
+ 
+ /**
+  * Inform about not available functionality when no loader selected
 diff --git a/src/include/bootloader/routines/section_widgets.ycp b/src/include/bootloader/routines/section_widgets.ycp
 index 58c6dfa..77199af 100644
 --- a/src/include/bootloader/routines/section_widgets.ycp

 	DetectDisks ();
 	del_parts = BootStorage::getPartitionList (`deleted, getLoaderType(false));
diff --git a/src/include/bootloader/routines/lib_iface.ycp b/src/include/bootloader/routines/lib_iface.ycp
index 31b46a4..5659ccb 100644
--- a/src/include/bootloader/routines/lib_iface.ycp
+++ b/src/include/bootloader/routines/lib_iface.ycp
@@ -25,9 +25,14 @@
 textdomain "bootloader";
 
 import "System::Bootloader_API";
+import "BootArch";
+import "BootStorage";
 import "Storage";
 import "Mode";
 
+include "bootloader/routines/popups.ycp";

  * Loader the library has been initialized to use
  */
diff --git a/src/include/bootloader/routines/lilolike.ycp b/src/include/bootloader/routines/lilolike.ycp
index 1389e28..dc9ec3b 100644
--- a/src/include/bootloader/routines/lilolike.ycp
+++ b/src/include/bootloader/routines/lilolike.ycp
@@ -22,9 +22,8 @@ textdomain "bootloader";
 import "Arch";
 import "Mode";
 import "Storage";
-import "StorageDevices";
-import "BootArch";
-import "Map";
+import "BootStorage";
+import "BootCommon";
 
