Moved .h files into header-file declarations to stop current xcode build warnings.