diff --git a/application/modules/default/views/scripts/layout.phtml b/application/modules/default/views/scripts/layout.phtml
index e6a42a8079d5ef428e57f553e34eac1ab76a668a..9b754bf4b5be3a4ddd1b673eba0bb00afd003fd7 100644
--- a/application/modules/default/views/scripts/layout.phtml
+++ b/application/modules/default/views/scripts/layout.phtml
@@ -11,6 +11,7 @@ if (!$this->layout()->template) {
 $this->layout()->title = 'Office of Undergraduate Studies';
 $this->layout()->tagline = 'Course Approval';
 
+require_once 'UNL/Templates.php';
 $template = UNL_Templates::factory($this->layout()->template, array('sharedcodepath' => 'sharedcode'));
 $template->titlegraphic = '<h1>' . $this->layout()->title . '</h1>'
 						. '<h2>' . $this->layout()->tagline . '</h2>';
diff --git a/document_root/index.php b/document_root/index.php
index c84cda70d840dfa8250538abd9c3290ab2b6267d..2863822e15d485cea755ea93f6f14b762f83d5ef 100644
--- a/document_root/index.php
+++ b/document_root/index.php
@@ -6,8 +6,12 @@ define('APPLICATION_DIR', '../application');
 define('MODULES_DIR', APPLICATION_DIR . '/modules');
 
 set_include_path(get_include_path() . PATH_SEPARATOR . '../library');
-require_once 'Zend/Loader.php';
-Zend_Loader::registerAutoload('Unl_Loader');
+require_once 'Zend/Loader/Autoloader.php';
+require_once 'Unl/Loader.php';
+$autoloader = Zend_Loader_Autoloader::getInstance();
+$autoloader->registerNamespace('App_');
+$autoloader->registerNamespace('Unl_');
+$autoloader->pushAutoloader(new Unl_Loader_Autoloader());
 
 $config = new Zend_Config_Ini(APPLICATION_DIR . '/config.ini');
 
diff --git a/library/App/View/Helper/BulletinEntryDiff.php b/library/App/View/Helper/BulletinEntryDiff.php
index 3fa133415447826691d0fc331d0d1e6d7d3f567b..fbc640c40ed713384abc8220f5883a90dba0d422 100644
--- a/library/App/View/Helper/BulletinEntryDiff.php
+++ b/library/App/View/Helper/BulletinEntryDiff.php
@@ -181,6 +181,7 @@ class App_View_Helper_BulletinEntryDiff
         $delim = ' ';
 
         if (!self::$_diffRenderer) {
+            require_once 'Text/Diff/Renderer/inline.php';
             self::$_diffRenderer = new Text_Diff_Renderer_inline();
         }
 
@@ -194,6 +195,7 @@ class App_View_Helper_BulletinEntryDiff
             $proposedArray[] = $tok;
         }
 
+        require_once 'Text/Diff.php';
         $diff = new Text_Diff('auto', array($currentArray, $proposedArray));
         $diffText = ($diff->isEmpty() ? $current : self::$_diffRenderer->render($diff));