diff --git a/composer.json b/composer.json
index 70a30cb..11391f3 100644
--- a/composer.json
+++ b/composer.json
@@ -3,5 +3,14 @@
 		"michelf/php-markdown": "1.4.*@dev",
 		"suin/php-rss-writer": ">=1.0",
         "kanti/hub-updater": "0.1"
-    }
+    },
+	"autoload": {
+		"files": [
+			"system/includes/dispatch.php",
+			"system/includes/functions.php",
+			"system/admin/admin.php",
+			"system/includes/session.php",
+			"system/includes/opml.php"
+		]
+	}
 }
diff --git a/composer.lock b/composer.lock
index a2d12e4..da2c326 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "d7bc647b7c26ac62864fbe9199d1565a",
+    "hash": "42c6216df6dda4d98ab8a719067f67fa",
     "packages": [
         {
             "name": "kanti/hub-updater",
diff --git a/system/htmly.php b/system/htmly.php
index abb68e6..77074d6 100644
--- a/system/htmly.php
+++ b/system/htmly.php
@@ -3,14 +3,6 @@
 // Change this to your timezone
 date_default_timezone_set('Asia/Jakarta');
 
-// Explicitly including the dispatch framework,
-// and our functions.php file
-require 'system/includes/dispatch.php';
-require 'system/includes/functions.php';
-require 'system/admin/admin.php';
-require 'system/includes/session.php';
-include 'system/includes/opml.php';
-
 // Load the configuration file
 config('source', 'config/config.ini');
 if(config('timezone')) {
diff --git a/vendor/autoload.php b/vendor/autoload.php
index 4dd19fa..28ba9d8 100644
--- a/vendor/autoload.php
+++ b/vendor/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInit94770e161b9a4024b163320059f87e51::getLoader();
+return ComposerAutoloaderInit64c2697d5b966a012479c1c6698fd233::getLoader();
diff --git a/vendor/composer/autoload_files.php b/vendor/composer/autoload_files.php
new file mode 100644
index 0000000..088b780
--- /dev/null
+++ b/vendor/composer/autoload_files.php
@@ -0,0 +1,14 @@
+<?php
+
+// autoload_files.php @generated by Composer
+
+$vendorDir = dirname(dirname(__FILE__));
+$baseDir = dirname($vendorDir);
+
+return array(
+    $baseDir . '/system/includes/dispatch.php',
+    $baseDir . '/system/includes/functions.php',
+    $baseDir . '/system/admin/admin.php',
+    $baseDir . '/system/includes/session.php',
+    $baseDir . '/system/includes/opml.php',
+);
diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
index d883f20..1359519 100644
--- a/vendor/composer/autoload_real.php
+++ b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit94770e161b9a4024b163320059f87e51
+class ComposerAutoloaderInit64c2697d5b966a012479c1c6698fd233
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ class ComposerAutoloaderInit94770e161b9a4024b163320059f87e51
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit94770e161b9a4024b163320059f87e51', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit64c2697d5b966a012479c1c6698fd233', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit94770e161b9a4024b163320059f87e51', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit64c2697d5b966a012479c1c6698fd233', 'loadClassLoader'));
 
         $map = require __DIR__ . '/autoload_namespaces.php';
         foreach ($map as $namespace => $path) {
@@ -40,11 +40,16 @@ class ComposerAutoloaderInit94770e161b9a4024b163320059f87e51
 
         $loader->register(true);
 
+        $includeFiles = require __DIR__ . '/autoload_files.php';
+        foreach ($includeFiles as $file) {
+            composerRequire64c2697d5b966a012479c1c6698fd233($file);
+        }
+
         return $loader;
     }
 }
 
-function composerRequire94770e161b9a4024b163320059f87e51($file)
+function composerRequire64c2697d5b966a012479c1c6698fd233($file)
 {
     require $file;
 }