core: fix dyslexia
all: normalize header guard naming convention
Merge pull request #14 from wisk/dev

Dev
fix conflict