Fixed style of include guards
Removed pointers from structures