Have you ever had one of those days where your brain just let's you down? Why oh why did I think the headers had anything to do with the blocks being the same.
Sure hope my gray matter starts firing on all cylinders soon or this swap is surely doomed.