whitespace changes:
remove $Id$ lines, and add blank lines around some #if / #elif /#endif