I keep loosing include path members so I added logging to my rename fix
to see wether it is related.
Cleaned up 2 wanings at the same time.