#169 nacl_macros.h refactored out, part of content moved to tools.h