fixed headers in tools cpp