Altered files to remove unnecessary header files