Updates to header includes for autoStubs and CFBase