diff --git a/facetapi.facetapi.inc b/facetapi.facetapi.inc
index 7b4c15e..cabd809 100644
--- a/facetapi.facetapi.inc
+++ b/facetapi.facetapi.inc
@@ -27,6 +27,77 @@ function facetapi_facetapi_realm_info() {
 }
 
 /**
+ * Implements hook_facetapi_facet_info().
+ */
+function facetapi_facetapi_facet_info($searcher_info) {
+  $facets = array();
+  if (isset($searcher_info['types']['node']) && $searcher_info['include default facets']) {
+
+    $facets['bundle'] = array(
+      'label' => t('Content type'),
+      'description' => t('Filter by content type.'),
+      'field api bundles' => array('node'),
+      'map callback' => 'facetapi_map_bundle',
+      'values callback' => 'facetapi_callback_type_values',
+      'facet mincount allowed' => TRUE,
+      'dependency plugins' => array('role'),
+    );
+
+    $facets['author'] = array(
+      'label' => t('Author'),
+      'description' => t('Filter by author.'),
+      'field' => 'uid',
+      'map callback' => 'facetapi_map_author',
+      'values callback' => 'facetapi_callback_user_values',
+      'facet mincount allowed' => TRUE,
+      'dependency plugins' => array('bundle', 'role'),
+    );
+
+    $facets['language'] = array(
+      'label' => t('Language'),
+      'description' => t('Filter by language.'),
+      'field' => 'language',
+      'map callback' => 'facetapi_map_language',
+      'values callback' => 'facetapi_callback_language_values',
+      'facet mincount allowed' => TRUE,
+      'dependency plugins' => array('bundle', 'role'),
+    );
+
+    $facets['created'] = array(
+      'label' => t('Post date'),
+      'description' => t('Filter by the date the node was posted.'),
+      'query types' => array('date'),
+      'allowed operators' => array(FACETAPI_OPERATOR_AND => TRUE),
+      'map callback' => 'facetapi_map_date',
+      'min callback' => 'facetapi_get_min_date',
+      'max callback' => 'facetapi_get_max_date',
+      'dependency plugins' => array('bundle', 'role'),
+      'default sorts' => array(
+        array('active', SORT_DESC),
+        array('indexed', SORT_ASC),
+      ),
+    );
+
+    $facets['changed'] = array(
+      'label' => t('Updated date'),
+      'description' => t('Filter by the date the node was last modified.'),
+      'query types' => array('date'),
+      'allowed operators' => array(FACETAPI_OPERATOR_AND => TRUE),
+      'map callback' => 'facetapi_map_date',
+      'min callback' => 'facetapi_get_min_date',
+      'max callback' => 'facetapi_get_max_date',
+      'dependency plugins' => array('bundle', 'role'),
+      'default sorts' => array(
+        array('active', SORT_DESC),
+        array('indexed', SORT_ASC),
+      ),
+    );
+  }
+
+  return $facets;
+}
+
+/**
  * Implements hook_facetapi_sort_info().
  */
 function facetapi_facetapi_sort_info() {
diff --git a/facetapi.module b/facetapi.module
index 204173f..cdd18b8 100644
--- a/facetapi.module
+++ b/facetapi.module
@@ -82,6 +82,9 @@ function facetapi_hook_info() {
     'facetapi_empty_behaviors' => array(
       'group' => 'facetapi',
     ),
+    'facetapi_facet_info' => array(
+      'group' => 'facetapi',
+    ),
     'facetapi_filters' => array(
       'group' => 'facetapi',
     ),
@@ -851,83 +854,6 @@ function facetapi_get_enabled_facets($searcher, $realm_name = NULL) {
 
 ////
 ////
-//// Facet API hook implementations
-////
-////
-
-/**
- * Implements hook_facetapi_facet_info().
- */
-function facetapi_facetapi_facet_info($searcher_info) {
-  $facets = array();
-  if (isset($searcher_info['types']['node']) && $searcher_info['include default facets']) {
-
-    $facets['bundle'] = array(
-      'label' => t('Content type'),
-      'description' => t('Filter by content type.'),
-      'field api bundles' => array('node'),
-      'map callback' => 'facetapi_map_bundle',
-      'values callback' => 'facetapi_callback_type_values',
-      'facet mincount allowed' => TRUE,
-      'dependency plugins' => array('role'),
-    );
-
-    $facets['author'] = array(
-      'label' => t('Author'),
-      'description' => t('Filter by author.'),
-      'field' => 'uid',
-      'map callback' => 'facetapi_map_author',
-      'values callback' => 'facetapi_callback_user_values',
-      'facet mincount allowed' => TRUE,
-      'dependency plugins' => array('bundle', 'role'),
-    );
-
-    $facets['language'] = array(
-      'label' => t('Language'),
-      'description' => t('Filter by language.'),
-      'field' => 'language',
-      'map callback' => 'facetapi_map_language',
-      'values callback' => 'facetapi_callback_language_values',
-      'facet mincount allowed' => TRUE,
-      'dependency plugins' => array('bundle', 'role'),
-    );
-
-    $facets['created'] = array(
-      'label' => t('Post date'),
-      'description' => t('Filter by the date the node was posted.'),
-      'query types' => array('date'),
-      'allowed operators' => array(FACETAPI_OPERATOR_AND => TRUE),
-      'map callback' => 'facetapi_map_date',
-      'min callback' => 'facetapi_get_min_date',
-      'max callback' => 'facetapi_get_max_date',
-      'dependency plugins' => array('bundle', 'role'),
-      'default sorts' => array(
-        array('active', SORT_DESC),
-        array('indexed', SORT_ASC),
-      ),
-    );
-
-    $facets['changed'] = array(
-      'label' => t('Updated date'),
-      'description' => t('Filter by the date the node was last modified.'),
-      'query types' => array('date'),
-      'allowed operators' => array(FACETAPI_OPERATOR_AND => TRUE),
-      'map callback' => 'facetapi_map_date',
-      'min callback' => 'facetapi_get_min_date',
-      'max callback' => 'facetapi_get_max_date',
-      'dependency plugins' => array('bundle', 'role'),
-      'default sorts' => array(
-        array('active', SORT_DESC),
-        array('indexed', SORT_ASC),
-      ),
-    );
-  }
-
-  return $facets;
-}
-
-////
-////
 //// Utility functions
 ////
 ////