As usual while waiting for the next release - don't forget to check the nightly builds in the forum.
The headerguard plugin forces me to use the guard <FILENAME_IN_CAPS>_H_INCLUDED