Merge changes I02a085bf,Id5433d1d

* changes:
  Add #ifndef checks for macros
  Clean up version test