Reorganize headers to resolve compile errors in Xcode 6
Merge pull request #7 from greenbell/fix-compile-error-in-xcode-6

Reorganize headers to resolve compile errors in Xcode 6