Small changes to fix GCC-2.95.3 compilation and strict headers separation.
drwxr-xr-x - lincan