diff --git a/custom_formatters.module b/custom_formatters.module
index 1e8cdc2..3f978d0 100755
--- a/custom_formatters.module
+++ b/custom_formatters.module
@@ -7,9 +7,10 @@
 /**
  * Include additional files.
  */
-foreach (module_list() as $module) {
-  if (file_exists($file = dirname(__FILE__) . "/includes/{$module}.inc")) {
-    require_once $file;
+$includes = file_scan_directory(dirname(__FILE__) . '/includes', '.*\.inc');
+foreach ($includes as $inc) {
+  if (module_exists($inc->name)) {
+    require_once $inc->filename;
   }
 }