fixed warnings and include-guard typos