--- /var/www/sites/all/modules/flexifield/flexifield_old.install	2008-08-04 08:02:11.000000000 +0200
+++ /var/www/sites/all/modules/flexifield/flexifield.install	2009-07-06 09:18:55.000000000 +0200
@@ -3,12 +3,15 @@
 
 // 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');
+function flexifield_install_load() {
+  include_once('./'. drupal_get_path('module', 'content') .'/content.module');
+}
 
 /**
  * Implementation of hook_install().
  */
 function flexifield_install() {
+  flexifield_install_load();
   content_notify('install', 'flexifield');
 }
 
@@ -16,6 +19,7 @@ function flexifield_install() {
  * Implementation of hook_uninstall().
  */
 function flexifield_uninstall() {
+  flexifield_install_load();
   content_notify('uninstall', 'flexifield');
 }
 
@@ -25,6 +29,7 @@ function flexifield_uninstall() {
  * Notify content module when this module is enabled.
  */
 function flexifield_enable() {
+  flexifield_install_load();
   content_notify('enable', 'flexifield');
 }
 
@@ -34,5 +39,6 @@ function flexifield_enable() {
  * Notify content module when this module is disabled.
  */
 function flexifield_disable() {
+  flexifield_install_load();
   content_notify('disable', 'flexifield');
 }