Fixed and added missing include header guard defines