Added mach dep includes
Refactoring header files