Added dependency on generate_headers to most of the wrappers