Peter Dimov's suggestion) and to only include the hash headers after declaring the class. [SVN r28394]