Addressed. I've never got to the bottom of why my flymake will not find those includes any other way. I often forget to revert that change. :(