1. removed autogenerated diag.h
2. make autoreconf happy