Updated to the latest C++#. Worked around an incorrectly included in the code for inlines header.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>