added some ifndefs to the headers
Removed a couple of warnings