diff --git a/CHANGELOG b/CHANGELOG
index 69b6b694d..10fdbeb5c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 * 1.34.0 (2017-XX-XX)
 
+ * added namespaced aliases for all (non-deprecated) classes and interfaces
  * dropped HHVM support
  * dropped PHP 5.2 support
 
diff --git a/lib/Twig/BaseNodeVisitor.php b/lib/Twig/BaseNodeVisitor.php
index 1c917d2fb..30cd2beb5 100644
--- a/lib/Twig/BaseNodeVisitor.php
+++ b/lib/Twig/BaseNodeVisitor.php
@@ -48,3 +48,5 @@ abstract class Twig_BaseNodeVisitor implements Twig_NodeVisitorInterface
      */
     abstract protected function doLeaveNode(Twig_Node $node, Twig_Environment $env);
 }
+
+class_alias('Twig_BaseNodeVisitor', 'Twig\NodeVisitor\AbstractNodeVisitor', false);
diff --git a/lib/Twig/Cache/Filesystem.php b/lib/Twig/Cache/Filesystem.php
index cb3fec468..65976282b 100644
--- a/lib/Twig/Cache/Filesystem.php
+++ b/lib/Twig/Cache/Filesystem.php
@@ -89,3 +89,5 @@ class Twig_Cache_Filesystem implements Twig_CacheInterface
         return (int) @filemtime($key);
     }
 }
+
+class_alias('Twig_Cache_Filesystem', 'Twig\Cache\FilesystemCache', false);
diff --git a/lib/Twig/Cache/Null.php b/lib/Twig/Cache/Null.php
index 7a194950e..69d1d2f98 100644
--- a/lib/Twig/Cache/Null.php
+++ b/lib/Twig/Cache/Null.php
@@ -36,3 +36,5 @@ class Twig_Cache_Null implements Twig_CacheInterface
         return 0;
     }
 }
+
+class_alias('Twig_Cache_Null', 'Twig\Cache\NullCache', false);
diff --git a/lib/Twig/CacheInterface.php b/lib/Twig/CacheInterface.php
index 2a3f04dd0..776808bfe 100644
--- a/lib/Twig/CacheInterface.php
+++ b/lib/Twig/CacheInterface.php
@@ -54,3 +54,5 @@ interface Twig_CacheInterface
      */
     public function getTimestamp($key);
 }
+
+class_alias('Twig_CacheInterface', 'Twig\Cache\CacheInterface', false);
diff --git a/lib/Twig/Compiler.php b/lib/Twig/Compiler.php
index 170fcb6dd..2da8c4bfd 100644
--- a/lib/Twig/Compiler.php
+++ b/lib/Twig/Compiler.php
@@ -279,3 +279,5 @@ class Twig_Compiler implements Twig_CompilerInterface
         return sprintf('__internal_%s', hash('sha256', uniqid(mt_rand(), true), false));
     }
 }
+
+class_alias('Twig_Compiler', 'Twig\Compiler', false);
diff --git a/lib/Twig/ContainerRuntimeLoader.php b/lib/Twig/ContainerRuntimeLoader.php
index 3284569d8..814ab58bc 100644
--- a/lib/Twig/ContainerRuntimeLoader.php
+++ b/lib/Twig/ContainerRuntimeLoader.php
@@ -35,3 +35,5 @@ class Twig_ContainerRuntimeLoader implements Twig_RuntimeLoaderInterface
         }
     }
 }
+
+class_alias('Twig_ContainerRuntimeLoader', 'Twig\RuntimeLoader\ContainerRuntimeLoader', false);
diff --git a/lib/Twig/Environment.php b/lib/Twig/Environment.php
index f26289897..a41e5cb8d 100644
--- a/lib/Twig/Environment.php
+++ b/lib/Twig/Environment.php
@@ -1559,3 +1559,5 @@ class Twig_Environment
         $this->optionsHash = implode(':', $hashParts);
     }
 }
+
+class_alias('Twig_Environment', 'Twig\Environment', false);
diff --git a/lib/Twig/Error.php b/lib/Twig/Error.php
index cf6d88dcc..551304588 100644
--- a/lib/Twig/Error.php
+++ b/lib/Twig/Error.php
@@ -358,3 +358,5 @@ class Twig_Error extends Exception
         }
     }
 }
+
+class_alias('Twig_Error', 'Twig\Error\Error', false);
diff --git a/lib/Twig/Error/Loader.php b/lib/Twig/Error/Loader.php
index 68297201a..df566dd78 100644
--- a/lib/Twig/Error/Loader.php
+++ b/lib/Twig/Error/Loader.php
@@ -36,3 +36,5 @@ class Twig_Error_Loader extends Twig_Error
         $this->setTemplateLine(false);
     }
 }
+
+class_alias('Twig_Error_Loader', 'Twig\Error\LoaderError', false);
diff --git a/lib/Twig/Error/Runtime.php b/lib/Twig/Error/Runtime.php
index c4e41b1d0..3b24ad3a4 100644
--- a/lib/Twig/Error/Runtime.php
+++ b/lib/Twig/Error/Runtime.php
@@ -18,3 +18,5 @@
 class Twig_Error_Runtime extends Twig_Error
 {
 }
+
+class_alias('Twig_Error_Runtime', 'Twig\Error\RuntimeError', false);
diff --git a/lib/Twig/Error/Syntax.php b/lib/Twig/Error/Syntax.php
index bded07e56..9d09f2179 100644
--- a/lib/Twig/Error/Syntax.php
+++ b/lib/Twig/Error/Syntax.php
@@ -51,3 +51,5 @@ class Twig_Error_Syntax extends Twig_Error
         return array_keys($alternatives);
     }
 }
+
+class_alias('Twig_Error_Syntax', 'Twig\Error\SyntaxError', false);
diff --git a/lib/Twig/ExpressionParser.php b/lib/Twig/ExpressionParser.php
index 517ad14c7..4906f903e 100644
--- a/lib/Twig/ExpressionParser.php
+++ b/lib/Twig/ExpressionParser.php
@@ -737,3 +737,5 @@ class Twig_ExpressionParser
         return true;
     }
 }
+
+class_alias('Twig_ExpressionParser', 'Twig\ExpressionParser', false);
diff --git a/lib/Twig/Extension.php b/lib/Twig/Extension.php
index 5d72634a6..f1c01b7d1 100644
--- a/lib/Twig/Extension.php
+++ b/lib/Twig/Extension.php
@@ -63,3 +63,5 @@ abstract class Twig_Extension implements Twig_ExtensionInterface
         return get_class($this);
     }
 }
+
+class_alias('Twig_Extension', 'Twig\Extension\AbstractExtension', false);
diff --git a/lib/Twig/Extension/Core.php b/lib/Twig/Extension/Core.php
index 2bdbfdae2..34f9ef7d6 100644
--- a/lib/Twig/Extension/Core.php
+++ b/lib/Twig/Extension/Core.php
@@ -1608,3 +1608,5 @@ function twig_array_batch($items, $size, $fill = null)
 
     return $result;
 }
+
+class_alias('Twig_Extension_Core', 'Twig\Extension\CoreExtension', false);
diff --git a/lib/Twig/Extension/Debug.php b/lib/Twig/Extension/Debug.php
index d22a38550..d0cd1962b 100644
--- a/lib/Twig/Extension/Debug.php
+++ b/lib/Twig/Extension/Debug.php
@@ -23,7 +23,7 @@ class Twig_Extension_Debug extends Twig_Extension
             // false means that it was not set (and the default is on) or it explicitly enabled
             // xdebug.overload_var_dump produces HTML only when html_errors is also enabled
             && (false === ini_get('html_errors') || ini_get('html_errors'))
-            || 'cli' === php_sapi_name()
+            || 'cli' === PHP_SAPI
         ;
 
         return array(
@@ -63,3 +63,5 @@ function twig_var_dump(Twig_Environment $env, $context)
 
     return ob_get_clean();
 }
+
+class_alias('Twig_Extension_Debug', 'Twig\Extension\DebugExtension', false);
diff --git a/lib/Twig/Extension/Escaper.php b/lib/Twig/Extension/Escaper.php
index 118b6b367..46c2d84b6 100644
--- a/lib/Twig/Extension/Escaper.php
+++ b/lib/Twig/Extension/Escaper.php
@@ -108,3 +108,5 @@ function twig_raw_filter($string)
 {
     return $string;
 }
+
+class_alias('Twig_Extension_Escaper', 'Twig\Extension\EscaperExtension', false);
diff --git a/lib/Twig/Extension/Optimizer.php b/lib/Twig/Extension/Optimizer.php
index e100f0b54..6c62e3efc 100644
--- a/lib/Twig/Extension/Optimizer.php
+++ b/lib/Twig/Extension/Optimizer.php
@@ -31,3 +31,5 @@ class Twig_Extension_Optimizer extends Twig_Extension
         return 'optimizer';
     }
 }
+
+class_alias('Twig_Extension_Optimizer', 'Twig\Extension\OptimizerExtension', false);
diff --git a/lib/Twig/Extension/Profiler.php b/lib/Twig/Extension/Profiler.php
index 1d874ef8e..b81473c59 100644
--- a/lib/Twig/Extension/Profiler.php
+++ b/lib/Twig/Extension/Profiler.php
@@ -44,3 +44,5 @@ class Twig_Extension_Profiler extends Twig_Extension
         return 'profiler';
     }
 }
+
+class_alias('Twig_Extension_Profiler', 'Twig\Extension\ProfilerExtension', false);
diff --git a/lib/Twig/Extension/Sandbox.php b/lib/Twig/Extension/Sandbox.php
index 1469a1e04..5cb80a717 100644
--- a/lib/Twig/Extension/Sandbox.php
+++ b/lib/Twig/Extension/Sandbox.php
@@ -99,3 +99,5 @@ class Twig_Extension_Sandbox extends Twig_Extension
         return 'sandbox';
     }
 }
+
+class_alias('Twig_Extension_Sandbox', 'Twig\Extension\SandboxExtension', false);
diff --git a/lib/Twig/Extension/Staging.php b/lib/Twig/Extension/Staging.php
index 34b71d27e..d3a0f9c94 100644
--- a/lib/Twig/Extension/Staging.php
+++ b/lib/Twig/Extension/Staging.php
@@ -108,3 +108,5 @@ class Twig_Extension_Staging extends Twig_Extension
         return 'staging';
     }
 }
+
+class_alias('Twig_Extension_Staging', 'Twig\Extension\StagingExtension', false);
diff --git a/lib/Twig/Extension/StringLoader.php b/lib/Twig/Extension/StringLoader.php
index c41517397..2ce3c9924 100644
--- a/lib/Twig/Extension/StringLoader.php
+++ b/lib/Twig/Extension/StringLoader.php
@@ -43,3 +43,5 @@ function twig_template_from_string(Twig_Environment $env, $template)
 {
     return $env->createTemplate((string) $template);
 }
+
+class_alias('Twig_Extension_StringLoader', 'Twig\Extension\StringLoaderExtension', false);
diff --git a/lib/Twig/ExtensionInterface.php b/lib/Twig/ExtensionInterface.php
index c5214bd56..81e11b494 100644
--- a/lib/Twig/ExtensionInterface.php
+++ b/lib/Twig/ExtensionInterface.php
@@ -85,3 +85,5 @@ interface Twig_ExtensionInterface
      */
     public function getName();
 }
+
+class_alias('Twig_ExtensionInterface', 'Twig\Extension\ExtensionInterface', false);
diff --git a/lib/Twig/FactoryRuntimeLoader.php b/lib/Twig/FactoryRuntimeLoader.php
index f428047ca..2cdaded1d 100644
--- a/lib/Twig/FactoryRuntimeLoader.php
+++ b/lib/Twig/FactoryRuntimeLoader.php
@@ -35,3 +35,5 @@ class Twig_FactoryRuntimeLoader implements Twig_RuntimeLoaderInterface
         }
     }
 }
+
+class_alias('Twig_FactoryRuntimeLoader', 'Twig\RuntimeLoader\FactoryRuntimeLoader', false);
diff --git a/lib/Twig/FileExtensionEscapingStrategy.php b/lib/Twig/FileExtensionEscapingStrategy.php
index 47183726b..8f8cd2ee5 100644
--- a/lib/Twig/FileExtensionEscapingStrategy.php
+++ b/lib/Twig/FileExtensionEscapingStrategy.php
@@ -56,3 +56,5 @@ class Twig_FileExtensionEscapingStrategy
         }
     }
 }
+
+class_alias('Twig_FileExtensionEscapingStrategy', 'Twig\FileExtensionEscapingStrategy', false);
diff --git a/lib/Twig/Lexer.php b/lib/Twig/Lexer.php
index 834b54fbe..85390b28c 100644
--- a/lib/Twig/Lexer.php
+++ b/lib/Twig/Lexer.php
@@ -420,3 +420,5 @@ class Twig_Lexer implements Twig_LexerInterface
         $this->state = array_pop($this->states);
     }
 }
+
+class_alias('Twig_Lexer', 'Twig\Lexer', false);
diff --git a/lib/Twig/Loader/Array.php b/lib/Twig/Loader/Array.php
index 136376a3a..0aac76900 100644
--- a/lib/Twig/Loader/Array.php
+++ b/lib/Twig/Loader/Array.php
@@ -93,3 +93,5 @@ class Twig_Loader_Array implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
         return true;
     }
 }
+
+class_alias('Twig_Loader_Array', 'Twig\Loader\ArrayLoader', false);
diff --git a/lib/Twig/Loader/Chain.php b/lib/Twig/Loader/Chain.php
index ffa892b17..59a337969 100644
--- a/lib/Twig/Loader/Chain.php
+++ b/lib/Twig/Loader/Chain.php
@@ -147,3 +147,5 @@ class Twig_Loader_Chain implements Twig_LoaderInterface, Twig_ExistsLoaderInterf
         throw new Twig_Error_Loader(sprintf('Template "%s" is not defined%s.', $name, $exceptions ? ' ('.implode(', ', $exceptions).')' : ''));
     }
 }
+
+class_alias('Twig_Loader_Chain', 'Twig\Loader\ChainLoader', false);
diff --git a/lib/Twig/Loader/Filesystem.php b/lib/Twig/Loader/Filesystem.php
index 25be4e2d8..1275044f8 100644
--- a/lib/Twig/Loader/Filesystem.php
+++ b/lib/Twig/Loader/Filesystem.php
@@ -286,3 +286,5 @@ class Twig_Loader_Filesystem implements Twig_LoaderInterface, Twig_ExistsLoaderI
         ;
     }
 }
+
+class_alias('Twig_Loader_Filesystem', 'Twig\Loader\FilesystemLoader', false);
diff --git a/lib/Twig/LoaderInterface.php b/lib/Twig/LoaderInterface.php
index b02999723..459a70abb 100644
--- a/lib/Twig/LoaderInterface.php
+++ b/lib/Twig/LoaderInterface.php
@@ -53,3 +53,5 @@ interface Twig_LoaderInterface
      */
     public function isFresh($name, $time);
 }
+
+class_alias('Twig_LoaderInterface', 'Twig\Loader\LoaderInterface', false);
diff --git a/lib/Twig/Markup.php b/lib/Twig/Markup.php
index 535ebe9e3..8591d1f93 100644
--- a/lib/Twig/Markup.php
+++ b/lib/Twig/Markup.php
@@ -35,3 +35,5 @@ class Twig_Markup implements Countable
         return function_exists('mb_get_info') ? mb_strlen($this->content, $this->charset) : strlen($this->content);
     }
 }
+
+class_alias('Twig_Markup', 'Twig\Markup', false);
diff --git a/lib/Twig/Node.php b/lib/Twig/Node.php
index 807f198f2..d1f59e0b0 100644
--- a/lib/Twig/Node.php
+++ b/lib/Twig/Node.php
@@ -251,3 +251,5 @@ class Twig_Node implements Twig_NodeInterface
         return $this->name;
     }
 }
+
+class_alias('Twig_Node', 'Twig\Node\Node', false);
diff --git a/lib/Twig/Node/AutoEscape.php b/lib/Twig/Node/AutoEscape.php
index 570f23e49..17e4e3813 100644
--- a/lib/Twig/Node/AutoEscape.php
+++ b/lib/Twig/Node/AutoEscape.php
@@ -32,3 +32,5 @@ class Twig_Node_AutoEscape extends Twig_Node
         $compiler->subcompile($this->getNode('body'));
     }
 }
+
+class_alias('Twig_Node_AutoEscape', 'Twig\Node\AutoEscapeNode', false);
diff --git a/lib/Twig/Node/Block.php b/lib/Twig/Node/Block.php
index dfd8ceb8b..91752ad27 100644
--- a/lib/Twig/Node/Block.php
+++ b/lib/Twig/Node/Block.php
@@ -37,3 +37,5 @@ class Twig_Node_Block extends Twig_Node
         ;
     }
 }
+
+class_alias('Twig_Node_Block', 'Twig\Node\BlockNode', false);
diff --git a/lib/Twig/Node/BlockReference.php b/lib/Twig/Node/BlockReference.php
index d9b59378c..92a9f398a 100644
--- a/lib/Twig/Node/BlockReference.php
+++ b/lib/Twig/Node/BlockReference.php
@@ -30,3 +30,5 @@ class Twig_Node_BlockReference extends Twig_Node implements Twig_NodeOutputInter
         ;
     }
 }
+
+class_alias('Twig_Node_BlockReference', 'Twig\Node\BlockReferenceNode', false);
diff --git a/lib/Twig/Node/Body.php b/lib/Twig/Node/Body.php
index 2314c9abd..07dfef8b5 100644
--- a/lib/Twig/Node/Body.php
+++ b/lib/Twig/Node/Body.php
@@ -17,3 +17,5 @@
 class Twig_Node_Body extends Twig_Node
 {
 }
+
+class_alias('Twig_Node_Body', 'Twig\Node\BodyNode', false);
diff --git a/lib/Twig/Node/CheckSecurity.php b/lib/Twig/Node/CheckSecurity.php
index b9cf054aa..7258acb6a 100644
--- a/lib/Twig/Node/CheckSecurity.php
+++ b/lib/Twig/Node/CheckSecurity.php
@@ -76,3 +76,5 @@ class Twig_Node_CheckSecurity extends Twig_Node
         ;
     }
 }
+
+class_alias('Twig_Node_CheckSecurity', 'Twig\Node\CheckSecurityNode', false);
diff --git a/lib/Twig/Node/Do.php b/lib/Twig/Node/Do.php
index 94305c7a5..cdd7e77a4 100644
--- a/lib/Twig/Node/Do.php
+++ b/lib/Twig/Node/Do.php
@@ -31,3 +31,5 @@ class Twig_Node_Do extends Twig_Node
         ;
     }
 }
+
+class_alias('Twig_Node_Do', 'Twig\Node\DoNode', false);
diff --git a/lib/Twig/Node/Embed.php b/lib/Twig/Node/Embed.php
index 1786f36c6..3785d3a9f 100644
--- a/lib/Twig/Node/Embed.php
+++ b/lib/Twig/Node/Embed.php
@@ -42,3 +42,5 @@ class Twig_Node_Embed extends Twig_Node_Include
         ;
     }
 }
+
+class_alias('Twig_Node_Embed', 'Twig\Node\EmbedNode', false);
diff --git a/lib/Twig/Node/Expression.php b/lib/Twig/Node/Expression.php
index e609d812f..a99c4e63a 100644
--- a/lib/Twig/Node/Expression.php
+++ b/lib/Twig/Node/Expression.php
@@ -18,3 +18,5 @@
 abstract class Twig_Node_Expression extends Twig_Node
 {
 }
+
+class_alias('Twig_Node_Expression', 'Twig\Node\Expression\AbstractExpression', false);
diff --git a/lib/Twig/Node/Expression/Array.php b/lib/Twig/Node/Expression/Array.php
index 0c726c04b..0e77bb08b 100644
--- a/lib/Twig/Node/Expression/Array.php
+++ b/lib/Twig/Node/Expression/Array.php
@@ -79,3 +79,5 @@ class Twig_Node_Expression_Array extends Twig_Node_Expression
         $compiler->raw(')');
     }
 }
+
+class_alias('Twig_Node_Expression_Array', 'Twig\Node\Expression\ArrayExpression', false);
diff --git a/lib/Twig/Node/Expression/AssignName.php b/lib/Twig/Node/Expression/AssignName.php
index ceb728233..2e6b4c7ca 100644
--- a/lib/Twig/Node/Expression/AssignName.php
+++ b/lib/Twig/Node/Expression/AssignName.php
@@ -21,3 +21,5 @@ class Twig_Node_Expression_AssignName extends Twig_Node_Expression_Name
         ;
     }
 }
+
+class_alias('Twig_Node_Expression_AssignName', 'Twig\Node\Expression\AssignNameExpression', false);
diff --git a/lib/Twig/Node/Expression/Binary.php b/lib/Twig/Node/Expression/Binary.php
index d4787698e..2b545d984 100644
--- a/lib/Twig/Node/Expression/Binary.php
+++ b/lib/Twig/Node/Expression/Binary.php
@@ -33,3 +33,5 @@ abstract class Twig_Node_Expression_Binary extends Twig_Node_Expression
 
     abstract public function operator(Twig_Compiler $compiler);
 }
+
+class_alias('Twig_Node_Expression_Binary', 'Twig\Node\Expression\Binary\AbstractBinary', false);
diff --git a/lib/Twig/Node/Expression/Binary/Add.php b/lib/Twig/Node/Expression/Binary/Add.php
index 51bba4809..5a09d8367 100644
--- a/lib/Twig/Node/Expression/Binary/Add.php
+++ b/lib/Twig/Node/Expression/Binary/Add.php
@@ -16,3 +16,5 @@ class Twig_Node_Expression_Binary_Add extends Twig_Node_Expression_Binary
         return $compiler->raw('+');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_Add', 'Twig\Node\Expression\Binary\AddBinary', false);
diff --git a/lib/Twig/Node/Expression/Binary/And.php b/lib/Twig/Node/Expression/Binary/And.php
index 9b3997dad..9ffddce6b 100644
--- a/lib/Twig/Node/Expression/Binary/And.php
+++ b/lib/Twig/Node/Expression/Binary/And.php
@@ -16,3 +16,5 @@ class Twig_Node_Expression_Binary_And extends Twig_Node_Expression_Binary
         return $compiler->raw('&&');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_And', 'Twig\Node\Expression\Binary\AndBinary', false);
diff --git a/lib/Twig/Node/Expression/Binary/BitwiseAnd.php b/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
index fa9729db0..e46e9ebfa 100644
--- a/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
+++ b/lib/Twig/Node/Expression/Binary/BitwiseAnd.php
@@ -16,3 +16,5 @@ class Twig_Node_Expression_Binary_BitwiseAnd extends Twig_Node_Expression_Binary
         return $compiler->raw('&');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_BitwiseAnd', 'Twig\Node\Expression\Binary\BitwiseAndBinary', false);
diff --git a/lib/Twig/Node/Expression/Binary/BitwiseOr.php b/lib/Twig/Node/Expression/Binary/BitwiseOr.php
index e3be54851..5d7f1b7c0 100644
--- a/lib/Twig/Node/Expression/Binary/BitwiseOr.php
+++ b/lib/Twig/Node/Expression/Binary/BitwiseOr.php
@@ -16,3 +16,5 @@ class Twig_Node_Expression_Binary_BitwiseOr extends Twig_Node_Expression_Binary
         return $compiler->raw('|');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_BitwiseOr', 'Twig\Node\Expression\Binary\BitwiseOrBinary', false);
diff --git a/lib/Twig/Node/Expression/Binary/BitwiseXor.php b/lib/Twig/Node/Expression/Binary/BitwiseXor.php
index 9255d8f78..82edf516c 100644
--- a/lib/Twig/Node/Expression/Binary/BitwiseXor.php
+++ b/lib/Twig/Node/Expression/Binary/BitwiseXor.php
@@ -16,3 +16,5 @@ class Twig_Node_Expression_Binary_BitwiseXor extends Twig_Node_Expression_Binary
         return $compiler->raw('^');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_BitwiseXor', 'Twig\Node\Expression\Binary\BitwiseXorBinary', false);
diff --git a/lib/Twig/Node/Expression/Binary/Concat.php b/lib/Twig/Node/Expression/Binary/Concat.php
index 7de9070eb..91abca602 100644
--- a/lib/Twig/Node/Expression/Binary/Concat.php
+++ b/lib/Twig/Node/Expression/Binary/Concat.php
@@ -16,3 +16,5 @@ class Twig_Node_Expression_Binary_Concat extends Twig_Node_Expression_Binary
         return $compiler->raw('.');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_Concat', 'Twig\Node\Expression\Binary\ConcatBinary', false);
diff --git a/lib/Twig/Node/Expression/Binary/Div.php b/lib/Twig/Node/Expression/Binary/Div.php
index 386b4eabe..38ffa30c3 100644
--- a/lib/Twig/Node/Expression/Binary/Div.php
+++ b/lib/Twig/Node/Expression/Binary/Div.php
@@ -16,3 +16,5 @@ class Twig_Node_Expression_Binary_Div extends Twig_Node_Expression_Binary
         return $compiler->raw('/');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_Div', 'Twig\Node\Expression\Binary\DivBinary', false);
diff --git a/lib/Twig/Node/Expression/Binary/EndsWith.php b/lib/Twig/Node/Expression/Binary/EndsWith.php
index c24b720a4..85c529376 100644
--- a/lib/Twig/Node/Expression/Binary/EndsWith.php
+++ b/lib/Twig/Node/Expression/Binary/EndsWith.php
@@ -28,3 +28,5 @@ class Twig_Node_Expression_Binary_EndsWith extends Twig_Node_Expression_Binary
         return $compiler->raw('');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_EndsWith', 'Twig\Node\Expression\Binary\EndsWithBinary', false);
diff --git a/lib/Twig/Node/Expression/Binary/Equal.php b/lib/Twig/Node/Expression/Binary/Equal.php
index 4535cd082..a6a6946b6 100644
--- a/lib/Twig/Node/Expression/Binary/Equal.php
+++ b/lib/Twig/Node/Expression/Binary/Equal.php
@@ -15,3 +15,5 @@ class Twig_Node_Expression_Binary_Equal extends Twig_Node_Expression_Binary
         return $compiler->raw('==');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_Equal', 'Twig\Node\Expression\Binary\EqualBinary', false);
diff --git a/lib/Twig/Node/Expression/Binary/FloorDiv.php b/lib/Twig/Node/Expression/Binary/FloorDiv.php
index b386ae357..7393bcb89 100644
--- a/lib/Twig/Node/Expression/Binary/FloorDiv.php
+++ b/lib/Twig/Node/Expression/Binary/FloorDiv.php
@@ -22,3 +22,5 @@ class Twig_Node_Expression_Binary_FloorDiv extends Twig_Node_Expression_Binary
         return $compiler->raw('/');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_FloorDiv', 'Twig\Node\Expression\Binary\FloorDivBinary', false);
diff --git a/lib/Twig/Node/Expression/Binary/Greater.php b/lib/Twig/Node/Expression/Binary/Greater.php
index 52dcb3322..832f97977 100644
--- a/lib/Twig/Node/Expression/Binary/Greater.php
+++ b/lib/Twig/Node/Expression/Binary/Greater.php
@@ -15,3 +15,5 @@ class Twig_Node_Expression_Binary_Greater extends Twig_Node_Expression_Binary
         return $compiler->raw('>');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_Greater', 'Twig\Node\Expression\Binary\GreaterBinary', false);
diff --git a/lib/Twig/Node/Expression/Binary/GreaterEqual.php b/lib/Twig/Node/Expression/Binary/GreaterEqual.php
index 1d66d6c42..c5f762457 100644
--- a/lib/Twig/Node/Expression/Binary/GreaterEqual.php
+++ b/lib/Twig/Node/Expression/Binary/GreaterEqual.php
@@ -15,3 +15,5 @@ class Twig_Node_Expression_Binary_GreaterEqual extends Twig_Node_Expression_Bina
         return $compiler->raw('>=');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_GreaterEqual', 'Twig\Node\Expression\Binary\GreaterEqualBinary', false);
diff --git a/lib/Twig/Node/Expression/Binary/In.php b/lib/Twig/Node/Expression/Binary/In.php
index ba44961ac..af112448f 100644
--- a/lib/Twig/Node/Expression/Binary/In.php
+++ b/lib/Twig/Node/Expression/Binary/In.php
@@ -26,3 +26,5 @@ class Twig_Node_Expression_Binary_In extends Twig_Node_Expression_Binary
         return $compiler->raw('in');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_In', 'Twig\Node\Expression\Binary\InBinary', false);
diff --git a/lib/Twig/Node/Expression/Binary/Less.php b/lib/Twig/Node/Expression/Binary/Less.php
index c9d20c427..ab8fc1f9a 100644
--- a/lib/Twig/Node/Expression/Binary/Less.php
+++ b/lib/Twig/Node/Expression/Binary/Less.php
@@ -15,3 +15,5 @@ class Twig_Node_Expression_Binary_Less extends Twig_Node_Expression_Binary
         return $compiler->raw('<');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_Less', 'Twig\Node\Expression\Binary\LessBinary', false);
diff --git a/lib/Twig/Node/Expression/Binary/LessEqual.php b/lib/Twig/Node/Expression/Binary/LessEqual.php
index 219b3bdbf..71a279e9c 100644
--- a/lib/Twig/Node/Expression/Binary/LessEqual.php
+++ b/lib/Twig/Node/Expression/Binary/LessEqual.php
@@ -15,3 +15,5 @@ class Twig_Node_Expression_Binary_LessEqual extends Twig_Node_Expression_Binary
         return $compiler->raw('<=');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_LessEqual', 'Twig\Node\Expression\Binary\LessEqualBinary', false);
diff --git a/lib/Twig/Node/Expression/Binary/Matches.php b/lib/Twig/Node/Expression/Binary/Matches.php
index b22debf2f..5cb855842 100644
--- a/lib/Twig/Node/Expression/Binary/Matches.php
+++ b/lib/Twig/Node/Expression/Binary/Matches.php
@@ -26,3 +26,5 @@ class Twig_Node_Expression_Binary_Matches extends Twig_Node_Expression_Binary
         return $compiler->raw('');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_Matches', 'Twig\Node\Expression\Binary\MatchesBinary', false);
diff --git a/lib/Twig/Node/Expression/Binary/Mod.php b/lib/Twig/Node/Expression/Binary/Mod.php
index c99874ca3..28109633d 100644
--- a/lib/Twig/Node/Expression/Binary/Mod.php
+++ b/lib/Twig/Node/Expression/Binary/Mod.php
@@ -16,3 +16,5 @@ class Twig_Node_Expression_Binary_Mod extends Twig_Node_Expression_Binary
         return $compiler->raw('%');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_Mod', 'Twig\Node\Expression\Binary\ModBinary', false);
diff --git a/lib/Twig/Node/Expression/Binary/Mul.php b/lib/Twig/Node/Expression/Binary/Mul.php
index 0d24cee4e..790c6a22d 100644
--- a/lib/Twig/Node/Expression/Binary/Mul.php
+++ b/lib/Twig/Node/Expression/Binary/Mul.php
@@ -16,3 +16,5 @@ class Twig_Node_Expression_Binary_Mul extends Twig_Node_Expression_Binary
         return $compiler->raw('*');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_Mul', 'Twig\Node\Expression\Binary\MulBinary', false);
diff --git a/lib/Twig/Node/Expression/Binary/NotEqual.php b/lib/Twig/Node/Expression/Binary/NotEqual.php
index 69eae7e85..bb45c9ed5 100644
--- a/lib/Twig/Node/Expression/Binary/NotEqual.php
+++ b/lib/Twig/Node/Expression/Binary/NotEqual.php
@@ -15,3 +15,5 @@ class Twig_Node_Expression_Binary_NotEqual extends Twig_Node_Expression_Binary
         return $compiler->raw('!=');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_NotEqual', 'Twig\Node\Expression\Binary\NotEqualBinary', false);
diff --git a/lib/Twig/Node/Expression/Binary/NotIn.php b/lib/Twig/Node/Expression/Binary/NotIn.php
index f276da7d6..9dedf92f9 100644
--- a/lib/Twig/Node/Expression/Binary/NotIn.php
+++ b/lib/Twig/Node/Expression/Binary/NotIn.php
@@ -26,3 +26,5 @@ class Twig_Node_Expression_Binary_NotIn extends Twig_Node_Expression_Binary
         return $compiler->raw('not in');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_NotIn', 'Twig\Node\Expression\Binary\NotInBinary', false);
diff --git a/lib/Twig/Node/Expression/Binary/Or.php b/lib/Twig/Node/Expression/Binary/Or.php
index 7621763dd..dc9eece14 100644
--- a/lib/Twig/Node/Expression/Binary/Or.php
+++ b/lib/Twig/Node/Expression/Binary/Or.php
@@ -16,3 +16,5 @@ class Twig_Node_Expression_Binary_Or extends Twig_Node_Expression_Binary
         return $compiler->raw('||');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_Or', 'Twig\Node\Expression\Binary\OrBinary', false);
diff --git a/lib/Twig/Node/Expression/Binary/Power.php b/lib/Twig/Node/Expression/Binary/Power.php
index d3225ded9..d24777bd5 100644
--- a/lib/Twig/Node/Expression/Binary/Power.php
+++ b/lib/Twig/Node/Expression/Binary/Power.php
@@ -30,3 +30,5 @@ class Twig_Node_Expression_Binary_Power extends Twig_Node_Expression_Binary
         return $compiler->raw('**');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_Power', 'Twig\Node\Expression\Binary\PowerBinary', false);
diff --git a/lib/Twig/Node/Expression/Binary/Range.php b/lib/Twig/Node/Expression/Binary/Range.php
index 4261cdea7..187f67653 100644
--- a/lib/Twig/Node/Expression/Binary/Range.php
+++ b/lib/Twig/Node/Expression/Binary/Range.php
@@ -26,3 +26,5 @@ class Twig_Node_Expression_Binary_Range extends Twig_Node_Expression_Binary
         return $compiler->raw('..');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_Range', 'Twig\Node\Expression\Binary\RangeBinary', false);
diff --git a/lib/Twig/Node/Expression/Binary/StartsWith.php b/lib/Twig/Node/Expression/Binary/StartsWith.php
index d1e9a5a7f..7e43b8de0 100644
--- a/lib/Twig/Node/Expression/Binary/StartsWith.php
+++ b/lib/Twig/Node/Expression/Binary/StartsWith.php
@@ -28,3 +28,5 @@ class Twig_Node_Expression_Binary_StartsWith extends Twig_Node_Expression_Binary
         return $compiler->raw('');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_StartsWith', 'Twig\Node\Expression\Binary\StartsWithBinary', false);
diff --git a/lib/Twig/Node/Expression/Binary/Sub.php b/lib/Twig/Node/Expression/Binary/Sub.php
index b423d3eef..cff8ed075 100644
--- a/lib/Twig/Node/Expression/Binary/Sub.php
+++ b/lib/Twig/Node/Expression/Binary/Sub.php
@@ -16,3 +16,5 @@ class Twig_Node_Expression_Binary_Sub extends Twig_Node_Expression_Binary
         return $compiler->raw('-');
     }
 }
+
+class_alias('Twig_Node_Expression_Binary_Sub', 'Twig\Node\Expression\Binary\SubBinary', false);
diff --git a/lib/Twig/Node/Expression/BlockReference.php b/lib/Twig/Node/Expression/BlockReference.php
index 056d99185..37a3983d6 100644
--- a/lib/Twig/Node/Expression/BlockReference.php
+++ b/lib/Twig/Node/Expression/BlockReference.php
@@ -89,3 +89,5 @@ class Twig_Node_Expression_BlockReference extends Twig_Node_Expression
         return $compiler->raw(')');
     }
 }
+
+class_alias('Twig_Node_Expression_BlockReference', 'Twig\Node\Expression\BlockReferenceExpression', false);
diff --git a/lib/Twig/Node/Expression/Call.php b/lib/Twig/Node/Expression/Call.php
index 277679724..d962b6a50 100644
--- a/lib/Twig/Node/Expression/Call.php
+++ b/lib/Twig/Node/Expression/Call.php
@@ -287,3 +287,5 @@ abstract class Twig_Node_Expression_Call extends Twig_Node_Expression
         return $this->reflector = array($r, $callable);
     }
 }
+
+class_alias('Twig_Node_Expression_Call', 'Twig\Node\Expression\CallExpression', false);
diff --git a/lib/Twig/Node/Expression/Conditional.php b/lib/Twig/Node/Expression/Conditional.php
index 67cca1fd2..c339d773c 100644
--- a/lib/Twig/Node/Expression/Conditional.php
+++ b/lib/Twig/Node/Expression/Conditional.php
@@ -29,3 +29,5 @@ class Twig_Node_Expression_Conditional extends Twig_Node_Expression
         ;
     }
 }
+
+class_alias('Twig_Node_Expression_Conditional', 'Twig\Node\Expression\ConditionalExpression', false);
diff --git a/lib/Twig/Node/Expression/Constant.php b/lib/Twig/Node/Expression/Constant.php
index 1a2c5964f..bf4d031cf 100644
--- a/lib/Twig/Node/Expression/Constant.php
+++ b/lib/Twig/Node/Expression/Constant.php
@@ -21,3 +21,5 @@ class Twig_Node_Expression_Constant extends Twig_Node_Expression
         $compiler->repr($this->getAttribute('value'));
     }
 }
+
+class_alias('Twig_Node_Expression_Constant', 'Twig\Node\Expression\ConstantExpression', false);
diff --git a/lib/Twig/Node/Expression/Filter.php b/lib/Twig/Node/Expression/Filter.php
index a8fa847a8..12da1d676 100644
--- a/lib/Twig/Node/Expression/Filter.php
+++ b/lib/Twig/Node/Expression/Filter.php
@@ -37,3 +37,5 @@ class Twig_Node_Expression_Filter extends Twig_Node_Expression_Call
         $this->compileCallable($compiler);
     }
 }
+
+class_alias('Twig_Node_Expression_Filter', 'Twig\Node\Expression\FilterExpression', false);
diff --git a/lib/Twig/Node/Expression/Filter/Default.php b/lib/Twig/Node/Expression/Filter/Default.php
index d32d86d34..d2e19d54e 100644
--- a/lib/Twig/Node/Expression/Filter/Default.php
+++ b/lib/Twig/Node/Expression/Filter/Default.php
@@ -41,3 +41,5 @@ class Twig_Node_Expression_Filter_Default extends Twig_Node_Expression_Filter
         $compiler->subcompile($this->getNode('node'));
     }
 }
+
+class_alias('Twig_Node_Expression_Filter_Default', 'Twig\Node\Expression\Filter\DefaultFilter', false);
diff --git a/lib/Twig/Node/Expression/Function.php b/lib/Twig/Node/Expression/Function.php
index eaad56ec0..cdee7c972 100644
--- a/lib/Twig/Node/Expression/Function.php
+++ b/lib/Twig/Node/Expression/Function.php
@@ -41,3 +41,5 @@ class Twig_Node_Expression_Function extends Twig_Node_Expression_Call
         $this->compileCallable($compiler);
     }
 }
+
+class_alias('Twig_Node_Expression_Function', 'Twig\Node\Expression\FunctionExpression', false);
diff --git a/lib/Twig/Node/Expression/GetAttr.php b/lib/Twig/Node/Expression/GetAttr.php
index 75814265c..b7823accb 100644
--- a/lib/Twig/Node/Expression/GetAttr.php
+++ b/lib/Twig/Node/Expression/GetAttr.php
@@ -70,3 +70,5 @@ class Twig_Node_Expression_GetAttr extends Twig_Node_Expression
         $compiler->raw(')');
     }
 }
+
+class_alias('Twig_Node_Expression_GetAttr', 'Twig\Node\Expression\GetAttrExpression', false);
diff --git a/lib/Twig/Node/Expression/MethodCall.php b/lib/Twig/Node/Expression/MethodCall.php
index 39481337b..709016eb2 100644
--- a/lib/Twig/Node/Expression/MethodCall.php
+++ b/lib/Twig/Node/Expression/MethodCall.php
@@ -39,3 +39,5 @@ class Twig_Node_Expression_MethodCall extends Twig_Node_Expression
         $compiler->raw(')');
     }
 }
+
+class_alias('Twig_Node_Expression_MethodCall', 'Twig\Node\Expression\MethodCallExpression', false);
diff --git a/lib/Twig/Node/Expression/Name.php b/lib/Twig/Node/Expression/Name.php
index e03ca3578..9d5a21f87 100644
--- a/lib/Twig/Node/Expression/Name.php
+++ b/lib/Twig/Node/Expression/Name.php
@@ -98,3 +98,5 @@ class Twig_Node_Expression_Name extends Twig_Node_Expression
         return !$this->isSpecial() && !$this->getAttribute('is_defined_test');
     }
 }
+
+class_alias('Twig_Node_Expression_Name', 'Twig\Node\Expression\NameExpression', false);
diff --git a/lib/Twig/Node/Expression/NullCoalesce.php b/lib/Twig/Node/Expression/NullCoalesce.php
index 14f6358fd..eaafa4c91 100644
--- a/lib/Twig/Node/Expression/NullCoalesce.php
+++ b/lib/Twig/Node/Expression/NullCoalesce.php
@@ -44,3 +44,5 @@ class Twig_Node_Expression_NullCoalesce extends Twig_Node_Expression_Conditional
         }
     }
 }
+
+class_alias('Twig_Node_Expression_NullCoalesce', 'Twig\Node\Expression\NullCoalesceExpression', false);
diff --git a/lib/Twig/Node/Expression/Parent.php b/lib/Twig/Node/Expression/Parent.php
index e7d82d81c..78692db29 100644
--- a/lib/Twig/Node/Expression/Parent.php
+++ b/lib/Twig/Node/Expression/Parent.php
@@ -40,3 +40,5 @@ class Twig_Node_Expression_Parent extends Twig_Node_Expression
         }
     }
 }
+
+class_alias('Twig_Node_Expression_Parent', 'Twig\Node\Expression\ParentExpression', false);
diff --git a/lib/Twig/Node/Expression/TempName.php b/lib/Twig/Node/Expression/TempName.php
index 09a04a319..0a86e003d 100644
--- a/lib/Twig/Node/Expression/TempName.php
+++ b/lib/Twig/Node/Expression/TempName.php
@@ -24,3 +24,5 @@ class Twig_Node_Expression_TempName extends Twig_Node_Expression
         ;
     }
 }
+
+class_alias('Twig_Node_Expression_TempName', 'Twig\Node\Expression\TempNameExpression', false);
diff --git a/lib/Twig/Node/Expression/Test.php b/lib/Twig/Node/Expression/Test.php
index 3dfe4f195..ad102ba60 100644
--- a/lib/Twig/Node/Expression/Test.php
+++ b/lib/Twig/Node/Expression/Test.php
@@ -38,3 +38,5 @@ class Twig_Node_Expression_Test extends Twig_Node_Expression_Call
         $this->compileCallable($compiler);
     }
 }
+
+class_alias('Twig_Node_Expression_Test', 'Twig\Node\Expression\TestExpression', false);
diff --git a/lib/Twig/Node/Expression/Test/Constant.php b/lib/Twig/Node/Expression/Test/Constant.php
index ffde3488c..a51a4ba13 100644
--- a/lib/Twig/Node/Expression/Test/Constant.php
+++ b/lib/Twig/Node/Expression/Test/Constant.php
@@ -44,3 +44,5 @@ class Twig_Node_Expression_Test_Constant extends Twig_Node_Expression_Test
         ;
     }
 }
+
+class_alias('Twig_Node_Expression_Test_Constant', 'Twig\Node\Expression\Test\ConstantTest', false);
diff --git a/lib/Twig/Node/Expression/Test/Defined.php b/lib/Twig/Node/Expression/Test/Defined.php
index 31cd987cd..2136c3907 100644
--- a/lib/Twig/Node/Expression/Test/Defined.php
+++ b/lib/Twig/Node/Expression/Test/Defined.php
@@ -57,3 +57,5 @@ class Twig_Node_Expression_Test_Defined extends Twig_Node_Expression_Test
         $compiler->subcompile($this->getNode('node'));
     }
 }
+
+class_alias('Twig_Node_Expression_Test_Defined', 'Twig\Node\Expression\Test\DefinedTest', false);
diff --git a/lib/Twig/Node/Expression/Test/Divisibleby.php b/lib/Twig/Node/Expression/Test/Divisibleby.php
index 0d6bdb49e..a5d71961a 100644
--- a/lib/Twig/Node/Expression/Test/Divisibleby.php
+++ b/lib/Twig/Node/Expression/Test/Divisibleby.php
@@ -31,3 +31,5 @@ class Twig_Node_Expression_Test_Divisibleby extends Twig_Node_Expression_Test
         ;
     }
 }
+
+class_alias('Twig_Node_Expression_Test_Divisibleby', 'Twig\Node\Expression\Test\DivisiblebyTest', false);
diff --git a/lib/Twig/Node/Expression/Test/Even.php b/lib/Twig/Node/Expression/Test/Even.php
index fe42e627d..7e198bea6 100644
--- a/lib/Twig/Node/Expression/Test/Even.php
+++ b/lib/Twig/Node/Expression/Test/Even.php
@@ -30,3 +30,5 @@ class Twig_Node_Expression_Test_Even extends Twig_Node_Expression_Test
         ;
     }
 }
+
+class_alias('Twig_Node_Expression_Test_Even', 'Twig\Node\Expression\Test\EvenTest', false);
diff --git a/lib/Twig/Node/Expression/Test/Null.php b/lib/Twig/Node/Expression/Test/Null.php
index 934d83561..3746e4cbd 100644
--- a/lib/Twig/Node/Expression/Test/Null.php
+++ b/lib/Twig/Node/Expression/Test/Null.php
@@ -29,3 +29,5 @@ class Twig_Node_Expression_Test_Null extends Twig_Node_Expression_Test
         ;
     }
 }
+
+class_alias('Twig_Node_Expression_Test_Null', 'Twig\Node\Expression\Test\NullTest', false);
diff --git a/lib/Twig/Node/Expression/Test/Odd.php b/lib/Twig/Node/Expression/Test/Odd.php
index 4f16029a2..0c6c099bb 100644
--- a/lib/Twig/Node/Expression/Test/Odd.php
+++ b/lib/Twig/Node/Expression/Test/Odd.php
@@ -30,3 +30,5 @@ class Twig_Node_Expression_Test_Odd extends Twig_Node_Expression_Test
         ;
     }
 }
+
+class_alias('Twig_Node_Expression_Test_Odd', 'Twig\Node\Expression\Test\OddTest', false);
diff --git a/lib/Twig/Node/Expression/Test/Sameas.php b/lib/Twig/Node/Expression/Test/Sameas.php
index abc2f5beb..e95ff1f20 100644
--- a/lib/Twig/Node/Expression/Test/Sameas.php
+++ b/lib/Twig/Node/Expression/Test/Sameas.php
@@ -27,3 +27,5 @@ class Twig_Node_Expression_Test_Sameas extends Twig_Node_Expression_Test
         ;
     }
 }
+
+class_alias('Twig_Node_Expression_Test_Sameas', 'Twig\Node\Expression\Test\SameasTest', false);
diff --git a/lib/Twig/Node/Expression/Unary.php b/lib/Twig/Node/Expression/Unary.php
index 0ea2c2c32..5804485e3 100644
--- a/lib/Twig/Node/Expression/Unary.php
+++ b/lib/Twig/Node/Expression/Unary.php
@@ -25,3 +25,5 @@ abstract class Twig_Node_Expression_Unary extends Twig_Node_Expression
 
     abstract public function operator(Twig_Compiler $compiler);
 }
+
+class_alias('Twig_Node_Expression_Unary', 'Twig\Node\Expression\Unary\AbstractUnary', false);
diff --git a/lib/Twig/Node/Expression/Unary/Neg.php b/lib/Twig/Node/Expression/Unary/Neg.php
index ca3ef8f32..039d933d9 100644
--- a/lib/Twig/Node/Expression/Unary/Neg.php
+++ b/lib/Twig/Node/Expression/Unary/Neg.php
@@ -16,3 +16,5 @@ class Twig_Node_Expression_Unary_Neg extends Twig_Node_Expression_Unary
         $compiler->raw('-');
     }
 }
+
+class_alias('Twig_Node_Expression_Unary_Neg', 'Twig\Node\Expression\Unary\NegUnary', false);
diff --git a/lib/Twig/Node/Expression/Unary/Not.php b/lib/Twig/Node/Expression/Unary/Not.php
index a5e4f198f..a0860b183 100644
--- a/lib/Twig/Node/Expression/Unary/Not.php
+++ b/lib/Twig/Node/Expression/Unary/Not.php
@@ -16,3 +16,5 @@ class Twig_Node_Expression_Unary_Not extends Twig_Node_Expression_Unary
         $compiler->raw('!');
     }
 }
+
+class_alias('Twig_Node_Expression_Unary_Not', 'Twig\Node\Expression\Unary\NotUnary', false);
diff --git a/lib/Twig/Node/Expression/Unary/Pos.php b/lib/Twig/Node/Expression/Unary/Pos.php
index 5497532bc..eeff5452f 100644
--- a/lib/Twig/Node/Expression/Unary/Pos.php
+++ b/lib/Twig/Node/Expression/Unary/Pos.php
@@ -16,3 +16,5 @@ class Twig_Node_Expression_Unary_Pos extends Twig_Node_Expression_Unary
         $compiler->raw('+');
     }
 }
+
+class_alias('Twig_Node_Expression_Unary_Pos', 'Twig\Node\Expression\Unary\PosUnary', false);
diff --git a/lib/Twig/Node/Flush.php b/lib/Twig/Node/Flush.php
index cd4be411e..fcc461ac0 100644
--- a/lib/Twig/Node/Flush.php
+++ b/lib/Twig/Node/Flush.php
@@ -29,3 +29,5 @@ class Twig_Node_Flush extends Twig_Node
         ;
     }
 }
+
+class_alias('Twig_Node_Flush', 'Twig\Node\FlushNode', false);
diff --git a/lib/Twig/Node/For.php b/lib/Twig/Node/For.php
index f93d9c812..914b70c98 100644
--- a/lib/Twig/Node/For.php
+++ b/lib/Twig/Node/For.php
@@ -109,3 +109,5 @@ class Twig_Node_For extends Twig_Node
         $compiler->write("\$context = array_intersect_key(\$context, \$_parent) + \$_parent;\n");
     }
 }
+
+class_alias('Twig_Node_For', 'Twig\Node\ForNode', false);
diff --git a/lib/Twig/Node/ForLoop.php b/lib/Twig/Node/ForLoop.php
index ab0215e6b..06477cf1f 100644
--- a/lib/Twig/Node/ForLoop.php
+++ b/lib/Twig/Node/ForLoop.php
@@ -48,3 +48,5 @@ class Twig_Node_ForLoop extends Twig_Node
         }
     }
 }
+
+class_alias('Twig_Node_ForLoop', 'Twig\Node\ForLoopNode', false);
diff --git a/lib/Twig/Node/If.php b/lib/Twig/Node/If.php
index 9cd78f471..d82edec77 100644
--- a/lib/Twig/Node/If.php
+++ b/lib/Twig/Node/If.php
@@ -64,3 +64,5 @@ class Twig_Node_If extends Twig_Node
             ->write("}\n");
     }
 }
+
+class_alias('Twig_Node_If', 'Twig\Node\IfNode', false);
diff --git a/lib/Twig/Node/Import.php b/lib/Twig/Node/Import.php
index 759bb5c3e..c77e320b7 100644
--- a/lib/Twig/Node/Import.php
+++ b/lib/Twig/Node/Import.php
@@ -47,3 +47,5 @@ class Twig_Node_Import extends Twig_Node
         $compiler->raw(";\n");
     }
 }
+
+class_alias('Twig_Node_Import', 'Twig\Node\ImportNode', false);
diff --git a/lib/Twig/Node/Include.php b/lib/Twig/Node/Include.php
index 15a27ca60..2a5114cb8 100644
--- a/lib/Twig/Node/Include.php
+++ b/lib/Twig/Node/Include.php
@@ -86,3 +86,5 @@ class Twig_Node_Include extends Twig_Node implements Twig_NodeOutputInterface
         }
     }
 }
+
+class_alias('Twig_Node_Include', 'Twig\Node\IncludeNode', false);
diff --git a/lib/Twig/Node/Macro.php b/lib/Twig/Node/Macro.php
index e9e1421aa..3cf549770 100644
--- a/lib/Twig/Node/Macro.php
+++ b/lib/Twig/Node/Macro.php
@@ -121,3 +121,5 @@ class Twig_Node_Macro extends Twig_Node
         ;
     }
 }
+
+class_alias('Twig_Node_Macro', 'Twig\Node\MacroNode', false);
diff --git a/lib/Twig/Node/Module.php b/lib/Twig/Node/Module.php
index 5bfcc9230..5cd8d0502 100644
--- a/lib/Twig/Node/Module.php
+++ b/lib/Twig/Node/Module.php
@@ -457,3 +457,5 @@ class Twig_Node_Module extends Twig_Node
         }
     }
 }
+
+class_alias('Twig_Node_Module', 'Twig\Node\ModuleNode', false);
diff --git a/lib/Twig/Node/Print.php b/lib/Twig/Node/Print.php
index 9e317c84e..374db89b7 100644
--- a/lib/Twig/Node/Print.php
+++ b/lib/Twig/Node/Print.php
@@ -32,3 +32,5 @@ class Twig_Node_Print extends Twig_Node implements Twig_NodeOutputInterface
         ;
     }
 }
+
+class_alias('Twig_Node_Print', 'Twig\Node\PrintNode', false);
diff --git a/lib/Twig/Node/Sandbox.php b/lib/Twig/Node/Sandbox.php
index 658e068e1..44b30ab9c 100644
--- a/lib/Twig/Node/Sandbox.php
+++ b/lib/Twig/Node/Sandbox.php
@@ -40,3 +40,5 @@ class Twig_Node_Sandbox extends Twig_Node
         ;
     }
 }
+
+class_alias('Twig_Node_Sandbox', 'Twig\Node\SandboxNode', false);
diff --git a/lib/Twig/Node/SandboxedPrint.php b/lib/Twig/Node/SandboxedPrint.php
index fba0051ba..a08f21f56 100644
--- a/lib/Twig/Node/SandboxedPrint.php
+++ b/lib/Twig/Node/SandboxedPrint.php
@@ -47,3 +47,5 @@ class Twig_Node_SandboxedPrint extends Twig_Node_Print
         return $node;
     }
 }
+
+class_alias('Twig_Node_SandboxedPrint', 'Twig\Node\SandboxedPrintNode', false);
diff --git a/lib/Twig/Node/Set.php b/lib/Twig/Node/Set.php
index 36e05ccad..6c6743eeb 100644
--- a/lib/Twig/Node/Set.php
+++ b/lib/Twig/Node/Set.php
@@ -94,3 +94,5 @@ class Twig_Node_Set extends Twig_Node implements Twig_NodeCaptureInterface
         $compiler->raw(";\n");
     }
 }
+
+class_alias('Twig_Node_Set', 'Twig\Node\SetNode', false);
diff --git a/lib/Twig/Node/SetTemp.php b/lib/Twig/Node/SetTemp.php
index 0f43c7d31..996fdcde7 100644
--- a/lib/Twig/Node/SetTemp.php
+++ b/lib/Twig/Node/SetTemp.php
@@ -9,6 +9,9 @@
  * file that was distributed with this source code.
  */
 
+/**
+ * @internal
+ */
 class Twig_Node_SetTemp extends Twig_Node
 {
     public function __construct($name, $lineno)
@@ -33,3 +36,5 @@ class Twig_Node_SetTemp extends Twig_Node
         ;
     }
 }
+
+class_alias('Twig_Node_SetTemp', 'Twig\Node\SetTempNode', false);
diff --git a/lib/Twig/Node/Spaceless.php b/lib/Twig/Node/Spaceless.php
index 00419e260..76f90cde5 100644
--- a/lib/Twig/Node/Spaceless.php
+++ b/lib/Twig/Node/Spaceless.php
@@ -33,3 +33,5 @@ class Twig_Node_Spaceless extends Twig_Node
         ;
     }
 }
+
+class_alias('Twig_Node_Spaceless', 'Twig\Node\SpacelessNode', false);
diff --git a/lib/Twig/Node/Text.php b/lib/Twig/Node/Text.php
index 2c013cd76..f4577fee2 100644
--- a/lib/Twig/Node/Text.php
+++ b/lib/Twig/Node/Text.php
@@ -32,3 +32,5 @@ class Twig_Node_Text extends Twig_Node implements Twig_NodeOutputInterface
         ;
     }
 }
+
+class_alias('Twig_Node_Text', 'Twig\Node\TextNode', false);
diff --git a/lib/Twig/Node/With.php b/lib/Twig/Node/With.php
index 4978f375b..2ab0ea5d7 100644
--- a/lib/Twig/Node/With.php
+++ b/lib/Twig/Node/With.php
@@ -60,3 +60,5 @@ class Twig_Node_With extends Twig_Node
         ;
     }
 }
+
+class_alias('Twig_Node_With', 'Twig\Node\WithNode', false);
diff --git a/lib/Twig/NodeCaptureInterface.php b/lib/Twig/NodeCaptureInterface.php
index 97ffb6af2..6638834b1 100644
--- a/lib/Twig/NodeCaptureInterface.php
+++ b/lib/Twig/NodeCaptureInterface.php
@@ -17,3 +17,5 @@
 interface Twig_NodeCaptureInterface
 {
 }
+
+class_alias('Twig_NodeCaptureInterface', 'Twig\Node\NodeCaptureInterface', false);
diff --git a/lib/Twig/NodeOutputInterface.php b/lib/Twig/NodeOutputInterface.php
index e6bbd9643..5a8eaa9c3 100644
--- a/lib/Twig/NodeOutputInterface.php
+++ b/lib/Twig/NodeOutputInterface.php
@@ -17,3 +17,5 @@
 interface Twig_NodeOutputInterface
 {
 }
+
+class_alias('Twig_NodeOutputInterface', 'Twig\Node\NodeOutputInterface', false);
diff --git a/lib/Twig/NodeTraverser.php b/lib/Twig/NodeTraverser.php
index 353221747..787629ce3 100644
--- a/lib/Twig/NodeTraverser.php
+++ b/lib/Twig/NodeTraverser.php
@@ -80,3 +80,5 @@ class Twig_NodeTraverser
         return $visitor->leaveNode($node, $this->env);
     }
 }
+
+class_alias('Twig_NodeTraverser', 'Twig\NodeTraverser', false);
diff --git a/lib/Twig/NodeVisitor/Escaper.php b/lib/Twig/NodeVisitor/Escaper.php
index 7169f6f67..1a1ae66f7 100644
--- a/lib/Twig/NodeVisitor/Escaper.php
+++ b/lib/Twig/NodeVisitor/Escaper.php
@@ -150,3 +150,5 @@ class Twig_NodeVisitor_Escaper extends Twig_BaseNodeVisitor
         return 0;
     }
 }
+
+class_alias('Twig_NodeVisitor_Escaper', 'Twig\NodeVisitor\EscaperNodeVisitor', false);
diff --git a/lib/Twig/NodeVisitor/Optimizer.php b/lib/Twig/NodeVisitor/Optimizer.php
index 43453c4dc..2fa19f3d7 100644
--- a/lib/Twig/NodeVisitor/Optimizer.php
+++ b/lib/Twig/NodeVisitor/Optimizer.php
@@ -249,3 +249,5 @@ class Twig_NodeVisitor_Optimizer extends Twig_BaseNodeVisitor
         return 255;
     }
 }
+
+class_alias('Twig_NodeVisitor_Optimizer', 'Twig\NodeVisitor\OptimizerNodeVisitor', false);
diff --git a/lib/Twig/NodeVisitor/SafeAnalysis.php b/lib/Twig/NodeVisitor/SafeAnalysis.php
index 6997f3573..ca31c8fc7 100644
--- a/lib/Twig/NodeVisitor/SafeAnalysis.php
+++ b/lib/Twig/NodeVisitor/SafeAnalysis.php
@@ -146,3 +146,5 @@ class Twig_NodeVisitor_SafeAnalysis extends Twig_BaseNodeVisitor
         return 0;
     }
 }
+
+class_alias('Twig_NodeVisitor_SafeAnalysis', 'Twig\NodeVisitor\SafeAnalysisNodeVisitor', false);
diff --git a/lib/Twig/NodeVisitor/Sandbox.php b/lib/Twig/NodeVisitor/Sandbox.php
index baf00a034..b631b29d4 100644
--- a/lib/Twig/NodeVisitor/Sandbox.php
+++ b/lib/Twig/NodeVisitor/Sandbox.php
@@ -73,3 +73,5 @@ class Twig_NodeVisitor_Sandbox extends Twig_BaseNodeVisitor
         return 0;
     }
 }
+
+class_alias('Twig_NodeVisitor_Sandbox', 'Twig\NodeVisitor\SandboxNodeVisitor', false);
diff --git a/lib/Twig/NodeVisitorInterface.php b/lib/Twig/NodeVisitorInterface.php
index 092d36ae7..0172dd90b 100644
--- a/lib/Twig/NodeVisitorInterface.php
+++ b/lib/Twig/NodeVisitorInterface.php
@@ -39,3 +39,5 @@ interface Twig_NodeVisitorInterface
      */
     public function getPriority();
 }
+
+class_alias('Twig_NodeVisitorInterface', 'Twig\NodeVisitor\NodeVisitorInterface', false);
diff --git a/lib/Twig/Parser.php b/lib/Twig/Parser.php
index 070f301b1..27018e28b 100644
--- a/lib/Twig/Parser.php
+++ b/lib/Twig/Parser.php
@@ -404,3 +404,5 @@ class Twig_Parser implements Twig_ParserInterface
         return $node;
     }
 }
+
+class_alias('Twig_Parser', 'Twig\Parser', false);
diff --git a/lib/Twig/Profiler/Dumper/Blackfire.php b/lib/Twig/Profiler/Dumper/Blackfire.php
index b253f3c09..7a33baf2d 100644
--- a/lib/Twig/Profiler/Dumper/Blackfire.php
+++ b/lib/Twig/Profiler/Dumper/Blackfire.php
@@ -68,3 +68,5 @@ EOF;
         }
     }
 }
+
+class_alias('Twig_Profiler_Dumper_Blackfire', 'Twig\Profiler\Dumper\BlackfireDumper', false);
diff --git a/lib/Twig/Profiler/Dumper/Html.php b/lib/Twig/Profiler/Dumper/Html.php
index f0fa406aa..38b28db95 100644
--- a/lib/Twig/Profiler/Dumper/Html.php
+++ b/lib/Twig/Profiler/Dumper/Html.php
@@ -43,3 +43,5 @@ class Twig_Profiler_Dumper_Html extends Twig_Profiler_Dumper_Text
         return sprintf('<span style="color: %s">%.2fms/%.0f%%</span>', $percent > 20 ? self::$colors['big'] : 'auto', $profile->getDuration() * 1000, $percent);
     }
 }
+
+class_alias('Twig_Profiler_Dumper_Html', 'Twig\Profiler\Dumper\HtmlDumper', false);
diff --git a/lib/Twig/Profiler/Dumper/Text.php b/lib/Twig/Profiler/Dumper/Text.php
index c77e69184..1171e5c3e 100644
--- a/lib/Twig/Profiler/Dumper/Text.php
+++ b/lib/Twig/Profiler/Dumper/Text.php
@@ -68,3 +68,5 @@ class Twig_Profiler_Dumper_Text
         return $str;
     }
 }
+
+class_alias('Twig_Profiler_Dumper_Text', 'Twig\Profiler\Dumper\TextDumper', false);
diff --git a/lib/Twig/Profiler/Node/EnterProfile.php b/lib/Twig/Profiler/Node/EnterProfile.php
index e10d857e0..69c8f7970 100644
--- a/lib/Twig/Profiler/Node/EnterProfile.php
+++ b/lib/Twig/Profiler/Node/EnterProfile.php
@@ -35,3 +35,5 @@ class Twig_Profiler_Node_EnterProfile extends Twig_Node
         ;
     }
 }
+
+class_alias('Twig_Profiler_Node_EnterProfile', 'Twig\Profiler\Node\EnterProfileNode', false);
diff --git a/lib/Twig/Profiler/Node/LeaveProfile.php b/lib/Twig/Profiler/Node/LeaveProfile.php
index e4d0beb4e..d1d6a7cc1 100644
--- a/lib/Twig/Profiler/Node/LeaveProfile.php
+++ b/lib/Twig/Profiler/Node/LeaveProfile.php
@@ -29,3 +29,5 @@ class Twig_Profiler_Node_LeaveProfile extends Twig_Node
         ;
     }
 }
+
+class_alias('Twig_Profiler_Node_LeaveProfile', 'Twig\Profiler\Node\LeaveProfileNode', false);
diff --git a/lib/Twig/Profiler/NodeVisitor/Profiler.php b/lib/Twig/Profiler/NodeVisitor/Profiler.php
index a99047488..a395ae7fd 100644
--- a/lib/Twig/Profiler/NodeVisitor/Profiler.php
+++ b/lib/Twig/Profiler/NodeVisitor/Profiler.php
@@ -63,3 +63,5 @@ class Twig_Profiler_NodeVisitor_Profiler extends Twig_BaseNodeVisitor
         return 0;
     }
 }
+
+class_alias('Twig_Profiler_NodeVisitor_Profiler', 'Twig\Profiler\NodeVisitor\ProfilerNodeVisitor', false);
diff --git a/lib/Twig/Profiler/Profile.php b/lib/Twig/Profiler/Profile.php
index 9274da28b..60b9103c8 100644
--- a/lib/Twig/Profiler/Profile.php
+++ b/lib/Twig/Profiler/Profile.php
@@ -160,3 +160,5 @@ class Twig_Profiler_Profile implements IteratorAggregate, Serializable
         list($this->template, $this->name, $this->type, $this->starts, $this->ends, $this->profiles) = unserialize($data);
     }
 }
+
+class_alias('Twig_Profiler_Profile', 'Twig\Profiler\Profile', false);
diff --git a/lib/Twig/RuntimeLoaderInterface.php b/lib/Twig/RuntimeLoaderInterface.php
index c41f44af9..f5eb14e0d 100644
--- a/lib/Twig/RuntimeLoaderInterface.php
+++ b/lib/Twig/RuntimeLoaderInterface.php
@@ -25,3 +25,5 @@ interface Twig_RuntimeLoaderInterface
      */
     public function load($class);
 }
+
+class_alias('Twig_RuntimeLoaderInterface', 'Twig\RuntimeLoader\RuntimeLoaderInterface', false);
diff --git a/lib/Twig/Sandbox/SecurityError.php b/lib/Twig/Sandbox/SecurityError.php
index 5a4e021d5..b6707e386 100644
--- a/lib/Twig/Sandbox/SecurityError.php
+++ b/lib/Twig/Sandbox/SecurityError.php
@@ -17,3 +17,5 @@
 class Twig_Sandbox_SecurityError extends Twig_Error
 {
 }
+
+class_alias('Twig_Sandbox_SecurityError', 'Twig\Sandbox\SecurityError', false);
diff --git a/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php b/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php
index 1967cf766..0ba332762 100644
--- a/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php
+++ b/lib/Twig/Sandbox/SecurityNotAllowedFilterError.php
@@ -29,3 +29,5 @@ class Twig_Sandbox_SecurityNotAllowedFilterError extends Twig_Sandbox_SecurityEr
         return $this->filterName;
     }
 }
+
+class_alias('Twig_Sandbox_SecurityNotAllowedFilterError', 'Twig\Sandbox\SecurityNotAllowedFilterError', false);
diff --git a/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php b/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php
index 79a400f12..aa3914293 100644
--- a/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php
+++ b/lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php
@@ -29,3 +29,5 @@ class Twig_Sandbox_SecurityNotAllowedFunctionError extends Twig_Sandbox_Security
         return $this->functionName;
     }
 }
+
+class_alias('Twig_Sandbox_SecurityNotAllowedFunctionError', 'Twig\Sandbox\SecurityNotAllowedFunctionError', false);
diff --git a/lib/Twig/Sandbox/SecurityNotAllowedMethodError.php b/lib/Twig/Sandbox/SecurityNotAllowedMethodError.php
index 9e5d4df04..93012fe99 100644
--- a/lib/Twig/Sandbox/SecurityNotAllowedMethodError.php
+++ b/lib/Twig/Sandbox/SecurityNotAllowedMethodError.php
@@ -36,3 +36,5 @@ class Twig_Sandbox_SecurityNotAllowedMethodError extends Twig_Sandbox_SecurityEr
         return $this->methodName;
     }
 }
+
+class_alias('Twig_Sandbox_SecurityNotAllowedMethodError', 'Twig\Sandbox\SecurityNotAllowedMethodError', false);
diff --git a/lib/Twig/Sandbox/SecurityNotAllowedPropertyError.php b/lib/Twig/Sandbox/SecurityNotAllowedPropertyError.php
index 9f7eab290..f27969c15 100644
--- a/lib/Twig/Sandbox/SecurityNotAllowedPropertyError.php
+++ b/lib/Twig/Sandbox/SecurityNotAllowedPropertyError.php
@@ -36,3 +36,5 @@ class Twig_Sandbox_SecurityNotAllowedPropertyError extends Twig_Sandbox_Security
         return $this->propertyName;
     }
 }
+
+class_alias('Twig_Sandbox_SecurityNotAllowedPropertyError', 'Twig\Sandbox\SecurityNotAllowedPropertyError', false);
diff --git a/lib/Twig/Sandbox/SecurityNotAllowedTagError.php b/lib/Twig/Sandbox/SecurityNotAllowedTagError.php
index a177206cc..4bbd22387 100644
--- a/lib/Twig/Sandbox/SecurityNotAllowedTagError.php
+++ b/lib/Twig/Sandbox/SecurityNotAllowedTagError.php
@@ -29,3 +29,5 @@ class Twig_Sandbox_SecurityNotAllowedTagError extends Twig_Sandbox_SecurityError
         return $this->tagName;
     }
 }
+
+class_alias('Twig_Sandbox_SecurityNotAllowedTagError', 'Twig\Sandbox\SecurityNotAllowedTagError', false);
diff --git a/lib/Twig/Sandbox/SecurityPolicy.php b/lib/Twig/Sandbox/SecurityPolicy.php
index 4470c39f4..dca0b82b5 100644
--- a/lib/Twig/Sandbox/SecurityPolicy.php
+++ b/lib/Twig/Sandbox/SecurityPolicy.php
@@ -121,3 +121,5 @@ class Twig_Sandbox_SecurityPolicy implements Twig_Sandbox_SecurityPolicyInterfac
         }
     }
 }
+
+class_alias('Twig_Sandbox_SecurityPolicy', 'Twig\Sandbox\SecurityPolicy', false);
diff --git a/lib/Twig/Sandbox/SecurityPolicyInterface.php b/lib/Twig/Sandbox/SecurityPolicyInterface.php
index 2111a03c1..88f64447a 100644
--- a/lib/Twig/Sandbox/SecurityPolicyInterface.php
+++ b/lib/Twig/Sandbox/SecurityPolicyInterface.php
@@ -22,3 +22,5 @@ interface Twig_Sandbox_SecurityPolicyInterface
 
     public function checkPropertyAllowed($obj, $method);
 }
+
+class_alias('Twig_Sandbox_SecurityPolicyInterface', 'Twig\Sandbox\SecurityPolicyInterface', false);
diff --git a/lib/Twig/SimpleFilter.php b/lib/Twig/SimpleFilter.php
index a0b98af3a..ee4c0aebf 100644
--- a/lib/Twig/SimpleFilter.php
+++ b/lib/Twig/SimpleFilter.php
@@ -117,3 +117,5 @@ class Twig_SimpleFilter
         return $this->options['alternative'];
     }
 }
+
+class_alias('Twig_SimpleFilter', 'Twig\TwigFilter', false);
diff --git a/lib/Twig/SimpleFunction.php b/lib/Twig/SimpleFunction.php
index b7ef92a59..a6aa7ca74 100644
--- a/lib/Twig/SimpleFunction.php
+++ b/lib/Twig/SimpleFunction.php
@@ -107,3 +107,5 @@ class Twig_SimpleFunction
         return $this->options['alternative'];
     }
 }
+
+class_alias('Twig_SimpleFunction', 'Twig\TwigFunction', false);
diff --git a/lib/Twig/SimpleTest.php b/lib/Twig/SimpleTest.php
index b9ae8f146..fee5778b3 100644
--- a/lib/Twig/SimpleTest.php
+++ b/lib/Twig/SimpleTest.php
@@ -69,3 +69,5 @@ class Twig_SimpleTest
         return $this->options['alternative'];
     }
 }
+
+class_alias('Twig_SimpleTest', 'Twig\TwigTest', false);
diff --git a/lib/Twig/Source.php b/lib/Twig/Source.php
index 389317ec1..bd8d869f3 100644
--- a/lib/Twig/Source.php
+++ b/lib/Twig/Source.php
@@ -49,3 +49,5 @@ class Twig_Source
         return $this->path;
     }
 }
+
+class_alias('Twig_Source', 'Twig\Source', false);
diff --git a/lib/Twig/Template.php b/lib/Twig/Template.php
index c631befe2..64563419e 100644
--- a/lib/Twig/Template.php
+++ b/lib/Twig/Template.php
@@ -702,3 +702,5 @@ abstract class Twig_Template implements Twig_TemplateInterface
         return $ret;
     }
 }
+
+class_alias('Twig_Template', 'Twig\Template', false);
diff --git a/lib/Twig/TemplateWrapper.php b/lib/Twig/TemplateWrapper.php
index 89e0be8a0..497f6e980 100644
--- a/lib/Twig/TemplateWrapper.php
+++ b/lib/Twig/TemplateWrapper.php
@@ -13,10 +13,8 @@
  * Exposes a template to userland.
  *
  * @author Fabien Potencier <fabien@symfony.com>
- *
- * @final
  */
-class Twig_TemplateWrapper
+final class Twig_TemplateWrapper
 {
     private $env;
     private $template;
@@ -131,3 +129,5 @@ class Twig_TemplateWrapper
         return $this->template->getSourceContext();
     }
 }
+
+class_alias('Twig_TemplateWrapper', 'Twig\TemplateWrapper', false);
diff --git a/lib/Twig/Test/IntegrationTestCase.php b/lib/Twig/Test/IntegrationTestCase.php
index 88d0718e5..899c3aaf9 100644
--- a/lib/Twig/Test/IntegrationTestCase.php
+++ b/lib/Twig/Test/IntegrationTestCase.php
@@ -233,3 +233,5 @@ abstract class Twig_Test_IntegrationTestCase extends TestCase
         return $templates;
     }
 }
+
+class_alias('Twig_Test_IntegrationTestCase', 'Twig\Test\IntegrationTestCase', false);
diff --git a/lib/Twig/Test/NodeTestCase.php b/lib/Twig/Test/NodeTestCase.php
index 64c885b51..2ef14de5c 100644
--- a/lib/Twig/Test/NodeTestCase.php
+++ b/lib/Twig/Test/NodeTestCase.php
@@ -68,3 +68,5 @@ abstract class Twig_Test_NodeTestCase extends TestCase
         return '$this->getAttribute(';
     }
 }
+
+class_alias('Twig_Test_NodeTestCase', 'Twig\Test\NodeTestCase', false);
diff --git a/lib/Twig/Token.php b/lib/Twig/Token.php
index 717ab0871..c7850eccc 100644
--- a/lib/Twig/Token.php
+++ b/lib/Twig/Token.php
@@ -203,3 +203,5 @@ class Twig_Token
         }
     }
 }
+
+class_alias('Twig_Token', 'Twig\Token', false);
diff --git a/lib/Twig/TokenParser.php b/lib/Twig/TokenParser.php
index 700a227f1..1b4de14da 100644
--- a/lib/Twig/TokenParser.php
+++ b/lib/Twig/TokenParser.php
@@ -29,3 +29,5 @@ abstract class Twig_TokenParser implements Twig_TokenParserInterface
         $this->parser = $parser;
     }
 }
+
+class_alias('Twig_TokenParser', 'Twig\TokenParser\AbstractTokenParser', false);
diff --git a/lib/Twig/TokenParser/AutoEscape.php b/lib/Twig/TokenParser/AutoEscape.php
index 176820ead..a20dedd18 100644
--- a/lib/Twig/TokenParser/AutoEscape.php
+++ b/lib/Twig/TokenParser/AutoEscape.php
@@ -79,3 +79,5 @@ class Twig_TokenParser_AutoEscape extends Twig_TokenParser
         return 'autoescape';
     }
 }
+
+class_alias('Twig_TokenParser_AutoEscape', 'Twig\TokenParser\AutoEscapeTokenParser', false);
diff --git a/lib/Twig/TokenParser/Block.php b/lib/Twig/TokenParser/Block.php
index 9dae2b904..f30f86b58 100644
--- a/lib/Twig/TokenParser/Block.php
+++ b/lib/Twig/TokenParser/Block.php
@@ -69,3 +69,5 @@ class Twig_TokenParser_Block extends Twig_TokenParser
         return 'block';
     }
 }
+
+class_alias('Twig_TokenParser_Block', 'Twig\TokenParser\BlockTokenParser', false);
diff --git a/lib/Twig/TokenParser/Do.php b/lib/Twig/TokenParser/Do.php
index fd03a2965..8ce088089 100644
--- a/lib/Twig/TokenParser/Do.php
+++ b/lib/Twig/TokenParser/Do.php
@@ -30,3 +30,5 @@ class Twig_TokenParser_Do extends Twig_TokenParser
         return 'do';
     }
 }
+
+class_alias('Twig_TokenParser_Do', 'Twig\TokenParser\DoTokenParser', false);
diff --git a/lib/Twig/TokenParser/Embed.php b/lib/Twig/TokenParser/Embed.php
index 019d97810..44644cc6b 100644
--- a/lib/Twig/TokenParser/Embed.php
+++ b/lib/Twig/TokenParser/Embed.php
@@ -63,3 +63,5 @@ class Twig_TokenParser_Embed extends Twig_TokenParser_Include
         return 'embed';
     }
 }
+
+class_alias('Twig_TokenParser_Embed', 'Twig\TokenParser\EmbedTokenParser', false);
diff --git a/lib/Twig/TokenParser/Extends.php b/lib/Twig/TokenParser/Extends.php
index b8454d2d6..31168ccec 100644
--- a/lib/Twig/TokenParser/Extends.php
+++ b/lib/Twig/TokenParser/Extends.php
@@ -42,3 +42,5 @@ class Twig_TokenParser_Extends extends Twig_TokenParser
         return 'extends';
     }
 }
+
+class_alias('Twig_TokenParser_Extends', 'Twig\TokenParser\ExtendsTokenParser', false);
diff --git a/lib/Twig/TokenParser/Filter.php b/lib/Twig/TokenParser/Filter.php
index 1cdc0dd07..760178293 100644
--- a/lib/Twig/TokenParser/Filter.php
+++ b/lib/Twig/TokenParser/Filter.php
@@ -49,3 +49,5 @@ class Twig_TokenParser_Filter extends Twig_TokenParser
         return 'filter';
     }
 }
+
+class_alias('Twig_TokenParser_Filter', 'Twig\TokenParser\FilterTokenParser', false);
diff --git a/lib/Twig/TokenParser/Flush.php b/lib/Twig/TokenParser/Flush.php
index b09ff9577..51832c77e 100644
--- a/lib/Twig/TokenParser/Flush.php
+++ b/lib/Twig/TokenParser/Flush.php
@@ -30,3 +30,5 @@ class Twig_TokenParser_Flush extends Twig_TokenParser
         return 'flush';
     }
 }
+
+class_alias('Twig_TokenParser_Flush', 'Twig\TokenParser\FlushTokenParser', false);
diff --git a/lib/Twig/TokenParser/For.php b/lib/Twig/TokenParser/For.php
index 6407afa81..63bf41d66 100644
--- a/lib/Twig/TokenParser/For.php
+++ b/lib/Twig/TokenParser/For.php
@@ -123,3 +123,5 @@ class Twig_TokenParser_For extends Twig_TokenParser
         return 'for';
     }
 }
+
+class_alias('Twig_TokenParser_For', 'Twig\TokenParser\ForTokenParser', false);
diff --git a/lib/Twig/TokenParser/From.php b/lib/Twig/TokenParser/From.php
index 69c09c2f2..f3053da4b 100644
--- a/lib/Twig/TokenParser/From.php
+++ b/lib/Twig/TokenParser/From.php
@@ -62,3 +62,5 @@ class Twig_TokenParser_From extends Twig_TokenParser
         return 'from';
     }
 }
+
+class_alias('Twig_TokenParser_From', 'Twig\TokenParser\FromTokenParser', false);
diff --git a/lib/Twig/TokenParser/If.php b/lib/Twig/TokenParser/If.php
index 05459408f..f081df3ab 100644
--- a/lib/Twig/TokenParser/If.php
+++ b/lib/Twig/TokenParser/If.php
@@ -82,3 +82,5 @@ class Twig_TokenParser_If extends Twig_TokenParser
         return 'if';
     }
 }
+
+class_alias('Twig_TokenParser_If', 'Twig\TokenParser\IfTokenParser', false);
diff --git a/lib/Twig/TokenParser/Import.php b/lib/Twig/TokenParser/Import.php
index fa5ebae2c..47802f502 100644
--- a/lib/Twig/TokenParser/Import.php
+++ b/lib/Twig/TokenParser/Import.php
@@ -37,3 +37,5 @@ class Twig_TokenParser_Import extends Twig_TokenParser
         return 'import';
     }
 }
+
+class_alias('Twig_TokenParser_Import', 'Twig\TokenParser\ImportTokenParser', false);
diff --git a/lib/Twig/TokenParser/Include.php b/lib/Twig/TokenParser/Include.php
index 930b50f13..309f11db4 100644
--- a/lib/Twig/TokenParser/Include.php
+++ b/lib/Twig/TokenParser/Include.php
@@ -61,3 +61,5 @@ class Twig_TokenParser_Include extends Twig_TokenParser
         return 'include';
     }
 }
+
+class_alias('Twig_TokenParser_Include', 'Twig\TokenParser\IncludeTokenParser', false);
diff --git a/lib/Twig/TokenParser/Macro.php b/lib/Twig/TokenParser/Macro.php
index b845c9095..4287934ba 100644
--- a/lib/Twig/TokenParser/Macro.php
+++ b/lib/Twig/TokenParser/Macro.php
@@ -56,3 +56,5 @@ class Twig_TokenParser_Macro extends Twig_TokenParser
         return 'macro';
     }
 }
+
+class_alias('Twig_TokenParser_Macro', 'Twig\TokenParser\MacroTokenParser', false);
diff --git a/lib/Twig/TokenParser/Sandbox.php b/lib/Twig/TokenParser/Sandbox.php
index 0b08fe61a..b8f581cbc 100644
--- a/lib/Twig/TokenParser/Sandbox.php
+++ b/lib/Twig/TokenParser/Sandbox.php
@@ -57,3 +57,5 @@ class Twig_TokenParser_Sandbox extends Twig_TokenParser
         return 'sandbox';
     }
 }
+
+class_alias('Twig_TokenParser_Sandbox', 'Twig\TokenParser\SandboxTokenParser', false);
diff --git a/lib/Twig/TokenParser/Set.php b/lib/Twig/TokenParser/Set.php
index d03a36b01..48c6b3aeb 100644
--- a/lib/Twig/TokenParser/Set.php
+++ b/lib/Twig/TokenParser/Set.php
@@ -71,3 +71,5 @@ class Twig_TokenParser_Set extends Twig_TokenParser
         return 'set';
     }
 }
+
+class_alias('Twig_TokenParser_Set', 'Twig\TokenParser\SetTokenParser', false);
diff --git a/lib/Twig/TokenParser/Spaceless.php b/lib/Twig/TokenParser/Spaceless.php
index e8b2638e2..cecf27c67 100644
--- a/lib/Twig/TokenParser/Spaceless.php
+++ b/lib/Twig/TokenParser/Spaceless.php
@@ -47,3 +47,5 @@ class Twig_TokenParser_Spaceless extends Twig_TokenParser
         return 'spaceless';
     }
 }
+
+class_alias('Twig_TokenParser_Spaceless', 'Twig\TokenParser\SpacelessTokenParser', false);
diff --git a/lib/Twig/TokenParser/Use.php b/lib/Twig/TokenParser/Use.php
index c3fb06974..154c0ad12 100644
--- a/lib/Twig/TokenParser/Use.php
+++ b/lib/Twig/TokenParser/Use.php
@@ -64,3 +64,5 @@ class Twig_TokenParser_Use extends Twig_TokenParser
         return 'use';
     }
 }
+
+class_alias('Twig_TokenParser_Use', 'Twig\TokenParser\UseTokenParser', false);
diff --git a/lib/Twig/TokenParser/With.php b/lib/Twig/TokenParser/With.php
index 8d078d972..7a692597c 100644
--- a/lib/Twig/TokenParser/With.php
+++ b/lib/Twig/TokenParser/With.php
@@ -48,3 +48,5 @@ class Twig_TokenParser_With extends Twig_TokenParser
         return 'with';
     }
 }
+
+class_alias('Twig_TokenParser_With', 'Twig\TokenParser\WithTokenParser', false);
diff --git a/lib/Twig/TokenParserInterface.php b/lib/Twig/TokenParserInterface.php
index aea969961..0ea3a4e0c 100644
--- a/lib/Twig/TokenParserInterface.php
+++ b/lib/Twig/TokenParserInterface.php
@@ -37,3 +37,5 @@ interface Twig_TokenParserInterface
      */
     public function getTag();
 }
+
+class_alias('Twig_TokenParserInterface', 'Twig\TokenParser\TokenParserInterface', false);
diff --git a/lib/Twig/TokenStream.php b/lib/Twig/TokenStream.php
index 27ca1a74e..e1bd7ca1e 100644
--- a/lib/Twig/TokenStream.php
+++ b/lib/Twig/TokenStream.php
@@ -192,3 +192,5 @@ class Twig_TokenStream
         return $this->source;
     }
 }
+
+class_alias('Twig_TokenStream', 'Twig\TokenStream', false);
diff --git a/lib/Twig/Util/DeprecationCollector.php b/lib/Twig/Util/DeprecationCollector.php
index 884cf055f..c7bf53be2 100644
--- a/lib/Twig/Util/DeprecationCollector.php
+++ b/lib/Twig/Util/DeprecationCollector.php
@@ -82,3 +82,5 @@ class Twig_Util_DeprecationCollector
         }
     }
 }
+
+class_alias('Twig_Util_DeprecationCollector', 'Twig\Util\DeprecationCollector', false);
diff --git a/lib/Twig/Util/TemplateDirIterator.php b/lib/Twig/Util/TemplateDirIterator.php
index 3fb893278..c8682335d 100644
--- a/lib/Twig/Util/TemplateDirIterator.php
+++ b/lib/Twig/Util/TemplateDirIterator.php
@@ -24,3 +24,5 @@ class Twig_Util_TemplateDirIterator extends IteratorIterator
         return (string) parent::key();
     }
 }
+
+class_alias('Twig_Util_TemplateDirIterator', 'Twig\Util\TemplateDirIterator', false);
diff --git a/src/Cache/CacheInterface.php b/src/Cache/CacheInterface.php
index 6938b01c5..ef0401215 100644
--- a/src/Cache/CacheInterface.php
+++ b/src/Cache/CacheInterface.php
@@ -1 +1,11 @@
-./CacheInterface.php
+<?php
+
+namespace Twig\Cache;
+
+require __DIR__.'/../../lib/Twig/CacheInterface.php';
+
+if (\false) {
+    class CacheInterface extends \Twig_CacheInterface
+    {
+    }
+}
diff --git a/src/Cache/FilesystemCache.php b/src/Cache/FilesystemCache.php
index fd6f1046a..e8133c05e 100644
--- a/src/Cache/FilesystemCache.php
+++ b/src/Cache/FilesystemCache.php
@@ -1 +1,11 @@
-./Cache/Filesystem.php
+<?php
+
+namespace Twig\Cache;
+
+require __DIR__.'/../../lib/Twig/Cache/Filesystem.php';
+
+if (\false) {
+    class FilesystemCache extends \Twig_Cache_Filesystem
+    {
+    }
+}
diff --git a/src/Cache/NullCache.php b/src/Cache/NullCache.php
index 7801db95a..bf822c336 100644
--- a/src/Cache/NullCache.php
+++ b/src/Cache/NullCache.php
@@ -1 +1,11 @@
-./Cache/Null.php
+<?php
+
+namespace Twig\Cache;
+
+require __DIR__.'/../../lib/Twig/Cache/Null.php';
+
+if (\false) {
+    class NullCache extends \Twig_Cache_Null
+    {
+    }
+}
diff --git a/src/Compiler.php b/src/Compiler.php
index 50ef35ad3..dd5455870 100644
--- a/src/Compiler.php
+++ b/src/Compiler.php
@@ -1 +1,11 @@
-./Compiler.php
+<?php
+
+namespace Twig;
+
+require __DIR__.'/../lib/Twig/Compiler.php';
+
+if (\false) {
+    class Compiler extends \Twig_Compiler
+    {
+    }
+}
diff --git a/src/Environment.php b/src/Environment.php
index efe70d0e1..a165f8b5c 100644
--- a/src/Environment.php
+++ b/src/Environment.php
@@ -1 +1,11 @@
-./Environment.php
+<?php
+
+namespace Twig;
+
+require __DIR__.'/../lib/Twig/Environment.php';
+
+if (\false) {
+    class Environment extends \Twig_Environment
+    {
+    }
+}
diff --git a/src/Error/Error.php b/src/Error/Error.php
index 7dd31dd58..1560a7262 100644
--- a/src/Error/Error.php
+++ b/src/Error/Error.php
@@ -1 +1,11 @@
-./Error.php
+<?php
+
+namespace Twig\Error;
+
+require __DIR__.'/../../lib/Twig/Error.php';
+
+if (\false) {
+    class Error extends \Twig_Error
+    {
+    }
+}
diff --git a/src/Error/LoaderError.php b/src/Error/LoaderError.php
index 360c25ec3..ac056fe6d 100644
--- a/src/Error/LoaderError.php
+++ b/src/Error/LoaderError.php
@@ -1 +1,11 @@
-./Error/Loader.php
+<?php
+
+namespace Twig\Error;
+
+require __DIR__.'/../../lib/Twig/Error/Loader.php';
+
+if (\false) {
+    class LoaderError extends \Twig_Error_Loader
+    {
+    }
+}
diff --git a/src/Error/RuntimeError.php b/src/Error/RuntimeError.php
index 5859780ef..0b1d5645a 100644
--- a/src/Error/RuntimeError.php
+++ b/src/Error/RuntimeError.php
@@ -1 +1,11 @@
-./Error/Runtime.php
+<?php
+
+namespace Twig\Error;
+
+require __DIR__.'/../../lib/Twig/Error/Runtime.php';
+
+if (\false) {
+    class RuntimeError extends \Twig_Error_Runtime
+    {
+    }
+}
diff --git a/src/Error/SyntaxError.php b/src/Error/SyntaxError.php
index 0a02b4496..67fad9a57 100644
--- a/src/Error/SyntaxError.php
+++ b/src/Error/SyntaxError.php
@@ -1 +1,11 @@
-./Error/Syntax.php
+<?php
+
+namespace Twig\Error;
+
+require __DIR__.'/../../lib/Twig/Error/Syntax.php';
+
+if (\false) {
+    class SyntaxError extends \Twig_Error_Syntax
+    {
+    }
+}
diff --git a/src/ExpressionParser.php b/src/ExpressionParser.php
index f7e27f72b..e00dc56ec 100644
--- a/src/ExpressionParser.php
+++ b/src/ExpressionParser.php
@@ -1 +1,11 @@
-./ExpressionParser.php
+<?php
+
+namespace Twig;
+
+require __DIR__.'/../lib/Twig/ExpressionParser.php';
+
+if (\false) {
+    class ExpressionParser extends \Twig_ExpressionParser
+    {
+    }
+}
diff --git a/src/Extension/AbstractExtension.php b/src/Extension/AbstractExtension.php
index bfe8054d7..116a0e0be 100644
--- a/src/Extension/AbstractExtension.php
+++ b/src/Extension/AbstractExtension.php
@@ -1 +1,11 @@
-./Extension.php
+<?php
+
+namespace Twig\Extension;
+
+require __DIR__.'/../../lib/Twig/Extension.php';
+
+if (\false) {
+    class AbstractExtension extends \Twig_Extension
+    {
+    }
+}
diff --git a/src/Extension/CoreExtension.php b/src/Extension/CoreExtension.php
index 7ffc8bb26..4c40e1f94 100644
--- a/src/Extension/CoreExtension.php
+++ b/src/Extension/CoreExtension.php
@@ -1 +1,11 @@
-./Extension/Core.php
+<?php
+
+namespace Twig\Extension;
+
+require __DIR__.'/../../lib/Twig/Extension/Core.php';
+
+if (\false) {
+    class CoreExtension extends \Twig_Extension_Core
+    {
+    }
+}
diff --git a/src/Extension/DebugExtension.php b/src/Extension/DebugExtension.php
index 08ad16037..9235306f4 100644
--- a/src/Extension/DebugExtension.php
+++ b/src/Extension/DebugExtension.php
@@ -1 +1,11 @@
-./Extension/Debug.php
+<?php
+
+namespace Twig\Extension;
+
+require __DIR__.'/../../lib/Twig/Extension/Debug.php';
+
+if (\false) {
+    class DebugExtension extends \Twig_Extension_Debug
+    {
+    }
+}
diff --git a/src/Extension/EscaperExtension.php b/src/Extension/EscaperExtension.php
index 3b3f138d7..7574fe36c 100644
--- a/src/Extension/EscaperExtension.php
+++ b/src/Extension/EscaperExtension.php
@@ -1 +1,11 @@
-./Extension/Escaper.php
+<?php
+
+namespace Twig\Extension;
+
+require __DIR__.'/../../lib/Twig/Extension/Escaper.php';
+
+if (\false) {
+    class EscaperExtension extends \Twig_Extension_Escaper
+    {
+    }
+}
diff --git a/src/Extension/ExtensionInterface.php b/src/Extension/ExtensionInterface.php
index 59357bd6b..311233da6 100644
--- a/src/Extension/ExtensionInterface.php
+++ b/src/Extension/ExtensionInterface.php
@@ -1 +1,11 @@
-./ExtensionInterface.php
+<?php
+
+namespace Twig\Extension;
+
+require __DIR__.'/../../lib/Twig/ExtensionInterface.php';
+
+if (\false) {
+    class ExtensionInterface extends \Twig_ExtensionInterface
+    {
+    }
+}
diff --git a/src/Extension/OptimizerExtension.php b/src/Extension/OptimizerExtension.php
index a8365b936..25071fa01 100644
--- a/src/Extension/OptimizerExtension.php
+++ b/src/Extension/OptimizerExtension.php
@@ -1 +1,11 @@
-./Extension/Optimizer.php
+<?php
+
+namespace Twig\Extension;
+
+require __DIR__.'/../../lib/Twig/Extension/Optimizer.php';
+
+if (\false) {
+    class OptimizerExtension extends \Twig_Extension_Optimizer
+    {
+    }
+}
diff --git a/src/Extension/ProfilerExtension.php b/src/Extension/ProfilerExtension.php
index 10f79947e..5b18e822c 100644
--- a/src/Extension/ProfilerExtension.php
+++ b/src/Extension/ProfilerExtension.php
@@ -1 +1,11 @@
-./Extension/Profiler.php
+<?php
+
+namespace Twig\Extension;
+
+require __DIR__.'/../../lib/Twig/Extension/Profiler.php';
+
+if (\false) {
+    class ProfilerExtension extends \Twig_Extension_Profiler
+    {
+    }
+}
diff --git a/src/Extension/SandboxExtension.php b/src/Extension/SandboxExtension.php
index ed5fb5fbe..ea8f223b5 100644
--- a/src/Extension/SandboxExtension.php
+++ b/src/Extension/SandboxExtension.php
@@ -1 +1,11 @@
-./Extension/Sandbox.php
+<?php
+
+namespace Twig\Extension;
+
+require __DIR__.'/../../lib/Twig/Extension/Sandbox.php';
+
+if (\false) {
+    class SandboxExtension extends \Twig_Extension_Sandbox
+    {
+    }
+}
diff --git a/src/Extension/StagingExtension.php b/src/Extension/StagingExtension.php
index d450578a7..f042d6f60 100644
--- a/src/Extension/StagingExtension.php
+++ b/src/Extension/StagingExtension.php
@@ -1 +1,11 @@
-./Extension/Staging.php
+<?php
+
+namespace Twig\Extension;
+
+require __DIR__.'/../../lib/Twig/Extension/Staging.php';
+
+if (\false) {
+    class StagingExtension extends \Twig_Extension_Staging
+    {
+    }
+}
diff --git a/src/Extension/StringLoaderExtension.php b/src/Extension/StringLoaderExtension.php
index b6145694b..dfe307bc5 100644
--- a/src/Extension/StringLoaderExtension.php
+++ b/src/Extension/StringLoaderExtension.php
@@ -1 +1,11 @@
-./Extension/StringLoader.php
+<?php
+
+namespace Twig\Extension;
+
+require __DIR__.'/../../lib/Twig/Extension/StringLoader.php';
+
+if (\false) {
+    class StringLoaderExtension extends \Twig_Extension_StringLoader
+    {
+    }
+}
diff --git a/src/FileExtensionEscapingStrategy.php b/src/FileExtensionEscapingStrategy.php
index 4a5c0c9c0..f07b0bc7e 100644
--- a/src/FileExtensionEscapingStrategy.php
+++ b/src/FileExtensionEscapingStrategy.php
@@ -1 +1,11 @@
-./FileExtensionEscapingStrategy.php
+<?php
+
+namespace Twig;
+
+require __DIR__.'/../lib/Twig/FileExtensionEscapingStrategy.php';
+
+if (\false) {
+    class FileExtensionEscapingStrategy extends \Twig_FileExtensionEscapingStrategy
+    {
+    }
+}
diff --git a/src/Lexer.php b/src/Lexer.php
index 481c92d47..682c4babf 100644
--- a/src/Lexer.php
+++ b/src/Lexer.php
@@ -1 +1,11 @@
-./Lexer.php
+<?php
+
+namespace Twig;
+
+require __DIR__.'/../lib/Twig/Lexer.php';
+
+if (\false) {
+    class Lexer extends \Twig_Lexer
+    {
+    }
+}
diff --git a/src/Loader/ArrayLoader.php b/src/Loader/ArrayLoader.php
index bdab816e7..e76dd3c01 100644
--- a/src/Loader/ArrayLoader.php
+++ b/src/Loader/ArrayLoader.php
@@ -1 +1,11 @@
-./Loader/Array.php
+<?php
+
+namespace Twig\Loader;
+
+require __DIR__.'/../../lib/Twig/Loader/Array.php';
+
+if (\false) {
+    class ArrayLoader extends \Twig_Loader_Array
+    {
+    }
+}
diff --git a/src/Loader/ChainLoader.php b/src/Loader/ChainLoader.php
index 296923a44..8235cf0aa 100644
--- a/src/Loader/ChainLoader.php
+++ b/src/Loader/ChainLoader.php
@@ -1 +1,11 @@
-./Loader/Chain.php
+<?php
+
+namespace Twig\Loader;
+
+require __DIR__.'/../../lib/Twig/Loader/Chain.php';
+
+if (\false) {
+    class ChainLoader extends \Twig_Loader_Chain
+    {
+    }
+}
diff --git a/src/Loader/FilesystemLoader.php b/src/Loader/FilesystemLoader.php
index b0887a28e..2e155b618 100644
--- a/src/Loader/FilesystemLoader.php
+++ b/src/Loader/FilesystemLoader.php
@@ -1 +1,11 @@
-./Loader/Filesystem.php
+<?php
+
+namespace Twig\Loader;
+
+require __DIR__.'/../../lib/Twig/Loader/Filesystem.php';
+
+if (\false) {
+    class FilesystemLoader extends \Twig_Loader_Filesystem
+    {
+    }
+}
diff --git a/src/Loader/LoaderInterface.php b/src/Loader/LoaderInterface.php
index b3123ff05..b4843ae89 100644
--- a/src/Loader/LoaderInterface.php
+++ b/src/Loader/LoaderInterface.php
@@ -1 +1,11 @@
-./LoaderInterface.php
+<?php
+
+namespace Twig\Loader;
+
+require __DIR__.'/../../lib/Twig/LoaderInterface.php';
+
+if (\false) {
+    class LoaderInterface extends \Twig_LoaderInterface
+    {
+    }
+}
diff --git a/src/Markup.php b/src/Markup.php
index 625f20303..b27334cf0 100644
--- a/src/Markup.php
+++ b/src/Markup.php
@@ -1 +1,11 @@
-./Markup.php
+<?php
+
+namespace Twig;
+
+require __DIR__.'/../lib/Twig/Markup.php';
+
+if (\false) {
+    class Markup extends \Twig_Markup
+    {
+    }
+}
diff --git a/src/Node/AutoEscapeNode.php b/src/Node/AutoEscapeNode.php
index c2ba46b7a..265d4f68b 100644
--- a/src/Node/AutoEscapeNode.php
+++ b/src/Node/AutoEscapeNode.php
@@ -1 +1,11 @@
-./Node/AutoEscape.php
+<?php
+
+namespace Twig\Node;
+
+require __DIR__.'/../../lib/Twig/Node/AutoEscape.php';
+
+if (\false) {
+    class AutoEscapeNode extends \Twig_Node_AutoEscape
+    {
+    }
+}
diff --git a/src/Node/BlockNode.php b/src/Node/BlockNode.php
index 1d5516a2d..d609041bb 100644
--- a/src/Node/BlockNode.php
+++ b/src/Node/BlockNode.php
@@ -1 +1,11 @@
-./Node/Block.php
+<?php
+
+namespace Twig\Node;
+
+require __DIR__.'/../../lib/Twig/Node/Block.php';
+
+if (\false) {
+    class BlockNode extends \Twig_Node_Block
+    {
+    }
+}
diff --git a/src/Node/BlockReferenceNode.php b/src/Node/BlockReferenceNode.php
index 62f950128..b0a09c2ad 100644
--- a/src/Node/BlockReferenceNode.php
+++ b/src/Node/BlockReferenceNode.php
@@ -1 +1,11 @@
-./Node/BlockReference.php
+<?php
+
+namespace Twig\Node;
+
+require __DIR__.'/../../lib/Twig/Node/BlockReference.php';
+
+if (\false) {
+    class BlockReferenceNode extends \Twig_Node_BlockReference
+    {
+    }
+}
diff --git a/src/Node/BodyNode.php b/src/Node/BodyNode.php
index c78b9b46f..9f7b79857 100644
--- a/src/Node/BodyNode.php
+++ b/src/Node/BodyNode.php
@@ -1 +1,11 @@
-./Node/Body.php
+<?php
+
+namespace Twig\Node;
+
+require __DIR__.'/../../lib/Twig/Node/Body.php';
+
+if (\false) {
+    class BodyNode extends \Twig_Node_Body
+    {
+    }
+}
diff --git a/src/Node/CheckSecurityNode.php b/src/Node/CheckSecurityNode.php
index 319ddb549..748d6844e 100644
--- a/src/Node/CheckSecurityNode.php
+++ b/src/Node/CheckSecurityNode.php
@@ -1 +1,11 @@
-./Node/CheckSecurity.php
+<?php
+
+namespace Twig\Node;
+
+require __DIR__.'/../../lib/Twig/Node/CheckSecurity.php';
+
+if (\false) {
+    class CheckSecurityNode extends \Twig_Node_CheckSecurity
+    {
+    }
+}
diff --git a/src/Node/DoNode.php b/src/Node/DoNode.php
index f64833430..086d6f84b 100644
--- a/src/Node/DoNode.php
+++ b/src/Node/DoNode.php
@@ -1 +1,11 @@
-./Node/Do.php
+<?php
+
+namespace Twig\Node;
+
+require __DIR__.'/../../lib/Twig/Node/Do.php';
+
+if (\false) {
+    class DoNode extends \Twig_Node_Do
+    {
+    }
+}
diff --git a/src/Node/EmbedNode.php b/src/Node/EmbedNode.php
index 1b3cfbb0e..70d57c57b 100644
--- a/src/Node/EmbedNode.php
+++ b/src/Node/EmbedNode.php
@@ -1 +1,11 @@
-./Node/Embed.php
+<?php
+
+namespace Twig\Node;
+
+require __DIR__.'/../../lib/Twig/Node/Embed.php';
+
+if (\false) {
+    class EmbedNode extends \Twig_Node_Embed
+    {
+    }
+}
diff --git a/src/Node/Expression/AbstractExpression.php b/src/Node/Expression/AbstractExpression.php
index 6b4098c26..d699b8df0 100644
--- a/src/Node/Expression/AbstractExpression.php
+++ b/src/Node/Expression/AbstractExpression.php
@@ -1 +1,11 @@
-./Node/Expression.php
+<?php
+
+namespace Twig\Node\Expression;
+
+require __DIR__.'/../../../lib/Twig/Node/Expression.php';
+
+if (\false) {
+    class AbstractExpression extends \Twig_Node_Expression
+    {
+    }
+}
diff --git a/src/Node/Expression/ArrayExpression.php b/src/Node/Expression/ArrayExpression.php
index 6970192e6..56913b7f7 100644
--- a/src/Node/Expression/ArrayExpression.php
+++ b/src/Node/Expression/ArrayExpression.php
@@ -1 +1,11 @@
-./Node/Expression/Array.php
+<?php
+
+namespace Twig\Node\Expression;
+
+require __DIR__.'/../../../lib/Twig/Node/Expression/Array.php';
+
+if (\false) {
+    class ArrayExpression extends \Twig_Node_Expression_Array
+    {
+    }
+}
diff --git a/src/Node/Expression/AssignNameExpression.php b/src/Node/Expression/AssignNameExpression.php
index ffa11ea00..2bf838da3 100644
--- a/src/Node/Expression/AssignNameExpression.php
+++ b/src/Node/Expression/AssignNameExpression.php
@@ -1 +1,11 @@
-./Node/Expression/AssignName.php
+<?php
+
+namespace Twig\Node\Expression;
+
+require __DIR__.'/../../../lib/Twig/Node/Expression/AssignName.php';
+
+if (\false) {
+    class AssignNameExpression extends \Twig_Node_Expression_AssignName
+    {
+    }
+}
diff --git a/src/Node/Expression/Binary/AbstractBinary.php b/src/Node/Expression/Binary/AbstractBinary.php
index 95a40dab8..febd50f0a 100644
--- a/src/Node/Expression/Binary/AbstractBinary.php
+++ b/src/Node/Expression/Binary/AbstractBinary.php
@@ -1 +1,11 @@
-./Node/Expression/Binary.php
+<?php
+
+namespace Twig\Node\Expression\Binary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary.php';
+
+if (\false) {
+    class AbstractBinary extends \Twig_Node_Expression_Binary
+    {
+    }
+}
diff --git a/src/Node/Expression/Binary/AddBinary.php b/src/Node/Expression/Binary/AddBinary.php
index 4793e23ad..7c5f4029f 100644
--- a/src/Node/Expression/Binary/AddBinary.php
+++ b/src/Node/Expression/Binary/AddBinary.php
@@ -1 +1,11 @@
-./Node/Expression/Binary/Add.php
+<?php
+
+namespace Twig\Node\Expression\Binary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/Add.php';
+
+if (\false) {
+    class AddBinary extends \Twig_Node_Expression_Binary_Add
+    {
+    }
+}
diff --git a/src/Node/Expression/Binary/AndBinary.php b/src/Node/Expression/Binary/AndBinary.php
index 97176f7d2..0e33e9c1f 100644
--- a/src/Node/Expression/Binary/AndBinary.php
+++ b/src/Node/Expression/Binary/AndBinary.php
@@ -1 +1,11 @@
-./Node/Expression/Binary/And.php
+<?php
+
+namespace Twig\Node\Expression\Binary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/And.php';
+
+if (\false) {
+    class AndBinary extends \Twig_Node_Expression_Binary_And
+    {
+    }
+}
diff --git a/src/Node/Expression/Binary/BitwiseAndBinary.php b/src/Node/Expression/Binary/BitwiseAndBinary.php
index 4b9a04635..0b916123d 100644
--- a/src/Node/Expression/Binary/BitwiseAndBinary.php
+++ b/src/Node/Expression/Binary/BitwiseAndBinary.php
@@ -1 +1,11 @@
-./Node/Expression/Binary/BitwiseAnd.php
+<?php
+
+namespace Twig\Node\Expression\Binary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/BitwiseAnd.php';
+
+if (\false) {
+    class BitwiseAndBinary extends \Twig_Node_Expression_Binary_BitwiseAnd
+    {
+    }
+}
diff --git a/src/Node/Expression/Binary/BitwiseOrBinary.php b/src/Node/Expression/Binary/BitwiseOrBinary.php
index b7a77c686..4a5216c28 100644
--- a/src/Node/Expression/Binary/BitwiseOrBinary.php
+++ b/src/Node/Expression/Binary/BitwiseOrBinary.php
@@ -1 +1,11 @@
-./Node/Expression/Binary/BitwiseOr.php
+<?php
+
+namespace Twig\Node\Expression\Binary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/BitwiseOr.php';
+
+if (\false) {
+    class BitwiseOrBinary extends \Twig_Node_Expression_Binary_BitwiseOr
+    {
+    }
+}
diff --git a/src/Node/Expression/Binary/BitwiseXorBinary.php b/src/Node/Expression/Binary/BitwiseXorBinary.php
index de9dc4637..2da6c7b5b 100644
--- a/src/Node/Expression/Binary/BitwiseXorBinary.php
+++ b/src/Node/Expression/Binary/BitwiseXorBinary.php
@@ -1 +1,11 @@
-./Node/Expression/Binary/BitwiseXor.php
+<?php
+
+namespace Twig\Node\Expression\Binary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/BitwiseXor.php';
+
+if (\false) {
+    class BitwiseXorBinary extends \Twig_Node_Expression_Binary_BitwiseXor
+    {
+    }
+}
diff --git a/src/Node/Expression/Binary/ConcatBinary.php b/src/Node/Expression/Binary/ConcatBinary.php
index c4f5c399c..8f6218641 100644
--- a/src/Node/Expression/Binary/ConcatBinary.php
+++ b/src/Node/Expression/Binary/ConcatBinary.php
@@ -1 +1,11 @@
-./Node/Expression/Binary/Concat.php
+<?php
+
+namespace Twig\Node\Expression\Binary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/Concat.php';
+
+if (\false) {
+    class ConcatBinary extends \Twig_Node_Expression_Binary_Concat
+    {
+    }
+}
diff --git a/src/Node/Expression/Binary/DivBinary.php b/src/Node/Expression/Binary/DivBinary.php
index 0fb54495c..bdd8d4d3b 100644
--- a/src/Node/Expression/Binary/DivBinary.php
+++ b/src/Node/Expression/Binary/DivBinary.php
@@ -1 +1,11 @@
-./Node/Expression/Binary/Div.php
+<?php
+
+namespace Twig\Node\Expression\Binary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/Div.php';
+
+if (\false) {
+    class DivBinary extends \Twig_Node_Expression_Binary_Div
+    {
+    }
+}
diff --git a/src/Node/Expression/Binary/EndsWithBinary.php b/src/Node/Expression/Binary/EndsWithBinary.php
index 876e2d4cf..5ef4ecb56 100644
--- a/src/Node/Expression/Binary/EndsWithBinary.php
+++ b/src/Node/Expression/Binary/EndsWithBinary.php
@@ -1 +1,11 @@
-./Node/Expression/Binary/EndsWith.php
+<?php
+
+namespace Twig\Node\Expression\Binary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/EndsWith.php';
+
+if (\false) {
+    class EndsWithBinary extends \Twig_Node_Expression_Binary_EndsWith
+    {
+    }
+}
diff --git a/src/Node/Expression/Binary/EqualBinary.php b/src/Node/Expression/Binary/EqualBinary.php
index 88117edfd..dc7a7ffb0 100644
--- a/src/Node/Expression/Binary/EqualBinary.php
+++ b/src/Node/Expression/Binary/EqualBinary.php
@@ -1 +1,11 @@
-./Node/Expression/Binary/Equal.php
+<?php
+
+namespace Twig\Node\Expression\Binary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/Equal.php';
+
+if (\false) {
+    class EqualBinary extends \Twig_Node_Expression_Binary_Equal
+    {
+    }
+}
diff --git a/src/Node/Expression/Binary/FloorDivBinary.php b/src/Node/Expression/Binary/FloorDivBinary.php
index 3f07d473f..e8cebb214 100644
--- a/src/Node/Expression/Binary/FloorDivBinary.php
+++ b/src/Node/Expression/Binary/FloorDivBinary.php
@@ -1 +1,11 @@
-./Node/Expression/Binary/FloorDiv.php
+<?php
+
+namespace Twig\Node\Expression\Binary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/FloorDiv.php';
+
+if (\false) {
+    class FloorDivBinary extends \Twig_Node_Expression_Binary_FloorDiv
+    {
+    }
+}
diff --git a/src/Node/Expression/Binary/GreaterBinary.php b/src/Node/Expression/Binary/GreaterBinary.php
index 9a4b86204..9f29cda22 100644
--- a/src/Node/Expression/Binary/GreaterBinary.php
+++ b/src/Node/Expression/Binary/GreaterBinary.php
@@ -1 +1,11 @@
-./Node/Expression/Binary/Greater.php
+<?php
+
+namespace Twig\Node\Expression\Binary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/Greater.php';
+
+if (\false) {
+    class GreaterBinary extends \Twig_Node_Expression_Binary_Greater
+    {
+    }
+}
diff --git a/src/Node/Expression/Binary/GreaterEqualBinary.php b/src/Node/Expression/Binary/GreaterEqualBinary.php
index 844a4412d..9e1feb53c 100644
--- a/src/Node/Expression/Binary/GreaterEqualBinary.php
+++ b/src/Node/Expression/Binary/GreaterEqualBinary.php
@@ -1 +1,11 @@
-./Node/Expression/Binary/GreaterEqual.php
+<?php
+
+namespace Twig\Node\Expression\Binary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/GreaterEqual.php';
+
+if (\false) {
+    class GreaterEqualBinary extends \Twig_Node_Expression_Binary_GreaterEqual
+    {
+    }
+}
diff --git a/src/Node/Expression/Binary/InBinary.php b/src/Node/Expression/Binary/InBinary.php
index dde607ef8..7bb6e68b0 100644
--- a/src/Node/Expression/Binary/InBinary.php
+++ b/src/Node/Expression/Binary/InBinary.php
@@ -1 +1,11 @@
-./Node/Expression/Binary/In.php
+<?php
+
+namespace Twig\Node\Expression\Binary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/In.php';
+
+if (\false) {
+    class InBinary extends \Twig_Node_Expression_Binary_In
+    {
+    }
+}
diff --git a/src/Node/Expression/Binary/LessBinary.php b/src/Node/Expression/Binary/LessBinary.php
index e249d44c7..4504b468a 100644
--- a/src/Node/Expression/Binary/LessBinary.php
+++ b/src/Node/Expression/Binary/LessBinary.php
@@ -1 +1,11 @@
-./Node/Expression/Binary/Less.php
+<?php
+
+namespace Twig\Node\Expression\Binary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/Less.php';
+
+if (\false) {
+    class LessBinary extends \Twig_Node_Expression_Binary_Less
+    {
+    }
+}
diff --git a/src/Node/Expression/Binary/LessEqualBinary.php b/src/Node/Expression/Binary/LessEqualBinary.php
index 0f5996a49..d298ce68c 100644
--- a/src/Node/Expression/Binary/LessEqualBinary.php
+++ b/src/Node/Expression/Binary/LessEqualBinary.php
@@ -1 +1,11 @@
-./Node/Expression/Binary/LessEqual.php
+<?php
+
+namespace Twig\Node\Expression\Binary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/LessEqual.php';
+
+if (\false) {
+    class LessEqualBinary extends \Twig_Node_Expression_Binary_LessEqual
+    {
+    }
+}
diff --git a/src/Node/Expression/Binary/MatchesBinary.php b/src/Node/Expression/Binary/MatchesBinary.php
index b81a6fbb1..241c67ebd 100644
--- a/src/Node/Expression/Binary/MatchesBinary.php
+++ b/src/Node/Expression/Binary/MatchesBinary.php
@@ -1 +1,11 @@
-./Node/Expression/Binary/Matches.php
+<?php
+
+namespace Twig\Node\Expression\Binary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/Matches.php';
+
+if (\false) {
+    class MatchesBinary extends \Twig_Node_Expression_Binary_Matches
+    {
+    }
+}
diff --git a/src/Node/Expression/Binary/ModBinary.php b/src/Node/Expression/Binary/ModBinary.php
index dad19a17a..84d091648 100644
--- a/src/Node/Expression/Binary/ModBinary.php
+++ b/src/Node/Expression/Binary/ModBinary.php
@@ -1 +1,11 @@
-./Node/Expression/Binary/Mod.php
+<?php
+
+namespace Twig\Node\Expression\Binary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/Mod.php';
+
+if (\false) {
+    class ModBinary extends \Twig_Node_Expression_Binary_Mod
+    {
+    }
+}
diff --git a/src/Node/Expression/Binary/MulBinary.php b/src/Node/Expression/Binary/MulBinary.php
index fd64786f4..d62dd5e13 100644
--- a/src/Node/Expression/Binary/MulBinary.php
+++ b/src/Node/Expression/Binary/MulBinary.php
@@ -1 +1,11 @@
-./Node/Expression/Binary/Mul.php
+<?php
+
+namespace Twig\Node\Expression\Binary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/Mul.php';
+
+if (\false) {
+    class MulBinary extends \Twig_Node_Expression_Binary_Mul
+    {
+    }
+}
diff --git a/src/Node/Expression/Binary/NotEqualBinary.php b/src/Node/Expression/Binary/NotEqualBinary.php
index 57a64e4e1..2e3a88b26 100644
--- a/src/Node/Expression/Binary/NotEqualBinary.php
+++ b/src/Node/Expression/Binary/NotEqualBinary.php
@@ -1 +1,11 @@
-./Node/Expression/Binary/NotEqual.php
+<?php
+
+namespace Twig\Node\Expression\Binary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/NotEqual.php';
+
+if (\false) {
+    class NotEqualBinary extends \Twig_Node_Expression_Binary_NotEqual
+    {
+    }
+}
diff --git a/src/Node/Expression/Binary/NotInBinary.php b/src/Node/Expression/Binary/NotInBinary.php
index abc611893..630f006f1 100644
--- a/src/Node/Expression/Binary/NotInBinary.php
+++ b/src/Node/Expression/Binary/NotInBinary.php
@@ -1 +1,11 @@
-./Node/Expression/Binary/NotIn.php
+<?php
+
+namespace Twig\Node\Expression\Binary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/NotIn.php';
+
+if (\false) {
+    class NotInBinary extends \Twig_Node_Expression_Binary_NotIn
+    {
+    }
+}
diff --git a/src/Node/Expression/Binary/OrBinary.php b/src/Node/Expression/Binary/OrBinary.php
index 4cd077ce9..320fb7edb 100644
--- a/src/Node/Expression/Binary/OrBinary.php
+++ b/src/Node/Expression/Binary/OrBinary.php
@@ -1 +1,11 @@
-./Node/Expression/Binary/Or.php
+<?php
+
+namespace Twig\Node\Expression\Binary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/Or.php';
+
+if (\false) {
+    class OrBinary extends \Twig_Node_Expression_Binary_Or
+    {
+    }
+}
diff --git a/src/Node/Expression/Binary/PowerBinary.php b/src/Node/Expression/Binary/PowerBinary.php
index 875b18156..dbd201a55 100644
--- a/src/Node/Expression/Binary/PowerBinary.php
+++ b/src/Node/Expression/Binary/PowerBinary.php
@@ -1 +1,11 @@
-./Node/Expression/Binary/Power.php
+<?php
+
+namespace Twig\Node\Expression\Binary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/Power.php';
+
+if (\false) {
+    class PowerBinary extends \Twig_Node_Expression_Binary_Power
+    {
+    }
+}
diff --git a/src/Node/Expression/Binary/RangeBinary.php b/src/Node/Expression/Binary/RangeBinary.php
index d52c86962..0f5fe11ba 100644
--- a/src/Node/Expression/Binary/RangeBinary.php
+++ b/src/Node/Expression/Binary/RangeBinary.php
@@ -1 +1,11 @@
-./Node/Expression/Binary/Range.php
+<?php
+
+namespace Twig\Node\Expression\Binary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/Range.php';
+
+if (\false) {
+    class RangeBinary extends \Twig_Node_Expression_Binary_Range
+    {
+    }
+}
diff --git a/src/Node/Expression/Binary/StartsWithBinary.php b/src/Node/Expression/Binary/StartsWithBinary.php
index 5a99fefc8..3d1249fe1 100644
--- a/src/Node/Expression/Binary/StartsWithBinary.php
+++ b/src/Node/Expression/Binary/StartsWithBinary.php
@@ -1 +1,11 @@
-./Node/Expression/Binary/StartsWith.php
+<?php
+
+namespace Twig\Node\Expression\Binary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/StartsWith.php';
+
+if (\false) {
+    class StartsWithBinary extends \Twig_Node_Expression_Binary_StartsWith
+    {
+    }
+}
diff --git a/src/Node/Expression/Binary/SubBinary.php b/src/Node/Expression/Binary/SubBinary.php
index abee3f4d6..724abb42f 100644
--- a/src/Node/Expression/Binary/SubBinary.php
+++ b/src/Node/Expression/Binary/SubBinary.php
@@ -1 +1,11 @@
-./Node/Expression/Binary/Sub.php
+<?php
+
+namespace Twig\Node\Expression\Binary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Binary/Sub.php';
+
+if (\false) {
+    class SubBinary extends \Twig_Node_Expression_Binary_Sub
+    {
+    }
+}
diff --git a/src/Node/Expression/BlockReferenceExpression.php b/src/Node/Expression/BlockReferenceExpression.php
index ebc7eb1ff..171552e8b 100644
--- a/src/Node/Expression/BlockReferenceExpression.php
+++ b/src/Node/Expression/BlockReferenceExpression.php
@@ -1 +1,11 @@
-./Node/Expression/BlockReference.php
+<?php
+
+namespace Twig\Node\Expression;
+
+require __DIR__.'/../../../lib/Twig/Node/Expression/BlockReference.php';
+
+if (\false) {
+    class BlockReferenceExpression extends \Twig_Node_Expression_BlockReference
+    {
+    }
+}
diff --git a/src/Node/Expression/CallExpression.php b/src/Node/Expression/CallExpression.php
index d0f99d8ce..dc0e299a7 100644
--- a/src/Node/Expression/CallExpression.php
+++ b/src/Node/Expression/CallExpression.php
@@ -1 +1,11 @@
-./Node/Expression/Call.php
+<?php
+
+namespace Twig\Node\Expression;
+
+require __DIR__.'/../../../lib/Twig/Node/Expression/Call.php';
+
+if (\false) {
+    class CallExpression extends \Twig_Node_Expression_Call
+    {
+    }
+}
diff --git a/src/Node/Expression/ConditionalExpression.php b/src/Node/Expression/ConditionalExpression.php
index 38b0d9cb9..8dca9d5be 100644
--- a/src/Node/Expression/ConditionalExpression.php
+++ b/src/Node/Expression/ConditionalExpression.php
@@ -1 +1,11 @@
-./Node/Expression/Conditional.php
+<?php
+
+namespace Twig\Node\Expression;
+
+require __DIR__.'/../../../lib/Twig/Node/Expression/Conditional.php';
+
+if (\false) {
+    class ConditionalExpression extends \Twig_Node_Expression_Conditional
+    {
+    }
+}
diff --git a/src/Node/Expression/ConstantExpression.php b/src/Node/Expression/ConstantExpression.php
index 8fd3de892..684b00ee6 100644
--- a/src/Node/Expression/ConstantExpression.php
+++ b/src/Node/Expression/ConstantExpression.php
@@ -1 +1,11 @@
-./Node/Expression/Constant.php
+<?php
+
+namespace Twig\Node\Expression;
+
+require __DIR__.'/../../../lib/Twig/Node/Expression/Constant.php';
+
+if (\false) {
+    class ConstantExpression extends \Twig_Node_Expression_Constant
+    {
+    }
+}
diff --git a/src/Node/Expression/Filter/DefaultFilter.php b/src/Node/Expression/Filter/DefaultFilter.php
index 0a5b04be2..f891e78f9 100644
--- a/src/Node/Expression/Filter/DefaultFilter.php
+++ b/src/Node/Expression/Filter/DefaultFilter.php
@@ -1 +1,11 @@
-./Node/Expression/Filter/Default.php
+<?php
+
+namespace Twig\Node\Expression\Filter;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Filter/Default.php';
+
+if (\false) {
+    class DefaultFilter extends \Twig_Node_Expression_Filter_Default
+    {
+    }
+}
diff --git a/src/Node/Expression/FilterExpression.php b/src/Node/Expression/FilterExpression.php
index 7e2ec0b1b..2397b5f1d 100644
--- a/src/Node/Expression/FilterExpression.php
+++ b/src/Node/Expression/FilterExpression.php
@@ -1 +1,11 @@
-./Node/Expression/Filter.php
+<?php
+
+namespace Twig\Node\Expression;
+
+require __DIR__.'/../../../lib/Twig/Node/Expression/Filter.php';
+
+if (\false) {
+    class FilterExpression extends \Twig_Node_Expression_Filter
+    {
+    }
+}
diff --git a/src/Node/Expression/FunctionExpression.php b/src/Node/Expression/FunctionExpression.php
index 08572e898..cbf8e1794 100644
--- a/src/Node/Expression/FunctionExpression.php
+++ b/src/Node/Expression/FunctionExpression.php
@@ -1 +1,11 @@
-./Node/Expression/Function.php
+<?php
+
+namespace Twig\Node\Expression;
+
+require __DIR__.'/../../../lib/Twig/Node/Expression/Function.php';
+
+if (\false) {
+    class FunctionExpression extends \Twig_Node_Expression_Function
+    {
+    }
+}
diff --git a/src/Node/Expression/GetAttrExpression.php b/src/Node/Expression/GetAttrExpression.php
index 79ddf8fb4..dde336c64 100644
--- a/src/Node/Expression/GetAttrExpression.php
+++ b/src/Node/Expression/GetAttrExpression.php
@@ -1 +1,11 @@
-./Node/Expression/GetAttr.php
+<?php
+
+namespace Twig\Node\Expression;
+
+require __DIR__.'/../../../lib/Twig/Node/Expression/GetAttr.php';
+
+if (\false) {
+    class GetAttrExpression extends \Twig_Node_Expression_GetAttr
+    {
+    }
+}
diff --git a/src/Node/Expression/MethodCallExpression.php b/src/Node/Expression/MethodCallExpression.php
index 10e2b966f..5cab3371a 100644
--- a/src/Node/Expression/MethodCallExpression.php
+++ b/src/Node/Expression/MethodCallExpression.php
@@ -1 +1,11 @@
-./Node/Expression/MethodCall.php
+<?php
+
+namespace Twig\Node\Expression;
+
+require __DIR__.'/../../../lib/Twig/Node/Expression/MethodCall.php';
+
+if (\false) {
+    class MethodCallExpression extends \Twig_Node_Expression_MethodCall
+    {
+    }
+}
diff --git a/src/Node/Expression/NameExpression.php b/src/Node/Expression/NameExpression.php
index 5b0e2c9f7..d888790c7 100644
--- a/src/Node/Expression/NameExpression.php
+++ b/src/Node/Expression/NameExpression.php
@@ -1 +1,11 @@
-./Node/Expression/Name.php
+<?php
+
+namespace Twig\Node\Expression;
+
+require __DIR__.'/../../../lib/Twig/Node/Expression/Name.php';
+
+if (\false) {
+    class NameExpression extends \Twig_Node_Expression_Name
+    {
+    }
+}
diff --git a/src/Node/Expression/NullCoalesceExpression.php b/src/Node/Expression/NullCoalesceExpression.php
index 278f1ad42..4cbb28816 100644
--- a/src/Node/Expression/NullCoalesceExpression.php
+++ b/src/Node/Expression/NullCoalesceExpression.php
@@ -1 +1,11 @@
-./Node/Expression/NullCoalesce.php
+<?php
+
+namespace Twig\Node\Expression;
+
+require __DIR__.'/../../../lib/Twig/Node/Expression/NullCoalesce.php';
+
+if (\false) {
+    class NullCoalesceExpression extends \Twig_Node_Expression_NullCoalesce
+    {
+    }
+}
diff --git a/src/Node/Expression/ParentExpression.php b/src/Node/Expression/ParentExpression.php
index 6944dd40b..fd169df38 100644
--- a/src/Node/Expression/ParentExpression.php
+++ b/src/Node/Expression/ParentExpression.php
@@ -1 +1,11 @@
-./Node/Expression/Parent.php
+<?php
+
+namespace Twig\Node\Expression;
+
+require __DIR__.'/../../../lib/Twig/Node/Expression/Parent.php';
+
+if (\false) {
+    class ParentExpression extends \Twig_Node_Expression_Parent
+    {
+    }
+}
diff --git a/src/Node/Expression/TempNameExpression.php b/src/Node/Expression/TempNameExpression.php
index 170d368b6..ab2dc8761 100644
--- a/src/Node/Expression/TempNameExpression.php
+++ b/src/Node/Expression/TempNameExpression.php
@@ -1 +1,11 @@
-./Node/Expression/TempName.php
+<?php
+
+namespace Twig\Node\Expression;
+
+require __DIR__.'/../../../lib/Twig/Node/Expression/TempName.php';
+
+if (\false) {
+    class TempNameExpression extends \Twig_Node_Expression_TempName
+    {
+    }
+}
diff --git a/src/Node/Expression/Test/ConstantTest.php b/src/Node/Expression/Test/ConstantTest.php
index 5e9bf0b3f..9fb9f9f4c 100644
--- a/src/Node/Expression/Test/ConstantTest.php
+++ b/src/Node/Expression/Test/ConstantTest.php
@@ -1 +1,11 @@
-./Node/Expression/Test/Constant.php
+<?php
+
+namespace Twig\Node\Expression\Test;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Test/Constant.php';
+
+if (\false) {
+    class ConstantTest extends \Twig_Node_Expression_Test_Constant
+    {
+    }
+}
diff --git a/src/Node/Expression/Test/DefinedTest.php b/src/Node/Expression/Test/DefinedTest.php
index ecfeb5cdc..bf38e65cc 100644
--- a/src/Node/Expression/Test/DefinedTest.php
+++ b/src/Node/Expression/Test/DefinedTest.php
@@ -1 +1,11 @@
-./Node/Expression/Test/Defined.php
+<?php
+
+namespace Twig\Node\Expression\Test;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Test/Defined.php';
+
+if (\false) {
+    class DefinedTest extends \Twig_Node_Expression_Test_Defined
+    {
+    }
+}
diff --git a/src/Node/Expression/Test/DivisiblebyTest.php b/src/Node/Expression/Test/DivisiblebyTest.php
index 26458df18..413d768a8 100644
--- a/src/Node/Expression/Test/DivisiblebyTest.php
+++ b/src/Node/Expression/Test/DivisiblebyTest.php
@@ -1 +1,11 @@
-./Node/Expression/Test/Divisibleby.php
+<?php
+
+namespace Twig\Node\Expression\Test;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Test/Divisibleby.php';
+
+if (\false) {
+    class DivisiblebyTest extends \Twig_Node_Expression_Test_Divisibleby
+    {
+    }
+}
diff --git a/src/Node/Expression/Test/EvenTest.php b/src/Node/Expression/Test/EvenTest.php
index 82323bdd7..0aa2063a4 100644
--- a/src/Node/Expression/Test/EvenTest.php
+++ b/src/Node/Expression/Test/EvenTest.php
@@ -1 +1,11 @@
-./Node/Expression/Test/Even.php
+<?php
+
+namespace Twig\Node\Expression\Test;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Test/Even.php';
+
+if (\false) {
+    class EvenTest extends \Twig_Node_Expression_Test_Even
+    {
+    }
+}
diff --git a/src/Node/Expression/Test/NullTest.php b/src/Node/Expression/Test/NullTest.php
index 7878afe77..707cdef32 100644
--- a/src/Node/Expression/Test/NullTest.php
+++ b/src/Node/Expression/Test/NullTest.php
@@ -1 +1,11 @@
-./Node/Expression/Test/Null.php
+<?php
+
+namespace Twig\Node\Expression\Test;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Test/Null.php';
+
+if (\false) {
+    class NullTest extends \Twig_Node_Expression_Test_Null
+    {
+    }
+}
diff --git a/src/Node/Expression/Test/OddTest.php b/src/Node/Expression/Test/OddTest.php
index 2065af5e2..a19371933 100644
--- a/src/Node/Expression/Test/OddTest.php
+++ b/src/Node/Expression/Test/OddTest.php
@@ -1 +1,11 @@
-./Node/Expression/Test/Odd.php
+<?php
+
+namespace Twig\Node\Expression\Test;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Test/Odd.php';
+
+if (\false) {
+    class OddTest extends \Twig_Node_Expression_Test_Odd
+    {
+    }
+}
diff --git a/src/Node/Expression/Test/SameasTest.php b/src/Node/Expression/Test/SameasTest.php
index d4400d294..56233710f 100644
--- a/src/Node/Expression/Test/SameasTest.php
+++ b/src/Node/Expression/Test/SameasTest.php
@@ -1 +1,11 @@
-./Node/Expression/Test/Sameas.php
+<?php
+
+namespace Twig\Node\Expression\Test;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Test/Sameas.php';
+
+if (\false) {
+    class SameasTest extends \Twig_Node_Expression_Test_Sameas
+    {
+    }
+}
diff --git a/src/Node/Expression/TestExpression.php b/src/Node/Expression/TestExpression.php
index 2b235aa56..721fff869 100644
--- a/src/Node/Expression/TestExpression.php
+++ b/src/Node/Expression/TestExpression.php
@@ -1 +1,11 @@
-./Node/Expression/Test.php
+<?php
+
+namespace Twig\Node\Expression;
+
+require __DIR__.'/../../../lib/Twig/Node/Expression/Test.php';
+
+if (\false) {
+    class TestExpression extends \Twig_Node_Expression_Test
+    {
+    }
+}
diff --git a/src/Node/Expression/Unary/AbstractUnary.php b/src/Node/Expression/Unary/AbstractUnary.php
index 7c8453958..6cff442a4 100644
--- a/src/Node/Expression/Unary/AbstractUnary.php
+++ b/src/Node/Expression/Unary/AbstractUnary.php
@@ -1 +1,11 @@
-./Node/Expression/Unary.php
+<?php
+
+namespace Twig\Node\Expression\Unary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Unary.php';
+
+if (\false) {
+    class AbstractUnary extends \Twig_Node_Expression_Unary
+    {
+    }
+}
diff --git a/src/Node/Expression/Unary/NegUnary.php b/src/Node/Expression/Unary/NegUnary.php
index cbcfb6994..655e51f16 100644
--- a/src/Node/Expression/Unary/NegUnary.php
+++ b/src/Node/Expression/Unary/NegUnary.php
@@ -1 +1,11 @@
-./Node/Expression/Unary/Neg.php
+<?php
+
+namespace Twig\Node\Expression\Unary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Unary/Neg.php';
+
+if (\false) {
+    class NegUnary extends \Twig_Node_Expression_Unary_Neg
+    {
+    }
+}
diff --git a/src/Node/Expression/Unary/NotUnary.php b/src/Node/Expression/Unary/NotUnary.php
index 7d877898c..86a2f99ff 100644
--- a/src/Node/Expression/Unary/NotUnary.php
+++ b/src/Node/Expression/Unary/NotUnary.php
@@ -1 +1,11 @@
-./Node/Expression/Unary/Not.php
+<?php
+
+namespace Twig\Node\Expression\Unary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Unary/Not.php';
+
+if (\false) {
+    class NotUnary extends \Twig_Node_Expression_Unary_Not
+    {
+    }
+}
diff --git a/src/Node/Expression/Unary/PosUnary.php b/src/Node/Expression/Unary/PosUnary.php
index c0e20a227..b7e8392b2 100644
--- a/src/Node/Expression/Unary/PosUnary.php
+++ b/src/Node/Expression/Unary/PosUnary.php
@@ -1 +1,11 @@
-./Node/Expression/Unary/Pos.php
+<?php
+
+namespace Twig\Node\Expression\Unary;
+
+require __DIR__.'/../../../../lib/Twig/Node/Expression/Unary/Pos.php';
+
+if (\false) {
+    class PosUnary extends \Twig_Node_Expression_Unary_Pos
+    {
+    }
+}
diff --git a/src/Node/FlushNode.php b/src/Node/FlushNode.php
index c266be1c9..e8d77b628 100644
--- a/src/Node/FlushNode.php
+++ b/src/Node/FlushNode.php
@@ -1 +1,11 @@
-./Node/Flush.php
+<?php
+
+namespace Twig\Node;
+
+require __DIR__.'/../../lib/Twig/Node/Flush.php';
+
+if (\false) {
+    class FlushNode extends \Twig_Node_Flush
+    {
+    }
+}
diff --git a/src/Node/ForLoopNode.php b/src/Node/ForLoopNode.php
index 4dac09fa9..a64512f35 100644
--- a/src/Node/ForLoopNode.php
+++ b/src/Node/ForLoopNode.php
@@ -1 +1,11 @@
-./Node/ForLoop.php
+<?php
+
+namespace Twig\Node;
+
+require __DIR__.'/../../lib/Twig/Node/ForLoop.php';
+
+if (\false) {
+    class ForLoopNode extends \Twig_Node_ForLoop
+    {
+    }
+}
diff --git a/src/Node/ForNode.php b/src/Node/ForNode.php
index c920d38fe..00b38683b 100644
--- a/src/Node/ForNode.php
+++ b/src/Node/ForNode.php
@@ -1 +1,11 @@
-./Node/For.php
+<?php
+
+namespace Twig\Node;
+
+require __DIR__.'/../../lib/Twig/Node/For.php';
+
+if (\false) {
+    class ForNode extends \Twig_Node_For
+    {
+    }
+}
diff --git a/src/Node/IfNode.php b/src/Node/IfNode.php
index cc472f2c5..81b057d38 100644
--- a/src/Node/IfNode.php
+++ b/src/Node/IfNode.php
@@ -1 +1,11 @@
-./Node/If.php
+<?php
+
+namespace Twig\Node;
+
+require __DIR__.'/../../lib/Twig/Node/If.php';
+
+if (\false) {
+    class IfNode extends \Twig_Node_If
+    {
+    }
+}
diff --git a/src/Node/ImportNode.php b/src/Node/ImportNode.php
index 312b59fe0..c4e32375d 100644
--- a/src/Node/ImportNode.php
+++ b/src/Node/ImportNode.php
@@ -1 +1,11 @@
-./Node/Import.php
+<?php
+
+namespace Twig\Node;
+
+require __DIR__.'/../../lib/Twig/Node/Import.php';
+
+if (\false) {
+    class ImportNode extends \Twig_Node_Import
+    {
+    }
+}
diff --git a/src/Node/IncludeNode.php b/src/Node/IncludeNode.php
index 11d641c2c..16c415763 100644
--- a/src/Node/IncludeNode.php
+++ b/src/Node/IncludeNode.php
@@ -1 +1,11 @@
-./Node/Include.php
+<?php
+
+namespace Twig\Node;
+
+require __DIR__.'/../../lib/Twig/Node/Include.php';
+
+if (\false) {
+    class IncludeNode extends \Twig_Node_Include
+    {
+    }
+}
diff --git a/src/Node/MacroNode.php b/src/Node/MacroNode.php
index 610f294e8..a7c672bad 100644
--- a/src/Node/MacroNode.php
+++ b/src/Node/MacroNode.php
@@ -1 +1,11 @@
-./Node/Macro.php
+<?php
+
+namespace Twig\Node;
+
+require __DIR__.'/../../lib/Twig/Node/Macro.php';
+
+if (\false) {
+    class MacroNode extends \Twig_Node_Macro
+    {
+    }
+}
diff --git a/src/Node/ModuleNode.php b/src/Node/ModuleNode.php
index b92686ca6..d3d5f8d62 100644
--- a/src/Node/ModuleNode.php
+++ b/src/Node/ModuleNode.php
@@ -1 +1,11 @@
-./Node/Module.php
+<?php
+
+namespace Twig\Node;
+
+require __DIR__.'/../../lib/Twig/Node/Module.php';
+
+if (\false) {
+    class ModuleNode extends \Twig_Node_Module
+    {
+    }
+}
diff --git a/src/Node/Node.php b/src/Node/Node.php
index 81567cf8d..99de33b22 100644
--- a/src/Node/Node.php
+++ b/src/Node/Node.php
@@ -1 +1,11 @@
-./Node.php
+<?php
+
+namespace Twig\Node;
+
+require __DIR__.'/../../lib/Twig/Node.php';
+
+if (\false) {
+    class Node extends \Twig_Node
+    {
+    }
+}
diff --git a/src/Node/NodeCaptureInterface.php b/src/Node/NodeCaptureInterface.php
index b3de58223..90700408c 100644
--- a/src/Node/NodeCaptureInterface.php
+++ b/src/Node/NodeCaptureInterface.php
@@ -1 +1,11 @@
-./NodeCaptureInterface.php
+<?php
+
+namespace Twig\Node;
+
+require __DIR__.'/../../lib/Twig/NodeCaptureInterface.php';
+
+if (\false) {
+    class NodeCaptureInterface extends \Twig_NodeCaptureInterface
+    {
+    }
+}
diff --git a/src/Node/NodeOutputInterface.php b/src/Node/NodeOutputInterface.php
index d80285496..b3a4e0b4c 100644
--- a/src/Node/NodeOutputInterface.php
+++ b/src/Node/NodeOutputInterface.php
@@ -1 +1,11 @@
-./NodeOutputInterface.php
+<?php
+
+namespace Twig\Node;
+
+require __DIR__.'/../../lib/Twig/NodeOutputInterface.php';
+
+if (\false) {
+    class NodeOutputInterface extends \Twig_NodeOutputInterface
+    {
+    }
+}
diff --git a/src/Node/PrintNode.php b/src/Node/PrintNode.php
index 00a1bc10f..daaf2467d 100644
--- a/src/Node/PrintNode.php
+++ b/src/Node/PrintNode.php
@@ -1 +1,11 @@
-./Node/Print.php
+<?php
+
+namespace Twig\Node;
+
+require __DIR__.'/../../lib/Twig/Node/Print.php';
+
+if (\false) {
+    class PrintNode extends \Twig_Node_Print
+    {
+    }
+}
diff --git a/src/Node/SandboxNode.php b/src/Node/SandboxNode.php
index 53abbb6b2..e2643cb46 100644
--- a/src/Node/SandboxNode.php
+++ b/src/Node/SandboxNode.php
@@ -1 +1,11 @@
-./Node/Sandbox.php
+<?php
+
+namespace Twig\Node;
+
+require __DIR__.'/../../lib/Twig/Node/Sandbox.php';
+
+if (\false) {
+    class SandboxNode extends \Twig_Node_Sandbox
+    {
+    }
+}
diff --git a/src/Node/SandboxedPrintNode.php b/src/Node/SandboxedPrintNode.php
index acf5c3b61..4b3c44c70 100644
--- a/src/Node/SandboxedPrintNode.php
+++ b/src/Node/SandboxedPrintNode.php
@@ -1 +1,11 @@
-./Node/SandboxedPrint.php
+<?php
+
+namespace Twig\Node;
+
+require __DIR__.'/../../lib/Twig/Node/SandboxedPrint.php';
+
+if (\false) {
+    class SandboxedPrintNode extends \Twig_Node_SandboxedPrint
+    {
+    }
+}
diff --git a/src/Node/SetNode.php b/src/Node/SetNode.php
index fb254b746..8a9206379 100644
--- a/src/Node/SetNode.php
+++ b/src/Node/SetNode.php
@@ -1 +1,11 @@
-./Node/Set.php
+<?php
+
+namespace Twig\Node;
+
+require __DIR__.'/../../lib/Twig/Node/Set.php';
+
+if (\false) {
+    class SetNode extends \Twig_Node_Set
+    {
+    }
+}
diff --git a/src/Node/SetTempNode.php b/src/Node/SetTempNode.php
index 73b569584..4bf1f994b 100644
--- a/src/Node/SetTempNode.php
+++ b/src/Node/SetTempNode.php
@@ -1 +1,11 @@
-./Node/SetTemp.php
+<?php
+
+namespace Twig\Node;
+
+require __DIR__.'/../../lib/Twig/Node/SetTemp.php';
+
+if (\false) {
+    class SetTempNode extends \Twig_Node_SetTemp
+    {
+    }
+}
diff --git a/src/Node/SpacelessNode.php b/src/Node/SpacelessNode.php
index 435e92cde..44a62c203 100644
--- a/src/Node/SpacelessNode.php
+++ b/src/Node/SpacelessNode.php
@@ -1 +1,11 @@
-./Node/Spaceless.php
+<?php
+
+namespace Twig\Node;
+
+require __DIR__.'/../../lib/Twig/Node/Spaceless.php';
+
+if (\false) {
+    class SpacelessNode extends \Twig_Node_Spaceless
+    {
+    }
+}
diff --git a/src/Node/TextNode.php b/src/Node/TextNode.php
index 3516d903c..71640be6c 100644
--- a/src/Node/TextNode.php
+++ b/src/Node/TextNode.php
@@ -1 +1,11 @@
-./Node/Text.php
+<?php
+
+namespace Twig\Node;
+
+require __DIR__.'/../../lib/Twig/Node/Text.php';
+
+if (\false) {
+    class TextNode extends \Twig_Node_Text
+    {
+    }
+}
diff --git a/src/Node/WithNode.php b/src/Node/WithNode.php
index c07f43783..a28fd3a42 100644
--- a/src/Node/WithNode.php
+++ b/src/Node/WithNode.php
@@ -1 +1,11 @@
-./Node/With.php
+<?php
+
+namespace Twig\Node;
+
+require __DIR__.'/../../lib/Twig/Node/With.php';
+
+if (\false) {
+    class WithNode extends \Twig_Node_With
+    {
+    }
+}
diff --git a/src/NodeTraverser.php b/src/NodeTraverser.php
index ea2631f8e..7b23d5f4a 100644
--- a/src/NodeTraverser.php
+++ b/src/NodeTraverser.php
@@ -1 +1,11 @@
-./NodeTraverser.php
+<?php
+
+namespace Twig;
+
+require __DIR__.'/../lib/Twig/NodeTraverser.php';
+
+if (\false) {
+    class NodeTraverser extends \Twig_NodeTraverser
+    {
+    }
+}
diff --git a/src/NodeVisitor/AbstractNodeVisitor.php b/src/NodeVisitor/AbstractNodeVisitor.php
index c810933f4..0f8870f14 100644
--- a/src/NodeVisitor/AbstractNodeVisitor.php
+++ b/src/NodeVisitor/AbstractNodeVisitor.php
@@ -1 +1,11 @@
-./BaseNodeVisitor.php
+<?php
+
+namespace Twig\NodeVisitor;
+
+require __DIR__.'/../../lib/Twig/BaseNodeVisitor.php';
+
+if (\false) {
+    class AbstractNodeVisitor extends \Twig_BaseNodeVisitor
+    {
+    }
+}
diff --git a/src/NodeVisitor/EscaperNodeVisitor.php b/src/NodeVisitor/EscaperNodeVisitor.php
index 273a58bff..be460bbe8 100644
--- a/src/NodeVisitor/EscaperNodeVisitor.php
+++ b/src/NodeVisitor/EscaperNodeVisitor.php
@@ -1 +1,11 @@
-./NodeVisitor/Escaper.php
+<?php
+
+namespace Twig\NodeVisitor;
+
+require __DIR__.'/../../lib/Twig/NodeVisitor/Escaper.php';
+
+if (\false) {
+    class EscaperNodeVisitor extends \Twig_NodeVisitor_Escaper
+    {
+    }
+}
diff --git a/src/NodeVisitor/NodeVisitorInterface.php b/src/NodeVisitor/NodeVisitorInterface.php
index 22f24f357..d45d3b2bd 100644
--- a/src/NodeVisitor/NodeVisitorInterface.php
+++ b/src/NodeVisitor/NodeVisitorInterface.php
@@ -1 +1,11 @@
-./NodeVisitorInterface.php
+<?php
+
+namespace Twig\NodeVisitor;
+
+require __DIR__.'/../../lib/Twig/NodeVisitorInterface.php';
+
+if (\false) {
+    class NodeVisitorInterface extends \Twig_NodeVisitorInterface
+    {
+    }
+}
diff --git a/src/NodeVisitor/OptimizerNodeVisitor.php b/src/NodeVisitor/OptimizerNodeVisitor.php
index 9bb07e23f..56cab2fc3 100644
--- a/src/NodeVisitor/OptimizerNodeVisitor.php
+++ b/src/NodeVisitor/OptimizerNodeVisitor.php
@@ -1 +1,11 @@
-./NodeVisitor/Optimizer.php
+<?php
+
+namespace Twig\NodeVisitor;
+
+require __DIR__.'/../../lib/Twig/NodeVisitor/Optimizer.php';
+
+if (\false) {
+    class OptimizerNodeVisitor extends \Twig_NodeVisitor_Optimizer
+    {
+    }
+}
diff --git a/src/NodeVisitor/SafeAnalysisNodeVisitor.php b/src/NodeVisitor/SafeAnalysisNodeVisitor.php
index 3a71e40e5..acb876d3a 100644
--- a/src/NodeVisitor/SafeAnalysisNodeVisitor.php
+++ b/src/NodeVisitor/SafeAnalysisNodeVisitor.php
@@ -1 +1,11 @@
-./NodeVisitor/SafeAnalysis.php
+<?php
+
+namespace Twig\NodeVisitor;
+
+require __DIR__.'/../../lib/Twig/NodeVisitor/SafeAnalysis.php';
+
+if (\false) {
+    class SafeAnalysisNodeVisitor extends \Twig_NodeVisitor_SafeAnalysis
+    {
+    }
+}
diff --git a/src/NodeVisitor/SandboxNodeVisitor.php b/src/NodeVisitor/SandboxNodeVisitor.php
index 580a2836d..35fc662ef 100644
--- a/src/NodeVisitor/SandboxNodeVisitor.php
+++ b/src/NodeVisitor/SandboxNodeVisitor.php
@@ -1 +1,11 @@
-./NodeVisitor/Sandbox.php
+<?php
+
+namespace Twig\NodeVisitor;
+
+require __DIR__.'/../../lib/Twig/NodeVisitor/Sandbox.php';
+
+if (\false) {
+    class SandboxNodeVisitor extends \Twig_NodeVisitor_Sandbox
+    {
+    }
+}
diff --git a/src/Parser.php b/src/Parser.php
index 19b9ec4dd..a59ba718d 100644
--- a/src/Parser.php
+++ b/src/Parser.php
@@ -1 +1,11 @@
-./Parser.php
+<?php
+
+namespace Twig;
+
+require __DIR__.'/../lib/Twig/Parser.php';
+
+if (\false) {
+    class Parser extends \Twig_Parser
+    {
+    }
+}
diff --git a/src/Profiler/Dumper/BlackfireDumper.php b/src/Profiler/Dumper/BlackfireDumper.php
index 4e1b48016..ebf24ead7 100644
--- a/src/Profiler/Dumper/BlackfireDumper.php
+++ b/src/Profiler/Dumper/BlackfireDumper.php
@@ -1 +1,11 @@
-./Profiler/Dumper/Blackfire.php
+<?php
+
+namespace Twig\Profiler\Dumper;
+
+require __DIR__.'/../../../lib/Twig/Profiler/Dumper/Blackfire.php';
+
+if (\false) {
+    class BlackfireDumper extends \Twig_Profiler_Dumper_Blackfire
+    {
+    }
+}
diff --git a/src/Profiler/Dumper/HtmlDumper.php b/src/Profiler/Dumper/HtmlDumper.php
index 00539d1ee..58387077d 100644
--- a/src/Profiler/Dumper/HtmlDumper.php
+++ b/src/Profiler/Dumper/HtmlDumper.php
@@ -1 +1,11 @@
-./Profiler/Dumper/Html.php
+<?php
+
+namespace Twig\Profiler\Dumper;
+
+require __DIR__.'/../../../lib/Twig/Profiler/Dumper/Html.php';
+
+if (\false) {
+    class HtmlDumper extends \Twig_Profiler_Dumper_Html
+    {
+    }
+}
diff --git a/src/Profiler/Dumper/TextDumper.php b/src/Profiler/Dumper/TextDumper.php
index afc9f46c7..ffdb50ac0 100644
--- a/src/Profiler/Dumper/TextDumper.php
+++ b/src/Profiler/Dumper/TextDumper.php
@@ -1 +1,11 @@
-./Profiler/Dumper/Text.php
+<?php
+
+namespace Twig\Profiler\Dumper;
+
+require __DIR__.'/../../../lib/Twig/Profiler/Dumper/Text.php';
+
+if (\false) {
+    class TextDumper extends \Twig_Profiler_Dumper_Text
+    {
+    }
+}
diff --git a/src/Profiler/Node/EnterProfileNode.php b/src/Profiler/Node/EnterProfileNode.php
index 026711586..513c98f00 100644
--- a/src/Profiler/Node/EnterProfileNode.php
+++ b/src/Profiler/Node/EnterProfileNode.php
@@ -1 +1,11 @@
-./Profiler/Node/EnterProfile.php
+<?php
+
+namespace Twig\Profiler\Node;
+
+require __DIR__.'/../../../lib/Twig/Profiler/Node/EnterProfile.php';
+
+if (\false) {
+    class EnterProfileNode extends \Twig_Profiler_Node_EnterProfile
+    {
+    }
+}
diff --git a/src/Profiler/Node/LeaveProfileNode.php b/src/Profiler/Node/LeaveProfileNode.php
index 1bb5becc8..b4f6fc9be 100644
--- a/src/Profiler/Node/LeaveProfileNode.php
+++ b/src/Profiler/Node/LeaveProfileNode.php
@@ -1 +1,11 @@
-./Profiler/Node/LeaveProfile.php
+<?php
+
+namespace Twig\Profiler\Node;
+
+require __DIR__.'/../../../lib/Twig/Profiler/Node/LeaveProfile.php';
+
+if (\false) {
+    class LeaveProfileNode extends \Twig_Profiler_Node_LeaveProfile
+    {
+    }
+}
diff --git a/src/Profiler/NodeVisitor/ProfilerNodeVisitor.php b/src/Profiler/NodeVisitor/ProfilerNodeVisitor.php
index c1ac024c1..b08fd5007 100644
--- a/src/Profiler/NodeVisitor/ProfilerNodeVisitor.php
+++ b/src/Profiler/NodeVisitor/ProfilerNodeVisitor.php
@@ -1 +1,11 @@
-./Profiler/NodeVisitor/Profiler.php
+<?php
+
+namespace Twig\Profiler\NodeVisitor;
+
+require __DIR__.'/../../../lib/Twig/Profiler/NodeVisitor/Profiler.php';
+
+if (\false) {
+    class ProfilerNodeVisitor extends \Twig_Profiler_NodeVisitor_Profiler
+    {
+    }
+}
diff --git a/src/Profiler/Profile.php b/src/Profiler/Profile.php
index 11e62c58e..bd766c70a 100644
--- a/src/Profiler/Profile.php
+++ b/src/Profiler/Profile.php
@@ -1 +1,11 @@
-./Profiler/Profile.php
+<?php
+
+namespace Twig\Profiler;
+
+require __DIR__.'/../../lib/Twig/Profiler/Profile.php';
+
+if (\false) {
+    class Profile extends \Twig_Profiler_Profile
+    {
+    }
+}
diff --git a/src/RuntimeLoader/ContainerRuntimeLoader.php b/src/RuntimeLoader/ContainerRuntimeLoader.php
index 47a32fbca..866439a34 100644
--- a/src/RuntimeLoader/ContainerRuntimeLoader.php
+++ b/src/RuntimeLoader/ContainerRuntimeLoader.php
@@ -1 +1,11 @@
-./ContainerRuntimeLoader.php
+<?php
+
+namespace Twig\RuntimeLoader;
+
+require __DIR__.'/../../lib/Twig/ContainerRuntimeLoader.php';
+
+if (\false) {
+    class ContainerRuntimeLoader extends \Twig_ContainerRuntimeLoader
+    {
+    }
+}
diff --git a/src/RuntimeLoader/FactoryRuntimeLoader.php b/src/RuntimeLoader/FactoryRuntimeLoader.php
index 7a3780c8a..5bd930fd3 100644
--- a/src/RuntimeLoader/FactoryRuntimeLoader.php
+++ b/src/RuntimeLoader/FactoryRuntimeLoader.php
@@ -1 +1,11 @@
-./FactoryRuntimeLoader.php
+<?php
+
+namespace Twig\RuntimeLoader;
+
+require __DIR__.'/../../lib/Twig/FactoryRuntimeLoader.php';
+
+if (\false) {
+    class FactoryRuntimeLoader extends \Twig_FactoryRuntimeLoader
+    {
+    }
+}
diff --git a/src/RuntimeLoader/RuntimeLoaderInterface.php b/src/RuntimeLoader/RuntimeLoaderInterface.php
index f916e791f..255459413 100644
--- a/src/RuntimeLoader/RuntimeLoaderInterface.php
+++ b/src/RuntimeLoader/RuntimeLoaderInterface.php
@@ -1 +1,11 @@
-./RuntimeLoaderInterface.php
+<?php
+
+namespace Twig\RuntimeLoader;
+
+require __DIR__.'/../../lib/Twig/RuntimeLoaderInterface.php';
+
+if (\false) {
+    class RuntimeLoaderInterface extends \Twig_RuntimeLoaderInterface
+    {
+    }
+}
diff --git a/src/Sandbox/SecurityError.php b/src/Sandbox/SecurityError.php
index 598ccfc1c..7b052150f 100644
--- a/src/Sandbox/SecurityError.php
+++ b/src/Sandbox/SecurityError.php
@@ -1 +1,11 @@
-./Sandbox/SecurityError.php
+<?php
+
+namespace Twig\Sandbox;
+
+require __DIR__.'/../../lib/Twig/Sandbox/SecurityError.php';
+
+if (\false) {
+    class SecurityError extends \Twig_Sandbox_SecurityError
+    {
+    }
+}
diff --git a/src/Sandbox/SecurityNotAllowedFilterError.php b/src/Sandbox/SecurityNotAllowedFilterError.php
index 9fc147a08..7e992bece 100644
--- a/src/Sandbox/SecurityNotAllowedFilterError.php
+++ b/src/Sandbox/SecurityNotAllowedFilterError.php
@@ -1 +1,11 @@
-./Sandbox/SecurityNotAllowedFilterError.php
+<?php
+
+namespace Twig\Sandbox;
+
+require __DIR__.'/../../lib/Twig/Sandbox/SecurityNotAllowedFilterError.php';
+
+if (\false) {
+    class SecurityNotAllowedFilterError extends \Twig_Sandbox_SecurityNotAllowedFilterError
+    {
+    }
+}
diff --git a/src/Sandbox/SecurityNotAllowedFunctionError.php b/src/Sandbox/SecurityNotAllowedFunctionError.php
index 71638512f..c02767db6 100644
--- a/src/Sandbox/SecurityNotAllowedFunctionError.php
+++ b/src/Sandbox/SecurityNotAllowedFunctionError.php
@@ -1 +1,11 @@
-./Sandbox/SecurityNotAllowedFunctionError.php
+<?php
+
+namespace Twig\Sandbox;
+
+require __DIR__.'/../../lib/Twig/Sandbox/SecurityNotAllowedFunctionError.php';
+
+if (\false) {
+    class SecurityNotAllowedFunctionError extends \Twig_Sandbox_SecurityNotAllowedFunctionError
+    {
+    }
+}
diff --git a/src/Sandbox/SecurityNotAllowedMethodError.php b/src/Sandbox/SecurityNotAllowedMethodError.php
index 3071ed63c..dd2bf108e 100644
--- a/src/Sandbox/SecurityNotAllowedMethodError.php
+++ b/src/Sandbox/SecurityNotAllowedMethodError.php
@@ -1 +1,11 @@
-./Sandbox/SecurityNotAllowedMethodError.php
+<?php
+
+namespace Twig\Sandbox;
+
+require __DIR__.'/../../lib/Twig/Sandbox/SecurityNotAllowedMethodError.php';
+
+if (\false) {
+    class SecurityNotAllowedMethodError extends \Twig_Sandbox_SecurityNotAllowedMethodError
+    {
+    }
+}
diff --git a/src/Sandbox/SecurityNotAllowedPropertyError.php b/src/Sandbox/SecurityNotAllowedPropertyError.php
index 6ecbda457..1cb700373 100644
--- a/src/Sandbox/SecurityNotAllowedPropertyError.php
+++ b/src/Sandbox/SecurityNotAllowedPropertyError.php
@@ -1 +1,11 @@
-./Sandbox/SecurityNotAllowedPropertyError.php
+<?php
+
+namespace Twig\Sandbox;
+
+require __DIR__.'/../../lib/Twig/Sandbox/SecurityNotAllowedPropertyError.php';
+
+if (\false) {
+    class SecurityNotAllowedPropertyError extends \Twig_Sandbox_SecurityNotAllowedPropertyError
+    {
+    }
+}
diff --git a/src/Sandbox/SecurityNotAllowedTagError.php b/src/Sandbox/SecurityNotAllowedTagError.php
index ad204a5eb..84034e5d1 100644
--- a/src/Sandbox/SecurityNotAllowedTagError.php
+++ b/src/Sandbox/SecurityNotAllowedTagError.php
@@ -1 +1,11 @@
-./Sandbox/SecurityNotAllowedTagError.php
+<?php
+
+namespace Twig\Sandbox;
+
+require __DIR__.'/../../lib/Twig/Sandbox/SecurityNotAllowedTagError.php';
+
+if (\false) {
+    class SecurityNotAllowedTagError extends \Twig_Sandbox_SecurityNotAllowedTagError
+    {
+    }
+}
diff --git a/src/Sandbox/SecurityPolicy.php b/src/Sandbox/SecurityPolicy.php
index f3629afdf..1681b6308 100644
--- a/src/Sandbox/SecurityPolicy.php
+++ b/src/Sandbox/SecurityPolicy.php
@@ -1 +1,11 @@
-./Sandbox/SecurityPolicy.php
+<?php
+
+namespace Twig\Sandbox;
+
+require __DIR__.'/../../lib/Twig/Sandbox/SecurityPolicy.php';
+
+if (\false) {
+    class SecurityPolicy extends \Twig_Sandbox_SecurityPolicy
+    {
+    }
+}
diff --git a/src/Sandbox/SecurityPolicyInterface.php b/src/Sandbox/SecurityPolicyInterface.php
index 71a88d1f6..1178998fd 100644
--- a/src/Sandbox/SecurityPolicyInterface.php
+++ b/src/Sandbox/SecurityPolicyInterface.php
@@ -1 +1,11 @@
-./Sandbox/SecurityPolicyInterface.php
+<?php
+
+namespace Twig\Sandbox;
+
+require __DIR__.'/../../lib/Twig/Sandbox/SecurityPolicyInterface.php';
+
+if (\false) {
+    class SecurityPolicyInterface extends \Twig_Sandbox_SecurityPolicyInterface
+    {
+    }
+}
diff --git a/src/Source.php b/src/Source.php
index 84f28f6a2..11a37a599 100644
--- a/src/Source.php
+++ b/src/Source.php
@@ -1 +1,11 @@
-./Source.php
+<?php
+
+namespace Twig;
+
+require __DIR__.'/../lib/Twig/Source.php';
+
+if (\false) {
+    class Source extends \Twig_Source
+    {
+    }
+}
diff --git a/src/Template.php b/src/Template.php
index 50cee241f..3dcf33394 100644
--- a/src/Template.php
+++ b/src/Template.php
@@ -1 +1,11 @@
-./Template.php
+<?php
+
+namespace Twig;
+
+require __DIR__.'/../lib/Twig/Template.php';
+
+if (\false) {
+    class Template extends \Twig_Template
+    {
+    }
+}
diff --git a/src/TemplateWrapper.php b/src/TemplateWrapper.php
index cae675598..20cf52a6f 100644
--- a/src/TemplateWrapper.php
+++ b/src/TemplateWrapper.php
@@ -1 +1,11 @@
-./TemplateWrapper.php
+<?php
+
+namespace Twig;
+
+require __DIR__.'/../lib/Twig/TemplateWrapper.php';
+
+if (\false) {
+    class TemplateWrapper extends \Twig_TemplateWrapper
+    {
+    }
+}
diff --git a/src/Test/IntegrationTestCase.php b/src/Test/IntegrationTestCase.php
index c312152e1..8f8c166a0 100644
--- a/src/Test/IntegrationTestCase.php
+++ b/src/Test/IntegrationTestCase.php
@@ -1 +1,11 @@
-./Test/IntegrationTestCase.php
+<?php
+
+namespace Twig\Test;
+
+require __DIR__.'/../../lib/Twig/Test/IntegrationTestCase.php';
+
+if (\false) {
+    class IntegrationTestCase extends \Twig_Test_IntegrationTestCase
+    {
+    }
+}
diff --git a/src/Test/NodeTestCase.php b/src/Test/NodeTestCase.php
index 3b398510a..d45d3c686 100644
--- a/src/Test/NodeTestCase.php
+++ b/src/Test/NodeTestCase.php
@@ -1 +1,11 @@
-./Test/NodeTestCase.php
+<?php
+
+namespace Twig\Test;
+
+require __DIR__.'/../../lib/Twig/Test/NodeTestCase.php';
+
+if (\false) {
+    class NodeTestCase extends \Twig_Test_NodeTestCase
+    {
+    }
+}
diff --git a/src/Token.php b/src/Token.php
index 3439b0a22..cf88f86ed 100644
--- a/src/Token.php
+++ b/src/Token.php
@@ -1 +1,11 @@
-./Token.php
+<?php
+
+namespace Twig;
+
+require __DIR__.'/../lib/Twig/Token.php';
+
+if (\false) {
+    class Token extends \Twig_Token
+    {
+    }
+}
diff --git a/src/TokenParser/AbstractTokenParser.php b/src/TokenParser/AbstractTokenParser.php
index 482155545..96235a0c5 100644
--- a/src/TokenParser/AbstractTokenParser.php
+++ b/src/TokenParser/AbstractTokenParser.php
@@ -1 +1,11 @@
-./TokenParser.php
+<?php
+
+namespace Twig\TokenParser;
+
+require __DIR__.'/../../lib/Twig/TokenParser.php';
+
+if (\false) {
+    class AbstractTokenParser extends \Twig_TokenParser
+    {
+    }
+}
diff --git a/src/TokenParser/AutoEscapeTokenParser.php b/src/TokenParser/AutoEscapeTokenParser.php
index acf06c445..bc0299659 100644
--- a/src/TokenParser/AutoEscapeTokenParser.php
+++ b/src/TokenParser/AutoEscapeTokenParser.php
@@ -1 +1,11 @@
-./TokenParser/AutoEscape.php
+<?php
+
+namespace Twig\TokenParser;
+
+require __DIR__.'/../../lib/Twig/TokenParser/AutoEscape.php';
+
+if (\false) {
+    class AutoEscapeTokenParser extends \Twig_TokenParser_AutoEscape
+    {
+    }
+}
diff --git a/src/TokenParser/BlockTokenParser.php b/src/TokenParser/BlockTokenParser.php
index e3abced76..030145237 100644
--- a/src/TokenParser/BlockTokenParser.php
+++ b/src/TokenParser/BlockTokenParser.php
@@ -1 +1,11 @@
-./TokenParser/Block.php
+<?php
+
+namespace Twig\TokenParser;
+
+require __DIR__.'/../../lib/Twig/TokenParser/Block.php';
+
+if (\false) {
+    class BlockTokenParser extends \Twig_TokenParser_Block
+    {
+    }
+}
diff --git a/src/TokenParser/DoTokenParser.php b/src/TokenParser/DoTokenParser.php
index 5d5ddfe62..47d1d58d1 100644
--- a/src/TokenParser/DoTokenParser.php
+++ b/src/TokenParser/DoTokenParser.php
@@ -1 +1,11 @@
-./TokenParser/Do.php
+<?php
+
+namespace Twig\TokenParser;
+
+require __DIR__.'/../../lib/Twig/TokenParser/Do.php';
+
+if (\false) {
+    class DoTokenParser extends \Twig_TokenParser_Do
+    {
+    }
+}
diff --git a/src/TokenParser/EmbedTokenParser.php b/src/TokenParser/EmbedTokenParser.php
index a7feff2c2..eda22eaff 100644
--- a/src/TokenParser/EmbedTokenParser.php
+++ b/src/TokenParser/EmbedTokenParser.php
@@ -1 +1,11 @@
-./TokenParser/Embed.php
+<?php
+
+namespace Twig\TokenParser;
+
+require __DIR__.'/../../lib/Twig/TokenParser/Embed.php';
+
+if (\false) {
+    class EmbedTokenParser extends \Twig_TokenParser_Embed
+    {
+    }
+}
diff --git a/src/TokenParser/ExtendsTokenParser.php b/src/TokenParser/ExtendsTokenParser.php
index 45e1a8725..2c817d9a1 100644
--- a/src/TokenParser/ExtendsTokenParser.php
+++ b/src/TokenParser/ExtendsTokenParser.php
@@ -1 +1,11 @@
-./TokenParser/Extends.php
+<?php
+
+namespace Twig\TokenParser;
+
+require __DIR__.'/../../lib/Twig/TokenParser/Extends.php';
+
+if (\false) {
+    class ExtendsTokenParser extends \Twig_TokenParser_Extends
+    {
+    }
+}
diff --git a/src/TokenParser/FilterTokenParser.php b/src/TokenParser/FilterTokenParser.php
index eed97dc2e..46dd05158 100644
--- a/src/TokenParser/FilterTokenParser.php
+++ b/src/TokenParser/FilterTokenParser.php
@@ -1 +1,11 @@
-./TokenParser/Filter.php
+<?php
+
+namespace Twig\TokenParser;
+
+require __DIR__.'/../../lib/Twig/TokenParser/Filter.php';
+
+if (\false) {
+    class FilterTokenParser extends \Twig_TokenParser_Filter
+    {
+    }
+}
diff --git a/src/TokenParser/FlushTokenParser.php b/src/TokenParser/FlushTokenParser.php
index 8d7d864dc..95e8968b9 100644
--- a/src/TokenParser/FlushTokenParser.php
+++ b/src/TokenParser/FlushTokenParser.php
@@ -1 +1,11 @@
-./TokenParser/Flush.php
+<?php
+
+namespace Twig\TokenParser;
+
+require __DIR__.'/../../lib/Twig/TokenParser/Flush.php';
+
+if (\false) {
+    class FlushTokenParser extends \Twig_TokenParser_Flush
+    {
+    }
+}
diff --git a/src/TokenParser/ForTokenParser.php b/src/TokenParser/ForTokenParser.php
index 63ff3ba63..67b75492b 100644
--- a/src/TokenParser/ForTokenParser.php
+++ b/src/TokenParser/ForTokenParser.php
@@ -1 +1,11 @@
-./TokenParser/For.php
+<?php
+
+namespace Twig\TokenParser;
+
+require __DIR__.'/../../lib/Twig/TokenParser/For.php';
+
+if (\false) {
+    class ForTokenParser extends \Twig_TokenParser_For
+    {
+    }
+}
diff --git a/src/TokenParser/FromTokenParser.php b/src/TokenParser/FromTokenParser.php
index feba30bb3..620ad6f5f 100644
--- a/src/TokenParser/FromTokenParser.php
+++ b/src/TokenParser/FromTokenParser.php
@@ -1 +1,11 @@
-./TokenParser/From.php
+<?php
+
+namespace Twig\TokenParser;
+
+require __DIR__.'/../../lib/Twig/TokenParser/From.php';
+
+if (\false) {
+    class FromTokenParser extends \Twig_TokenParser_From
+    {
+    }
+}
diff --git a/src/TokenParser/IfTokenParser.php b/src/TokenParser/IfTokenParser.php
index bdb31954f..8c36712fa 100644
--- a/src/TokenParser/IfTokenParser.php
+++ b/src/TokenParser/IfTokenParser.php
@@ -1 +1,11 @@
-./TokenParser/If.php
+<?php
+
+namespace Twig\TokenParser;
+
+require __DIR__.'/../../lib/Twig/TokenParser/If.php';
+
+if (\false) {
+    class IfTokenParser extends \Twig_TokenParser_If
+    {
+    }
+}
diff --git a/src/TokenParser/ImportTokenParser.php b/src/TokenParser/ImportTokenParser.php
index 04d0640c5..cb82ac288 100644
--- a/src/TokenParser/ImportTokenParser.php
+++ b/src/TokenParser/ImportTokenParser.php
@@ -1 +1,11 @@
-./TokenParser/Import.php
+<?php
+
+namespace Twig\TokenParser;
+
+require __DIR__.'/../../lib/Twig/TokenParser/Import.php';
+
+if (\false) {
+    class ImportTokenParser extends \Twig_TokenParser_Import
+    {
+    }
+}
diff --git a/src/TokenParser/IncludeTokenParser.php b/src/TokenParser/IncludeTokenParser.php
index 43e58d926..2859fad15 100644
--- a/src/TokenParser/IncludeTokenParser.php
+++ b/src/TokenParser/IncludeTokenParser.php
@@ -1 +1,11 @@
-./TokenParser/Include.php
+<?php
+
+namespace Twig\TokenParser;
+
+require __DIR__.'/../../lib/Twig/TokenParser/Include.php';
+
+if (\false) {
+    class IncludeTokenParser extends \Twig_TokenParser_Include
+    {
+    }
+}
diff --git a/src/TokenParser/MacroTokenParser.php b/src/TokenParser/MacroTokenParser.php
index 78607249b..f7699aec6 100644
--- a/src/TokenParser/MacroTokenParser.php
+++ b/src/TokenParser/MacroTokenParser.php
@@ -1 +1,11 @@
-./TokenParser/Macro.php
+<?php
+
+namespace Twig\TokenParser;
+
+require __DIR__.'/../../lib/Twig/TokenParser/Macro.php';
+
+if (\false) {
+    class MacroTokenParser extends \Twig_TokenParser_Macro
+    {
+    }
+}
diff --git a/src/TokenParser/SandboxTokenParser.php b/src/TokenParser/SandboxTokenParser.php
index e075f6707..375c60183 100644
--- a/src/TokenParser/SandboxTokenParser.php
+++ b/src/TokenParser/SandboxTokenParser.php
@@ -1 +1,11 @@
-./TokenParser/Sandbox.php
+<?php
+
+namespace Twig\TokenParser;
+
+require __DIR__.'/../../lib/Twig/TokenParser/Sandbox.php';
+
+if (\false) {
+    class SandboxTokenParser extends \Twig_TokenParser_Sandbox
+    {
+    }
+}
diff --git a/src/TokenParser/SetTokenParser.php b/src/TokenParser/SetTokenParser.php
index dcbbd2e2d..409c36104 100644
--- a/src/TokenParser/SetTokenParser.php
+++ b/src/TokenParser/SetTokenParser.php
@@ -1 +1,11 @@
-./TokenParser/Set.php
+<?php
+
+namespace Twig\TokenParser;
+
+require __DIR__.'/../../lib/Twig/TokenParser/Set.php';
+
+if (\false) {
+    class SetTokenParser extends \Twig_TokenParser_Set
+    {
+    }
+}
diff --git a/src/TokenParser/SpacelessTokenParser.php b/src/TokenParser/SpacelessTokenParser.php
index fae501a63..095566ef0 100644
--- a/src/TokenParser/SpacelessTokenParser.php
+++ b/src/TokenParser/SpacelessTokenParser.php
@@ -1 +1,11 @@
-./TokenParser/Spaceless.php
+<?php
+
+namespace Twig\TokenParser;
+
+require __DIR__.'/../../lib/Twig/TokenParser/Spaceless.php';
+
+if (\false) {
+    class SpacelessTokenParser extends \Twig_TokenParser_Spaceless
+    {
+    }
+}
diff --git a/src/TokenParser/TokenParserInterface.php b/src/TokenParser/TokenParserInterface.php
index fdb2adea5..334e10571 100644
--- a/src/TokenParser/TokenParserInterface.php
+++ b/src/TokenParser/TokenParserInterface.php
@@ -1 +1,11 @@
-./TokenParserInterface.php
+<?php
+
+namespace Twig\TokenParser;
+
+require __DIR__.'/../../lib/Twig/TokenParserInterface.php';
+
+if (\false) {
+    class TokenParserInterface extends \Twig_TokenParserInterface
+    {
+    }
+}
diff --git a/src/TokenParser/UseTokenParser.php b/src/TokenParser/UseTokenParser.php
index ddb984dcf..7e5018ba4 100644
--- a/src/TokenParser/UseTokenParser.php
+++ b/src/TokenParser/UseTokenParser.php
@@ -1 +1,11 @@
-./TokenParser/Use.php
+<?php
+
+namespace Twig\TokenParser;
+
+require __DIR__.'/../../lib/Twig/TokenParser/Use.php';
+
+if (\false) {
+    class UseTokenParser extends \Twig_TokenParser_Use
+    {
+    }
+}
diff --git a/src/TokenParser/WithTokenParser.php b/src/TokenParser/WithTokenParser.php
index 20899f280..263bd3369 100644
--- a/src/TokenParser/WithTokenParser.php
+++ b/src/TokenParser/WithTokenParser.php
@@ -1 +1,11 @@
-./TokenParser/With.php
+<?php
+
+namespace Twig\TokenParser;
+
+require __DIR__.'/../../lib/Twig/TokenParser/With.php';
+
+if (\false) {
+    class WithTokenParser extends \Twig_TokenParser_With
+    {
+    }
+}
diff --git a/src/TokenStream.php b/src/TokenStream.php
index 863c3e8dc..22ff2fe62 100644
--- a/src/TokenStream.php
+++ b/src/TokenStream.php
@@ -1 +1,11 @@
-./TokenStream.php
+<?php
+
+namespace Twig;
+
+require __DIR__.'/../lib/Twig/TokenStream.php';
+
+if (\false) {
+    class TokenStream extends \Twig_TokenStream
+    {
+    }
+}
diff --git a/src/TwigFilter.php b/src/TwigFilter.php
index 24d60915a..2d62ea636 100644
--- a/src/TwigFilter.php
+++ b/src/TwigFilter.php
@@ -1 +1,11 @@
-./SimpleFilter.php
+<?php
+
+namespace Twig;
+
+require __DIR__.'/../lib/Twig/SimpleFilter.php';
+
+if (\false) {
+    class TwigFilter extends \Twig_SimpleFilter
+    {
+    }
+}
diff --git a/src/TwigFunction.php b/src/TwigFunction.php
index b7127a90f..893114d4b 100644
--- a/src/TwigFunction.php
+++ b/src/TwigFunction.php
@@ -1 +1,11 @@
-./SimpleFunction.php
+<?php
+
+namespace Twig;
+
+require __DIR__.'/../lib/Twig/SimpleFunction.php';
+
+if (\false) {
+    class TwigFunction extends \Twig_SimpleFunction
+    {
+    }
+}
diff --git a/src/TwigTest.php b/src/TwigTest.php
index 6f46071cc..e0c8be5a0 100644
--- a/src/TwigTest.php
+++ b/src/TwigTest.php
@@ -1 +1,11 @@
-./SimpleTest.php
+<?php
+
+namespace Twig;
+
+require __DIR__.'/../lib/Twig/SimpleTest.php';
+
+if (\false) {
+    class TwigTest extends \Twig_SimpleTest
+    {
+    }
+}
diff --git a/src/Util/DeprecationCollector.php b/src/Util/DeprecationCollector.php
index 403813b20..72484e35f 100644
--- a/src/Util/DeprecationCollector.php
+++ b/src/Util/DeprecationCollector.php
@@ -1 +1,11 @@
-./Util/DeprecationCollector.php
+<?php
+
+namespace Twig\Util;
+
+require __DIR__.'/../../lib/Twig/Util/DeprecationCollector.php';
+
+if (\false) {
+    class DeprecationCollector extends \Twig_Util_DeprecationCollector
+    {
+    }
+}
diff --git a/src/Util/TemplateDirIterator.php b/src/Util/TemplateDirIterator.php
index 5b7872ec4..63e7a96ca 100644
--- a/src/Util/TemplateDirIterator.php
+++ b/src/Util/TemplateDirIterator.php
@@ -1 +1,11 @@
-./Util/TemplateDirIterator.php
+<?php
+
+namespace Twig\Util;
+
+require __DIR__.'/../../lib/Twig/Util/TemplateDirIterator.php';
+
+if (\false) {
+    class TemplateDirIterator extends \Twig_Util_TemplateDirIterator
+    {
+    }
+}