Reorganize headers to resolve compile errors in Xcode 6