Add #ifndef guards
Merge pull request #81 from jetty840/dnewman-merge

Add #ifndef guards