Done. Classic quote from Ken Thompson: 
"My only mis-coordination with Dennis Ritchie was that we once created the same sourcefile, whereby they matched byte to byte" 
We hit one more of this case I think, and our files differed by a slash only, save for the sanity_cheks & parallel :-P

Anyway, now we are ready for this merge, all headers are aligned and both of us are co-authors. Shoot!