#460 convered versions to headers