added C header files
added C++ types