Add C and C++ stuff