Updated the last two header files so that they are configured with