Remove unused defines that we'll never use and fix naming in some include guards
Signed-off-by: NPatrik Jakobsson <patrik.r.jakobsson@gmail.com>