Fixed up header files/references