merged zkasmi/makefile_fixes to master
fixed includes and timex initialization in ping lib
only cosmetics