removing some unneeded declarations
removed redundant header declarations
inlined pragma marks
Merge pull request #273 from allending/cleanup

Cleanup some redundant declarations