diff --git a/common/framework/parsers/template/TemplateParser_v2.php b/common/framework/parsers/template/TemplateParser_v2.php
index 890fac53a..3c0e0b681 100644
--- a/common/framework/parsers/template/TemplateParser_v2.php
+++ b/common/framework/parsers/template/TemplateParser_v2.php
@@ -932,6 +932,11 @@ class TemplateParser_v2
 	 */
 	protected function _addDeprecationMessages(string $content): string
 	{
+		// <!--#include-->, <!--%import-->, etc.
+		$content = preg_replace_callback('#<!--(\#include|%import|%unload|%load_js_plugin)\s?\(.+?-->#', function($match) {
+			return '<?php trigger_error("' . $match[1] . ' is not supported in template v2", \E_USER_WARNING); ?>';
+		}, $content);
+
 		// <block>
 		$content = preg_replace_callback('#<block(?=\s)#', function($match) {
 			return $match[0] . '<?php trigger_error("block element is not supported in template v2", \E_USER_WARNING); ?>';
diff --git a/tests/unit/framework/parsers/TemplateParserV2Test.php b/tests/unit/framework/parsers/TemplateParserV2Test.php
index 80a58389b..02c3c1725 100644
--- a/tests/unit/framework/parsers/TemplateParserV2Test.php
+++ b/tests/unit/framework/parsers/TemplateParserV2Test.php
@@ -1059,6 +1059,16 @@ class TemplateParserV2Test extends \Codeception\Test\Unit
 
 	public function testDeprecationMessages()
 	{
+		// <!--#include()-->
+		$source = '<!--#include("foo.html")-->';
+		$target = '<?php trigger_error("#include is not supported in template v2", \E_USER_WARNING); ?>';
+		$this->assertEquals($target, $this->_parse($source));
+
+		// <!--%import()-->
+		$source = '<!--%import("../foo/bar.js")-->';
+		$target = '<?php trigger_error("%import is not supported in template v2", \E_USER_WARNING); ?>';
+		$this->assertEquals($target, $this->_parse($source));
+
 		// <block> element
 		$source = '<block class="foobar">';
 		$target = '<block<?php trigger_error("block element is not supported in template v2", \E_USER_WARNING); ?> class="foobar">';