Fix reading of svn revision
Reordered defines in master include file.