Tidied up handler.cpp includes.
Death to trailing whitespace!

Sorry about that...