minor change: split files and fix and include guard typo