[BUGFIX] Replace usage of undefined classes

Change-Id: Icabcea07402640d4f69ed330a550b695de484c95
Reviewed-on: https://review.typo3.org/31364
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters