Header file includes relocation

Changes of where files are included