Issue 697: add missing headers