Proper extern "C" { } wrapping
Fixed some unused headers