  	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
+index 31b46a4..f54304e 100644
 --- a/src/include/bootloader/routines/lib_iface.ycp
 +++ b/src/include/bootloader/routines/lib_iface.ycp
-@@ -25,9 +25,14 @@
+@@ -25,9 +25,13 @@
  textdomain "bootloader";
  
  import "System::Bootloader_API";
+-import "Storage";
 +import "BootArch";
 +import "BootStorage";
- import "Storage";
  import "Mode";
  
 +include "bootloader/routines/popups.ycp";

 
 boolean validate_image(string widget, map event){
   string value = (string) UI::QueryWidget(`id(widget),`Value);

     }
 
     /**
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
