Cleaned up c header files and defines.