[HttpKernel] simplified and enhanced code managing the hinclude strategy