Move BLOCK_ALIGN* macros back.

The move to nscd-client.h was only needed for some interim version
of the patch.  The final version doesn't need it.  Undo the change.