Fix for includes from the controller