tweaking autotools include configuration / some minor renaming and
reformatting