Better C++ support

A better header file conform to C++ & g++