Code cleanup

Changed include policy