- header file dependencies revisit
- hooks cleanup
- testsuites
- FIXME's
