Major changes: * Fixes to compile and run with c-icap-0.6.x releases * Other minor fixes Reorder and format Makefile to make linters happy
