Core: Replacing my blindeye's issue
- this may cause more issues with compatibility but idc atm, at least the effn Cpp
- is in place rather double header
- note2self drinking and driving can be done OUTSIDE of a auto. (wtf!?)

Signed-off-by: bootz <bootz@projectskyfire.org>