? skeleton_include.patch
Index: skeleton.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/skeleton/skeleton.module,v
retrieving revision 1.10
diff -u -p -r1.10 skeleton.module
--- skeleton.module	28 Dec 2008 22:45:13 -0000	1.10
+++ skeleton.module	29 Dec 2008 22:10:29 -0000
@@ -9,8 +9,6 @@
  * for actual functions.
  */
 
-include_once('skeleton_common.inc');
-
 /**
  * Implements hook_help()
  */
@@ -254,3 +252,33 @@ function skeleton_theme() {
     ),
   );
 }
+
+/**
+ * Get the data for a skeleton
+ *
+ * @param $skeleton_id
+ *   The id of the outline to act upon
+ * @return $result
+ *   An object containing elements from the {skeleton} table
+ */
+function skeleton_load($skeleton_id) {
+  $result = db_fetch_object(db_query("SELECT * FROM {skeleton} WHERE skeleton_id = %d", $skeleton_id));
+  return empty($result) ? FALSE : $result;
+}
+
+/**
+ * Get the data for a skeleton template
+ *
+ * @param $template_id
+ *   The id of the template to act upon
+ * @return $result
+ *   An object containing elements from the {skeleton_template} table
+ */
+function skeleton_template_load($template_id) {
+  $result = db_fetch_object(db_query("SELECT * FROM {skeleton_template} WHERE template_id = %d", $template_id));
+  if ($result->node_data) {
+    // node data is a complex serialized array
+    $result->node_data = unserialize($result->node_data);
+  }
+  return $result;
+}
Index: skeleton_common.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/skeleton/skeleton_common.inc,v
retrieving revision 1.4
diff -u -p -r1.4 skeleton_common.inc
--- skeleton_common.inc	8 Dec 2008 22:07:31 -0000	1.4
+++ skeleton_common.inc	29 Dec 2008 22:10:29 -0000
@@ -8,19 +8,6 @@
  */
 
 /**
- * Get the data for a skeleton
- *
- * @param $skeleton_id
- *   The id of the outline to act upon
- * @return $result
- *   An object containing elements from the {skeleton} table
- */
-function skeleton_load($skeleton_id) {
-  $result = db_fetch_object(db_query("SELECT * FROM {skeleton} WHERE skeleton_id = %d", $skeleton_id));
-  return empty($result) ? FALSE : $result;
-}
-
-/**
  * Get the data for a skeleton from a title
  * @param $skeleton
  *   The name of the outline to act upon
@@ -33,23 +20,6 @@ function skeleton_get_by_name($skeleton)
 }
 
 /**
- * Get the data for a skeleton template
- *
- * @param $template_id
- *   The id of the template to act upon
- * @return $result
- *   An object containing elements from the {skeleton_template} table
- */
-function skeleton_template_load($template_id) {
-  $result = db_fetch_object(db_query("SELECT * FROM {skeleton_template} WHERE template_id = %d", $template_id));
-  if ($result->node_data) {
-    // node data is a complex serialized array
-    $result->node_data = unserialize($result->node_data);
-  }
-  return $result;
-}
-
-/**
  * Get the data for a skeleton template from a title
  *
  * @param $template