Better code suppot for compiling as a shared library and fix for include conflicts when using in external program