Added explicit dependencies for header files and replaced misplaced include to ensure parallel comilation.