This patch breaks up Wrap.h so that it does not have to include all of