[FIX] Some more forgotten register keywords.
[FIX-#235] Header guard fixes.