cleanup headers (controller_base.cpp)