Added missing import directives to headers