Remove extra files from repo, add missing dependency includes