Auto-includes for Controllers and Actions bugfixes