Fix wrong header guard definition
Fix some warning