diff --git a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TypoScript/ExtbaseJsonRenderer.typoscript b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TypoScript/ExtbaseJsonRenderer.typoscript
index 845b9612a884e5731c278ae7924ed28d4199c4ad..a69e0cd8df7a37ebfeae57392c65aa806e3fca76 100644
--- a/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TypoScript/ExtbaseJsonRenderer.typoscript
+++ b/typo3/sysext/core/Tests/Functional/Fixtures/Extensions/test_irre_foreignfield/Configuration/TypoScript/ExtbaseJsonRenderer.typoscript
@@ -1,4 +1,4 @@
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:test_irre_foreignfield/Configuration/TypoScript/setup.typoscript">
+@import './setup.typoscript'
page {
20 = COA
diff --git a/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/ExtensionPathSoftReferenceParserTest.php b/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/ExtensionPathSoftReferenceParserTest.php
index f4bda895d14e2cd76d8694461f2df87de174ebd6..5e39326b3cd437132f8a875fc61b3d7e027eab66 100644
--- a/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/ExtensionPathSoftReferenceParserTest.php
+++ b/typo3/sysext/core/Tests/Unit/DataHandling/SoftReference/ExtensionPathSoftReferenceParserTest.php
@@ -38,14 +38,12 @@ final class ExtensionPathSoftReferenceParserTest extends AbstractSoftReferencePa
foo = bar
@import "EXT:foobar/Configuration/TypoScript/setup2.typoscript"
# some comment
- <INCLUDE_TYPOSCRIPT: source="FILE:EXT:foobar/Configuration/TypoScript/setup3.typoscript">
',
'content' => '
@import \'EXT:foobar/Configuration/TypoScript/setup1.typoscript\'
foo = bar
@import "EXT:foobar/Configuration/TypoScript/setup2.typoscript"
# some comment
- <INCLUDE_TYPOSCRIPT: source="FILE:EXT:foobar/Configuration/TypoScript/setup3.typoscript">
',
'elements' => [
2 => [
@@ -54,9 +52,6 @@ final class ExtensionPathSoftReferenceParserTest extends AbstractSoftReferencePa
5 => [
'matchString' => 'EXT:foobar/Configuration/TypoScript/setup2.typoscript',
],
- 8 => [
- 'matchString' => 'EXT:foobar/Configuration/TypoScript/setup3.typoscript',
- ],
],
'hasMatched' => true,
],
diff --git a/typo3/sysext/fluid/Tests/Functional/Fixtures/Extensions/fluid_test/Configuration/TypoScript/Basic.typoscript b/typo3/sysext/fluid/Tests/Functional/Fixtures/Extensions/fluid_test/Configuration/TypoScript/Basic.typoscript
index 76ec1cee1eb9e3fa59cacd6a411355b54df760a5..0f3f9af0800b748f54173982be33832491f3f500 100644
--- a/typo3/sysext/fluid/Tests/Functional/Fixtures/Extensions/fluid_test/Configuration/TypoScript/Basic.typoscript
+++ b/typo3/sysext/fluid/Tests/Functional/Fixtures/Extensions/fluid_test/Configuration/TypoScript/Basic.typoscript
@@ -97,7 +97,18 @@ lib.viewConfig {
}
[end]
-<INCLUDE_TYPOSCRIPT: source="FILE: ./FluidTemplateContentObject.typoscript" condition="[traverse(request.getQueryParams(), 'mode') == 'fluidTemplate' || traverse(request.getParsedBody(), 'mode') == 'fluidTemplate']">
-<INCLUDE_TYPOSCRIPT: source="FILE: ./ExtbasePlugin.typoscript" condition="[traverse(request.getQueryParams(), 'mode') == 'plugin' || traverse(request.getParsedBody(), 'mode') == 'plugin']">
-<INCLUDE_TYPOSCRIPT: source="FILE: ./ExtbaseController.typoscript" condition="[traverse(request.getQueryParams(), 'mode') == 'controller' || traverse(request.getParsedBody(), 'mode') == 'controller']">
-<INCLUDE_TYPOSCRIPT: source="FILE: ./ExtbaseTwoPlugins.typoscript" condition="[traverse(request.getQueryParams(), 'mode') == '2plugins' || traverse(request.getParsedBody(), 'mode') == '2plugins']">
+[traverse(request.getQueryParams(), 'mode') == 'fluidTemplate' || traverse(request.getParsedBody(), 'mode') == 'fluidTemplate']
+ @import './FluidTemplateContentObject.typoscript'
+[end]
+
+[traverse(request.getQueryParams(), 'mode') == 'plugin' || traverse(request.getParsedBody(), 'mode') == 'plugin']
+ @import './ExtbasePlugin.typoscript'
+[end]
+
+[traverse(request.getQueryParams(), 'mode') == 'controller' || traverse(request.getParsedBody(), 'mode') == 'controller']
+ @import './ExtbaseController.typoscript'
+[end]
+
+[traverse(request.getQueryParams(), 'mode') == '2plugins' || traverse(request.getParsedBody(), 'mode') == '2plugins']
+ @import './ExtbaseTwoPlugins.typoscript'
+[end]
diff --git a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/setup.typoscript b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/setup.typoscript
index f1008dbb075117646271257884fa02fb527f4821..3a70375272fed45a41bf33a45a30da5ba4ced686 100644
--- a/typo3/sysext/fluid_styled_content/Configuration/TypoScript/setup.typoscript
+++ b/typo3/sysext/fluid_styled_content/Configuration/TypoScript/setup.typoscript
@@ -1,32 +1,30 @@
# Include setup
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/Helper/ContentElement.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/Helper/ParseFunc.typoscript">
-
+@import './Helper/ContentElement.typoscript'
+@import './Helper/ParseFunc.typoscript'
# Typical content elements
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Bullets.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Div.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Header.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Html.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Image.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/List.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Shortcut.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Table.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Text.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Textmedia.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Textpic.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/Uploads.typoscript">
-
+@import './ContentElement/Bullets.typoscript'
+@import './ContentElement/Div.typoscript'
+@import './ContentElement/Header.typoscript'
+@import './ContentElement/Html.typoscript'
+@import './ContentElement/Image.typoscript'
+@import './ContentElement/List.typoscript'
+@import './ContentElement/Shortcut.typoscript'
+@import './ContentElement/Table.typoscript'
+@import './ContentElement/Text.typoscript'
+@import './ContentElement/Textmedia.typoscript'
+@import './ContentElement/Textpic.typoscript'
+@import './ContentElement/Uploads.typoscript'
# Menu content elements
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuAbstract.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuCategorizedContent.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuCategorizedPages.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuPages.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSubpages.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSection.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSectionPages.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuRecentlyUpdated.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuRelatedPages.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSitemap.typoscript">
-<INCLUDE_TYPOSCRIPT: source="FILE:EXT:fluid_styled_content/Configuration/TypoScript/ContentElement/MenuSitemapPages.typoscript">
+@import './ContentElement/MenuAbstract.typoscript'
+@import './ContentElement/MenuCategorizedContent.typoscript'
+@import './ContentElement/MenuCategorizedPages.typoscript'
+@import './ContentElement/MenuPages.typoscript'
+@import './ContentElement/MenuSubpages.typoscript'
+@import './ContentElement/MenuSection.typoscript'
+@import './ContentElement/MenuSectionPages.typoscript'
+@import './ContentElement/MenuRecentlyUpdated.typoscript'
+@import './ContentElement/MenuRelatedPages.typoscript'
+@import './ContentElement/MenuSitemap.typoscript'
+@import './ContentElement/MenuSitemapPages.typoscript'