Log Message:
Fix incorrect declaration for strl* and avoid re-defining CPP macros.
This fixes compiler warnings and lets this build with -Werror.  This
fixes the build on NetBSD.

Commit approved during the deep freeze by <agc>.