Index: skinr.module
===================================================================
--- skinr.module	(revision 4539)
+++ skinr.module	(working copy)
@@ -65,8 +65,12 @@
  * Implementation of hook_init().
  */
 function skinr_init() {
-  skinr_include('handlers');
-  skinr_module_include('skinr.inc');
+  static $run = FALSE;
+  if (!$run) {
+    skinr_include('handlers');
+    skinr_module_include('skinr.inc');
+    $run = TRUE;
+  }
 }
 
 /**
@@ -280,6 +284,11 @@
  * Implementation of hook_preprocess().
  */
 function skinr_preprocess(&$vars, $hook) {
+  // Let's make sure this has been run. There have been problems where other
+  // modules implement a theme function in their hook_init(), so we make doubly
+  // sure that the includes are included.
+  skinr_init();
+
   $skinr_data = skinr_fetch_data();
   $info = skinr_process_info_files();
   $current_theme = skinr_current_theme();