Sweeped up new header files a bit