Shredded the header files apart a bit.