diff -up --recursive public/sites/all/modules/video_upload/providers/youtube/zend_gdata.inc public/sites/all/modules/video_upload/providers/youtube/zend_gdata.inc
--- public/sites/all/modules/video_upload/providers/youtube/zend_gdata.inc	2009-09-04 13:51:16.000000000 -0700
+++ public/sites/all/modules/video_upload/providers/youtube/zend_gdata.inc	2010-04-24 13:00:45.000000000 -0700
@@ -278,7 +278,7 @@ function _video_upload_gdata_set_include
   static $path;
   if (!$path) {
     $path = get_include_path();
-    set_include_path($path . PATH_SEPARATOR . drupal_get_path('module', 'video_upload') . '/providers/youtube');
+    set_include_path($path . PATH_SEPARATOR . realpath(dirname(__FILE__)));
   }
 }
 
diff -up --recursive public/sites/all/modules/video_upload/video_upload.install public/sites/all/modules/video_upload/video_upload.install
--- public/sites/all/modules/video_upload/video_upload.install	2009-09-04 13:51:16.000000000 -0700
+++ public/sites/all/modules/video_upload/video_upload.install	2010-04-24 13:00:19.000000000 -0700
@@ -9,7 +9,7 @@
 
 // Updates happen in random order, whether or not the module is enabled,
 // so include critical code here just to be sure.
-include_once(drupal_get_path('module', 'content') .'/content.module');
+include_once realpath(dirname(__FILE__)) . '/../cck/content.module';
 
 /**
  * Implementation of hook_install().
@@ -67,7 +67,7 @@ function video_upload_requirements($phas
   // Get GData-specific requirements.
   // @todo: Once there is more than one provider, this can't be run at the
   //        install phase.
-  include_once drupal_get_path('module', 'video_upload') . '/video_upload.module';
+  include_once 'video_upload.module';
   video_upload_initialize_provider();
   $gdata_requirements = _video_upload_gdata_requirements($phase);
 
diff -up --recursive public/sites/all/modules/video_upload/video_upload.module public/sites/all/modules/video_upload/video_upload.module
--- public/sites/all/modules/video_upload/video_upload.module	2009-09-04 13:51:16.000000000 -0700
+++ public/sites/all/modules/video_upload/video_upload.module	2010-04-24 12:59:45.000000000 -0700
@@ -9,6 +9,8 @@
  *   See TODO.txt, and inline todo comments
  */
 
+require_once 'video_upload_widget.inc';
+
 /**
  * Video status levels.
  */
@@ -28,20 +30,13 @@ define('VIDEO_UPLOAD_SYNC', 1);
 define('VIDEO_UPLOAD_SYNC_APPEND', 2);
 
 /**
- * Implementation of hook_init().
- */
-function video_upload_init() {
-  module_load_include('inc', 'video_upload', 'video_upload_widget');
-}
-
-/**
  * Initialize the Video Upload provider.
  */
 function video_upload_initialize_provider() {
   // @TODO
   // Providers should be configurable (only applicable once there is more
   // than one provider though).
-  require_once drupal_get_path('module', 'video_upload') . '/providers/youtube/youtube.inc';
+  require_once 'providers/youtube/youtube.inc';
 }
 
 /**