--- themebuilder.module	2009-02-20 01:00:36.000000000 +0100
+++ themebuilder_new.module	2009-02-20 00:41:35.000000000 +0100
@@ -10,38 +10,39 @@
 /**
  * Include the files
  */
-include_once "includes/help.inc";
-include_once "includes/help_tutorial.inc";
-include_once "includes/help_documentation.inc";
-include_once "includes/help_generate.inc";
-include_once "includes/themebuilder.inc";
-include_once "includes/themebuilder_file_new.inc";
-include_once "includes/themebuilder_file_open.inc";
-include_once "includes/themebuilder_edit_setup.inc";
-include_once "includes/themebuilder_edit_structure.inc";
-include_once "includes/themebuilder_edit_layout.inc";
-include_once "includes/themebuilder_edit_style.inc";
-include_once "includes/themebuilder_edit_typography.inc";
-include_once "includes/themebuilder_edit_color.inc";
-include_once "includes/themebuilder_edit_image.inc";
-include_once "includes/themebuilder_edit_print.inc";
-include_once "includes/themebuilder_view.inc";
-include_once "includes/themebuilder_generate.inc";
-include_once "templates/info.tpl.php";
-include_once "templates/pagetpl.tpl.php";
-include_once "templates/xtemplate.tpl.php";
-include_once "templates/smarty.tpl.php";
-include_once "templates/xhtml.tpl.php";
-include_once "templates/base_css.tpl.php";
-include_once "templates/style_css.tpl.php";
-include_once "templates/layout_css.tpl.php";
-include_once "templates/hacks_css.tpl.php";
-include_once "templates/print_css.tpl.php";
-include_once "templates/preview.tpl.php";
-include_once "templates/javascript_js.tpl.php";
-include_once "templates/gimp_palette_gpl.tpl.php";
-include_once "templates/kde_palette.tpl.php";
-include_once "templates/openofficeorg_palette_soc.tpl.php";
+module_load_include('inc', 'themebuilder', 'update.fetch');
+module_load_include('inc', 'themebuilder', 'includes/help');
+module_load_include('inc', 'themebuilder', 'includes/help_tutorial');
+module_load_include('inc', 'themebuilder', 'includes/help_documentation');
+module_load_include('inc', 'themebuilder', 'includes/help_generate');
+module_load_include('inc', 'themebuilder', 'includes/themebuilder');
+module_load_include('inc', 'themebuilder', 'includes/themebuilder_file_new');
+module_load_include('inc', 'themebuilder', 'includes/themebuilder_file_open');
+module_load_include('inc', 'themebuilder', 'includes/themebuilder_edit_setup');
+module_load_include('inc', 'themebuilder', 'includes/themebuilder_edit_structure');
+module_load_include('inc', 'themebuilder', 'includes/themebuilder_edit_layout');
+module_load_include('inc', 'themebuilder', 'includes/themebuilder_edit_style');
+module_load_include('inc', 'themebuilder', 'includes/themebuilder_edit_typography');
+module_load_include('inc', 'themebuilder', 'includes/themebuilder_edit_color');
+module_load_include('inc', 'themebuilder', 'includes/themebuilder_edit_image');
+module_load_include('inc', 'themebuilder', 'includes/themebuilder_edit_print');
+module_load_include('inc', 'themebuilder', 'includes/themebuilder_view');
+module_load_include('inc', 'themebuilder', 'includes/themebuilder_generate');
+module_load_include('php', 'themebuilder', 'templates/info.tpl');
+module_load_include('php', 'themebuilder', 'templates/pagetpl.tpl');
+module_load_include('php', 'themebuilder', 'templates/xtemplate.tpl');
+module_load_include('php', 'themebuilder', 'templates/smarty.tpl');
+module_load_include('php', 'themebuilder', 'templates/xhtml.tpl');
+module_load_include('php', 'themebuilder', 'templates/base_css.tpl');
+module_load_include('php', 'themebuilder', 'templates/style_css.tpl');
+module_load_include('php', 'themebuilder', 'templates/layout_css.tpl');
+module_load_include('php', 'themebuilder', 'templates/hacks_css.tpl');
+module_load_include('php', 'themebuilder', 'templates/print_css.tpl');
+module_load_include('php', 'themebuilder', 'templates/preview.tpl');
+module_load_include('php', 'themebuilder', 'templates/javascript_js.tpl');
+module_load_include('php', 'themebuilder', 'templates/gimp_palette_gpl.tpl');
+module_load_include('php', 'themebuilder', 'templates/kde_palette.tpl');
+module_load_include('php', 'themebuilder', 'templates/openofficeorg_palette_soc.tpl');
 
 /**
  * Implementation of hook_help().