Port over 2 of the 3.0.x CPU headers