removing some unneeded declarations
removed redundant header declarations
inlined pragma marks