no more hard coded include
Declarations in header fully debugged.