Modified includes to work and pass validation test.
Validate block and line comments.