Fix compilation issue with new handlers, were not using proper include path.