diff --git a/contrib/views_slideshow_cycle/views_slideshow_cycle.module b/contrib/views_slideshow_cycle/views_slideshow_cycle.module
index c172bca..9d9a4d7 100644
--- a/contrib/views_slideshow_cycle/views_slideshow_cycle.module
+++ b/contrib/views_slideshow_cycle/views_slideshow_cycle.module
@@ -50,6 +50,27 @@ function views_slideshow_cycle_help($path, $arg) {
   }
 }
 
+function views_slideshow_cycle_hook_info() {
+  $hooks = array(
+    'views_slideshow_slideshow_info' => array(
+      'group' => 'views_slideshow',
+    ),
+    'views_slideshow_option_definition' => array(
+      'group' => 'views_slideshow',
+    ),
+    'views_slideshow_slideshow_type_form' => array(
+      'group' => 'views_slideshow',
+    ),
+    'form_options_js' => array(
+      'group' => 'views_slideshow',
+    ),
+    'views_slideshow_options_form_validate' => array(
+      'group' => 'views_slideshow',
+    ),
+  );
+  return $hooks;
+}
+
 /**
  * Gets the path to the jQuery cycle library.
  *
diff --git a/views_slideshow_plugin_style_slideshow.inc b/views_slideshow_plugin_style_slideshow.inc
index bab2e1c..5ce90bf 100644
--- a/views_slideshow_plugin_style_slideshow.inc
+++ b/views_slideshow_plugin_style_slideshow.inc
@@ -16,9 +16,6 @@ class views_slideshow_plugin_style_slideshow extends views_plugin_style {
   function option_definition() {
     $options = parent::option_definition();
 
-    // Load all include files from views slideshow addons.
-    module_load_all_includes('views_slideshow.inc');
-
     // call every module using hook_views_slideshow_option_definition and merge
     // it's return value with the other default options.
     return array_merge($options, module_invoke_all('views_slideshow_option_definition'));