Use #if defined() instead of the #if macro
Refactor the header structure
Re-work the subspec and header paths