diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
index ee6249fd1ae3f52373c0719cd16293d8d47bd967..36be4abfa1961b671b9ef92f79b528ac0d34ce3b 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php
@@ -7376,7 +7376,7 @@ class ContentObjectRenderer {
 								$theList = array_merge(
 									GeneralUtility::intExplode(
 										',',
-										self::getTreeList($next_id, $depth - 1, $begin - 1, $dontCheckEnableFields,
+										$this->getTreeList($next_id, $depth - 1, $begin - 1, $dontCheckEnableFields,
 											$addSelectFields, $moreWhereClauses, $prevId_array, $recursionLevel + 1)
 									),
 									$theList
@@ -7586,7 +7586,7 @@ class ContentObjectRenderer {
 		$queryParts = $this->getWhere($table, $conf, TRUE);
 		// Fields:
 		if ($conf['selectFields']) {
-			$queryParts['SELECT'] = self::sanitizeSelectPart($conf['selectFields'], $table);
+			$queryParts['SELECT'] = $this->sanitizeSelectPart($conf['selectFields'], $table);
 		} else {
 			$queryParts['SELECT'] = '*';
 		}
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
index 347236c8cb22e59bae3fd951a022a7a43bb192b2..403944a2f5d2667bc65d50faa4eb67715e1077b6 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/AbstractMenuContentObject.php
@@ -549,7 +549,7 @@ class AbstractMenuContentObject {
 						$id_list_arr = array();
 						foreach ($items as $id) {
 							$bA = MathUtility::forceIntegerInRange($this->conf['special.']['beginAtLevel'], 0, 100);
-							$id_list_arr[] = \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::getTreeList(-1 * $id, $depth - 1 + $bA, $bA - 1);
+							$id_list_arr[] = $this->parent_cObj->getTreeList(-1 * $id, $depth - 1 + $bA, $bA - 1);
 						}
 						$id_list = implode(',', $id_list_arr);
 						// Get sortField (mode)
@@ -605,7 +605,7 @@ class AbstractMenuContentObject {
 							$value_rec = $this->sys_page->getPage($value);
 							$kfieldSrc = $this->conf['special.']['keywordsField.']['sourceField'] ? $this->conf['special.']['keywordsField.']['sourceField'] : 'keywords';
 							// keywords.
-							$kw = trim(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::keywords($value_rec[$kfieldSrc]));
+							$kw = trim($this->parent_cObj->keywords($value_rec[$kfieldSrc]));
 						}
 						// *'auto', 'manual', 'tstamp'
 						$mode = $this->conf['special.']['mode'];
@@ -650,7 +650,7 @@ class AbstractMenuContentObject {
 						// If there are keywords and the startuid is present.
 						if ($kw && $startUid) {
 							$bA = MathUtility::forceIntegerInRange($this->conf['special.']['beginAtLevel'], 0, 100);
-							$id_list = \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::getTreeList(-1 * $startUid, $depth - 1 + $bA, $bA - 1);
+							$id_list = $this->parent_cObj->getTreeList(-1 * $startUid, $depth - 1 + $bA, $bA - 1);
 							$kwArr = explode(',', $kw);
 							foreach ($kwArr as $word) {
 								$word = trim($word);
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/GraphicalMenuContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/GraphicalMenuContentObject.php
index 366c0b0a06fe4f4d1e2dfad764daeb82895dce21..5dcfa518d0996b772e3139baa209171f7e134094 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/GraphicalMenuContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/GraphicalMenuContentObject.php
@@ -442,7 +442,7 @@ class GraphicalMenuContentObject extends \TYPO3\CMS\Frontend\ContentObject\Menu\
 						$this->I['A1'] = '';
 						$this->I['A2'] = '';
 					}
-					$this->I['IMG'] = '<img src="' . $GLOBALS['TSFE']->absRefPrefix . $this->I['val']['output_file'] . '" width="' . $this->I['val']['output_w'] . '" height="' . $this->I['val']['output_h'] . '" ' . \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::getBorderAttr('border="0"') . ($this->mconf['disableAltText'] ? '' : ' alt="' . htmlspecialchars($this->I['altText']) . '"') . $this->I['name'] . ($this->I['val']['imgParams'] ? ' ' . $this->I['val']['imgParams'] : '') . ' />';
+					$this->I['IMG'] = '<img src="' . $GLOBALS['TSFE']->absRefPrefix . $this->I['val']['output_file'] . '" width="' . $this->I['val']['output_w'] . '" height="' . $this->I['val']['output_h'] . '" ' . $this->parent_cObj->getBorderAttr('border="0"') . ($this->mconf['disableAltText'] ? '' : ' alt="' . htmlspecialchars($this->I['altText']) . '"') . $this->I['name'] . ($this->I['val']['imgParams'] ? ' ' . $this->I['val']['imgParams'] : '') . ' />';
 					// Make before, middle and after parts
 					$this->I['parts'] = array();
 					$this->I['parts']['ATag_begin'] = $this->I['A1'];
diff --git a/typo3/sysext/frontend/Classes/ContentObject/Menu/TextMenuContentObject.php b/typo3/sysext/frontend/Classes/ContentObject/Menu/TextMenuContentObject.php
index 417a69a888881548652c852fcc05919001225976..d5359591ae5855dc8daa7593d398fdf4b146be5c 100644
--- a/typo3/sysext/frontend/Classes/ContentObject/Menu/TextMenuContentObject.php
+++ b/typo3/sysext/frontend/Classes/ContentObject/Menu/TextMenuContentObject.php
@@ -190,7 +190,7 @@ class TextMenuContentObject extends \TYPO3\CMS\Frontend\ContentObject\Menu\Abstr
 			$theName = $this->imgNamePrefix . $this->I['uid'] . $this->I['INPfix'] . $pref;
 			$name = ' ' . $this->nameAttribute . '="' . $theName . '"';
 			$GLOBALS['TSFE']->imagesOnPage[] = $imgInfo[3];
-			$res = '<img' . ' src="' . $GLOBALS['TSFE']->absRefPrefix . $imgInfo[3] . '"' . ' width="' . $imgInfo[0] . '"' . ' height="' . $imgInfo[1] . '"' . $name . ($this->I['val'][$pref . 'ImgTagParams'] ? ' ' . $this->I['val'][($pref . 'ImgTagParams')] : '') . \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::getBorderAttr(' border="0"');
+			$res = '<img' . ' src="' . $GLOBALS['TSFE']->absRefPrefix . $imgInfo[3] . '"' . ' width="' . $imgInfo[0] . '"' . ' height="' . $imgInfo[1] . '"' . $name . ($this->I['val'][$pref . 'ImgTagParams'] ? ' ' . $this->I['val'][($pref . 'ImgTagParams')] : '') . $this->parent_cObj->getBorderAttr(' border="0"');
 			if (!strstr($res, 'alt="')) {
 				// Adding alt attribute if not set.
 				$res .= ' alt=""';
diff --git a/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php b/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
index d04da4d01fefc53cbd26b475f4c7d10497ab816a..4623608a4374965ae7d828269d9ce54bf134a73f 100644
--- a/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
+++ b/typo3/sysext/indexed_search/Classes/Domain/Repository/IndexSearchRepository.php
@@ -581,7 +581,7 @@ class IndexSearchRepository {
 			$siteIdNumbers = \TYPO3\CMS\Core\Utility\GeneralUtility::intExplode(',', $this->searchRootPageIdList);
 			$pageIdList = array();
 			foreach ($siteIdNumbers as $rootId) {
-				$pageIdList[] = \TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::getTreeList(-1 * $rootId, 9999);
+				$pageIdList[] = $GLOBALS['TSFE']->cObj->getTreeList(-1 * $rootId, 9999);
 			}
 			$page_where = ' AND ISEC.page_id IN (' . implode(',', $pageIdList) . ')';
 		}