This patch removes hpversion.h from the repository, this also untangles a lot of ifdef mess. This closes bug CDExc19524.