cleanup includes

- util.h now included via project configuration, since it
  is necessary nevertheless
- cleanup include tree