Combine client and version into single header