diff --git a/lib/ClassBuilder.js b/lib/ClassBuilder.js
index caae2a8..74f2dc4 100644
--- a/lib/ClassBuilder.js
+++ b/lib/ClassBuilder.js
@@ -24,8 +24,8 @@
  *       the existing class tests in tact for a higher-level test.
  */
 
-var util    = require( __dirname + '/util' ),
-    warn    = require( __dirname + '/warn' ),
+var util    = require( './util' ),
+    warn    = require( './warn' ),
     Warning = warn.Warning,
 
     hasOwn = Object.prototype.hasOwnProperty,
diff --git a/lib/FallbackMemberBuilder.js b/lib/FallbackMemberBuilder.js
index 838ec73..b5eba83 100644
--- a/lib/FallbackMemberBuilder.js
+++ b/lib/FallbackMemberBuilder.js
@@ -22,7 +22,7 @@
 /**
  * Supertype
  */
-var MemberBuilder = require( __dirname + '/MemberBuilder' );
+var MemberBuilder = require( './MemberBuilder' );
 
 /**
  * Responsible for building class members
diff --git a/lib/FallbackVisibilityObjectFactory.js b/lib/FallbackVisibilityObjectFactory.js
index 864ca2b..29f03f3 100644
--- a/lib/FallbackVisibilityObjectFactory.js
+++ b/lib/FallbackVisibilityObjectFactory.js
@@ -41,7 +41,7 @@ module.exports = exports = function FallbackVisibilityObjectFactory()
 /**
  * "Inherit" from VisibilityObjectFactory
  */
-exports.prototype = require( __dirname + '/VisibilityObjectFactory' )();
+exports.prototype = require( './VisibilityObjectFactory' )();
 
 
 /**
diff --git a/lib/MemberBuilder.js b/lib/MemberBuilder.js
index 3d19332..c1c67fc 100644
--- a/lib/MemberBuilder.js
+++ b/lib/MemberBuilder.js
@@ -29,8 +29,8 @@
  * keywords ]. Decide on a common format.
  */
 
-var util       = require( __dirname + '/util' ),
-    Warning    = require( __dirname + '/warn' ).Warning,
+var util       = require( './util' ),
+    Warning    = require( './warn' ).Warning,
     visibility = [ 'public', 'protected', 'private' ]
 ;
 
diff --git a/lib/Trait.js b/lib/Trait.js
index d639e78..0ec841e 100644
--- a/lib/Trait.js
+++ b/lib/Trait.js
@@ -19,8 +19,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-var AbstractClass = require( __dirname + '/class_abstract' ),
-    ClassBuilder  = require( __dirname + '/ClassBuilder' );
+var AbstractClass = require( './class_abstract' ),
+    ClassBuilder  = require( './ClassBuilder' );
 
 
 /**
diff --git a/lib/VisibilityObjectFactory.js b/lib/VisibilityObjectFactory.js
index f61a5b3..bb03530 100644
--- a/lib/VisibilityObjectFactory.js
+++ b/lib/VisibilityObjectFactory.js
@@ -22,7 +22,7 @@
 /**
  * XXX: tightly coupled
  */
-var util = require( __dirname + '/util' );
+var util = require( './util' );
 
 
 /**
diff --git a/lib/VisibilityObjectFactoryFactory.js b/lib/VisibilityObjectFactoryFactory.js
index 292fc7f..a7ca2f6 100644
--- a/lib/VisibilityObjectFactoryFactory.js
+++ b/lib/VisibilityObjectFactoryFactory.js
@@ -23,12 +23,12 @@
  */
 
 // XXX: Tightly coupled
-var util = require( __dirname + '/util' ),
+var util = require( './util' ),
 
-    VisibilityObjectFactory = require( __dirname + '/VisibilityObjectFactory' ),
+    VisibilityObjectFactory = require( './VisibilityObjectFactory' ),
 
     FallbackVisibilityObjectFactory =
-        require( __dirname + '/FallbackVisibilityObjectFactory' )
+        require( './FallbackVisibilityObjectFactory' )
 ;
 
 
diff --git a/lib/class.js b/lib/class.js
index 65f8a41..b97fd5c 100644
--- a/lib/class.js
+++ b/lib/class.js
@@ -19,28 +19,28 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-var util         = require( __dirname + '/util' ),
-    ClassBuilder = require( __dirname + '/ClassBuilder' ),
+var util         = require( './util' ),
+    ClassBuilder = require( './ClassBuilder' ),
 
-    warn    = require( __dirname + '/warn' ),
+    warn    = require( './warn' ),
     Warning = warn.Warning,
 
-    MethodWrapperFactory = require( __dirname + '/MethodWrapperFactory' ),
-    wrappers             = require( __dirname + '/MethodWrappers' ).standard,
+    MethodWrapperFactory = require( './MethodWrapperFactory' ),
+    wrappers             = require( './MethodWrappers' ).standard,
 
     class_builder = ClassBuilder(
-        require( __dirname + '/MemberBuilder' )(
+        require( './MemberBuilder' )(
             MethodWrapperFactory( wrappers.wrapNew ),
             MethodWrapperFactory( wrappers.wrapOverride ),
             MethodWrapperFactory( wrappers.wrapProxy ),
-            require( __dirname + '/MemberBuilderValidator' )(
+            require( './MemberBuilderValidator' )(
                 function( warning )
                 {
                     warn.handle( Warning( warning ) );
                 }
             )
         ),
-        require( __dirname + '/VisibilityObjectFactoryFactory' )
+        require( './VisibilityObjectFactoryFactory' )
             .fromEnvironment()
     )
 ;
diff --git a/lib/class_abstract.js b/lib/class_abstract.js
index deb920d..752aaed 100644
--- a/lib/class_abstract.js
+++ b/lib/class_abstract.js
@@ -23,7 +23,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-var Class = require( __dirname + '/class' );
+var Class = require( './class' );
 
 
 /**
diff --git a/lib/class_final.js b/lib/class_final.js
index c7fabd1..d4532e6 100644
--- a/lib/class_final.js
+++ b/lib/class_final.js
@@ -19,7 +19,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-var Class = require( __dirname + '/class' );
+var Class = require( './class' );
 
 
 /**
diff --git a/lib/interface.js b/lib/interface.js
index a3b2227..9a1e3a2 100644
--- a/lib/interface.js
+++ b/lib/interface.js
@@ -19,19 +19,19 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-var util           = require( __dirname + '/util' ),
+var util           = require( './util' ),
 
-    MethodWrapperFactory = require( __dirname + '/MethodWrapperFactory' ),
-    wrappers             = require( __dirname + '/MethodWrappers' ).standard,
+    MethodWrapperFactory = require( './MethodWrapperFactory' ),
+    wrappers             = require( './MethodWrappers' ).standard,
 
-    member_builder = require( __dirname + '/MemberBuilder' )(
+    member_builder = require( './MemberBuilder' )(
         MethodWrapperFactory( wrappers.wrapNew ),
         MethodWrapperFactory( wrappers.wrapOverride ),
         MethodWrapperFactory( wrappers.wrapProxy ),
-        require( __dirname + '/MemberBuilderValidator' )()
+        require( './MemberBuilderValidator' )()
     ),
 
-    Class = require( __dirname + '/class' )
+    Class = require( './class' )
 ;
 
 
diff --git a/lib/util.js b/lib/util.js
index 6c35ba7..5627118 100644
--- a/lib/util.js
+++ b/lib/util.js
@@ -19,7 +19,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-var propParseKeywords = require( __dirname + '/prop_parser' ).parseKeywords;
+var propParseKeywords = require( './prop_parser' ).parseKeywords;
 
 
 /**
diff --git a/tools/combine b/tools/combine
index e78f9a0..9b804d5 100755
--- a/tools/combine
+++ b/tools/combine
@@ -33,7 +33,7 @@ RMTRAIL="$PATH_TOOLS/rmtrail"
 cat_modules=$(
     cd "$PATH_TOOLS/../" &&
     grep -rIo ' require(.*)' lib/ \
-        | sed "s/^lib\///;s/\.js://;s/require(.*'\/\(.*\)'.*/\1/" \
+        | sed "s/^lib\///;s/\.js://;s/require( *'\.\/\(.*\)'.*/\1/" \
         | node tools/combine-order.js
 ) || {
     echo "Failed to get module list" >&2