Added missing headers to master header