Started refactoring/removing header only
Removed header only related conditional source includes