Fix name collision of min/max with C++ std::min/std::max

Fix name collision of min/max with C++ std::min/std::max

min/max is defined as the macro for C compililation and
as std::min/std::max for C++ compilation. New C++ code should not depend
on this so removed macros.h from other headers and added it where
needed. Removed hacks from existing C++ files where they were no longer
necessary.

Fixes issue #806.

Change-Id: I612d00e092ef4979a5a50b4e2d56fb767a04041e