fix includes (see Josephine email 2014-05-02)