diff --git a/Definition.php b/Definition.php
index e0a17fd5..e64ba925 100644
--- a/Definition.php
+++ b/Definition.php
@@ -1,5 +1,10 @@
 <?php
 
+require_once 'HTMLPurifier/AttrDef.php';
+require_once 'HTMLPurifier/ChildDef.php';
+require_once 'HTMLPurifier/Generator.php';
+require_once 'HTMLPurifier/Token.php';
+
 class HTMLPurifier_Definition
 {
     
diff --git a/HTMLPurifier.php b/HTMLPurifier.php
index 08e8751c..e469d480 100644
--- a/HTMLPurifier.php
+++ b/HTMLPurifier.php
@@ -1,5 +1,9 @@
 <?php
 
+require_once 'HTMLPurifier/Lexer.php';
+require_once 'HTMLPurifier/Definition.php';
+require_once 'HTMLPurifier/Generator.php';
+
 class HTMLPurifier
 {
     
@@ -14,11 +18,9 @@ class HTMLPurifier
     }
     
     function purify($html) {
-        
         $tokens = $this->lexer->tokenizeHTML($html);
         $tokens = $this->definition->purifyTokens($tokens);
         return $this->generator->generateFromTokens($tokens);
-        
     }
     
 }
diff --git a/Lexer.php b/Lexer.php
index b83b2458..0232d9a3 100644
--- a/Lexer.php
+++ b/Lexer.php
@@ -12,6 +12,8 @@ TODO:
 
 */
 
+require_once 'HTMLPurifier/Token.php';
+
 class HTMLPurifier_Lexer
 {
     
diff --git a/TODO.txt b/TODO.txt
index e7f47ca4..ec6758f2 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -6,7 +6,6 @@ Primary:
 Secondary:
 - Build an automated release system that will create minimal versions too
 - Build system that will in-line includes
-- Set up the file includes
 - Migrate all unit tests to use the lexer and generator
 - Build the entity lookup table
 
diff --git a/benchmarks/HTML_Lexer.php b/benchmarks/HTML_Lexer.php
index 52ce2ee9..105b3156 100644
--- a/benchmarks/HTML_Lexer.php
+++ b/benchmarks/HTML_Lexer.php
@@ -4,13 +4,15 @@
 
 set_time_limit(5);
 
+// emulates inserting a dir called HTMLPurifier into your class dir
+set_include_path(get_include_path() . PATH_SEPARATOR . '../../');
+
 // PEAR
 require_once 'Benchmark/Timer.php';
 require_once 'XML/HTMLSax3.php';
 require_once 'Text/Password.php';
 
-require_once '../Token.php';
-require_once '../Lexer.php';
+require_once 'HTMLPurifier/Lexer.php';
 
 class TinyTimer extends Benchmark_Timer
 {
diff --git a/tests/ChildDef.php b/tests/ChildDef.php
index a46147ea..ea9a21c9 100644
--- a/tests/ChildDef.php
+++ b/tests/ChildDef.php
@@ -1,5 +1,9 @@
 <?php
 
+require_once 'HTMLPurifier/ChildDef.php';
+require_once 'HTMLPurifier/Lexer.php';
+require_once 'HTMLPurifier/Generator.php';
+
 class Test_HTMLPurifier_ChildDef extends UnitTestCase
 {
     
diff --git a/tests/Definition.php b/tests/Definition.php
index 37f141ea..c4c8f923 100644
--- a/tests/Definition.php
+++ b/tests/Definition.php
@@ -1,5 +1,8 @@
 <?php
 
+require_once 'HTMLPurifier/Definition.php';
+require_once 'HTMLPurifier/Lexer.php';
+
 class Test_HTMLPurifier_Definition extends UnitTestCase
 {
     
diff --git a/tests/Generator.php b/tests/Generator.php
index ce0a2d14..ec215ec2 100644
--- a/tests/Generator.php
+++ b/tests/Generator.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once 'HTMLPurifier/Generator.php';
+
 class Test_HTMLPurifier_Generator extends UnitTestCase
 {
     
diff --git a/tests/HTMLPurifier.php b/tests/HTMLPurifier.php
index da9387e7..abe6ae4f 100644
--- a/tests/HTMLPurifier.php
+++ b/tests/HTMLPurifier.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once 'HTMLPurifier/HTMLPurifier.php';
+
 class Test_HTMLPurifier extends UnitTestCase
 {
     
diff --git a/tests/Lexer.php b/tests/Lexer.php
index ef1e95f3..f89577cf 100644
--- a/tests/Lexer.php
+++ b/tests/Lexer.php
@@ -4,6 +4,8 @@
     * Benchmark the SAX parser with my homemade one
  */
 
+require_once 'HTMLPurifier/Lexer.php';
+
 class Test_HTMLPurifier_Lexer extends UnitTestCase
 {
     
diff --git a/tests/index.php b/tests/index.php
index 4ca16c77..0cbf716b 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -7,15 +7,6 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../../');
 
 require_once 'XML/HTMLSax3.php'; // optional PEAR class
 
-// enforce proper namespacing
-require_once 'HTMLPurifier/HTMLPurifier.php';
-require_once 'HTMLPurifier/Lexer.php';
-require_once 'HTMLPurifier/Token.php';
-require_once 'HTMLPurifier/Definition.php';
-require_once 'HTMLPurifier/AttrDef.php';
-require_once 'HTMLPurifier/ChildDef.php';
-require_once 'HTMLPurifier/Generator.php';
-
 $test = new GroupTest('HTMLPurifier');
 
 $test->addTestFile('HTMLPurifier.php');