minor cleaning (#including self-headers)