diff --git a/phpBB/includes/template/extension_path_provider.php b/phpBB/includes/style/extension_path_provider.php
index 2897f60ac1..2897f60ac1 100644
--- a/phpBB/includes/template/extension_path_provider.php
+++ b/phpBB/includes/style/extension_path_provider.php

diff --git a/phpBB/includes/template/locator.php b/phpBB/includes/style/locator.php
index d4502d7984..d4502d7984 100644
--- a/phpBB/includes/template/locator.php
+++ b/phpBB/includes/style/locator.php

diff --git a/phpBB/includes/template/path_provider.php b/phpBB/includes/style/path_provider.php
index b0b545973d..b0b545973d 100644
--- a/phpBB/includes/template/path_provider.php
+++ b/phpBB/includes/style/path_provider.php

diff --git a/phpBB/includes/template/path_provider_interface.php b/phpBB/includes/style/path_provider_interface.php
index 8b3a406d2a..8b3a406d2a 100644
--- a/phpBB/includes/template/path_provider_interface.php
+++ b/phpBB/includes/style/path_provider_interface.php

diff --git a/phpBB/includes/template/template.php b/phpBB/includes/style/template.php
index bac5445511..bac5445511 100644
--- a/phpBB/includes/template/template.php
+++ b/phpBB/includes/style/template.php

diff --git a/phpBB/includes/template/compile.php b/phpBB/includes/style/template_compile.php
index b0009421c5..b0009421c5 100644
--- a/phpBB/includes/template/compile.php
+++ b/phpBB/includes/style/template_compile.php

diff --git a/phpBB/includes/template/context.php b/phpBB/includes/style/template_context.php
index ec09da1cf3..ec09da1cf3 100644
--- a/phpBB/includes/template/context.php
+++ b/phpBB/includes/style/template_context.php

diff --git a/phpBB/includes/template/filter.php b/phpBB/includes/style/template_filter.php
index f55c8d7e9c..f55c8d7e9c 100644
--- a/phpBB/includes/template/filter.php
+++ b/phpBB/includes/style/template_filter.php

diff --git a/phpBB/includes/template/renderer.php b/phpBB/includes/style/template_renderer.php
index 30e234a733..30e234a733 100644
--- a/phpBB/includes/template/renderer.php
+++ b/phpBB/includes/style/template_renderer.php

diff --git a/phpBB/includes/template/renderer_eval.php b/phpBB/includes/style/template_renderer_eval.php
index f8e4cb7b10..f8e4cb7b10 100644
--- a/phpBB/includes/template/renderer_eval.php
+++ b/phpBB/includes/style/template_renderer_eval.php

diff --git a/phpBB/includes/template/renderer_include.php b/phpBB/includes/style/template_renderer_include.php
index f5c9026abf..f5c9026abf 100644
--- a/phpBB/includes/template/renderer_include.php
+++ b/phpBB/includes/style/template_renderer_include.php