Issue #152: ensure we have all includes