Improved Dispatcher.cpp includes