ApplicationHandler_singlethreaded and Makefile -I flag cleaned up