Final touches to make it an include file

Tested with GCC V 4.2