added more C source and headers