Moved #endif in .h files to AFTER #include of .inl; as this appears to help avoid the #include deadly embraces. I THINK I had a reason to put them before the #include .inl before - but I cannot recall why, and this fixes the issue with nested includes with SortedMapping_stdmap<> - or so it appears for now