diff --git a/media_browser_plus.module b/media_browser_plus.module
index c50b5ce..73df0c5 100644
--- a/media_browser_plus.module
+++ b/media_browser_plus.module
@@ -289,7 +289,7 @@ function media_browser_plus_thumbnailsJSON(){
     $conditions[] = array("field" => array("field_folder", "tid", array($folder), "IN"));
     $order = array(array("property" => array("fid", "DESC")));
     $media_entities = media_browser_plus_load_multiple(array("conditions" =>$conditions, "order" => $order));
-    module_load_include('inc', 'media', 'media.browser');
+    module_load_include('inc', 'media', 'includes/media.browser');
     foreach($media_entities->results as $media){
       media_browser_build_media_item($media);
     }
diff --git a/media_browser_plus.pages.inc b/media_browser_plus.pages.inc
index 9f838b7..07566f1 100644
--- a/media_browser_plus.pages.inc
+++ b/media_browser_plus.pages.inc
@@ -17,7 +17,7 @@ function media_browser_plus_edit_multiple_form($fids) {
   $variables = array('ids' => $ids, 'paging' => false, 'apply_filter' => false);
   $media_items = media_browser_plus_load_multiple($variables)->results;
   // produce form via multiform
-  module_load_include('inc', 'media', 'media.pages');
+  module_load_include('inc', 'media', 'includes/media.pages');
   $form = media_page_multiedit($media_items);
   // @TODO: change to normale redirect once this works with multiform
   if (isset($_POST['op'])) {
@@ -130,7 +130,7 @@ function media_browser_plus_delete_multiple_form($form, &$form_state, $fids) {
   foreach(explode(" ", $fids) as $key => $value) {
     $files[$value] = $value;
   }
-  module_load_include('inc', 'media', 'media.pages');
+  module_load_include('inc', 'media', 'includes/media.pages');
   $form = media_multiple_delete_confirm($form, $form_state, $files);
   return $form;
 }