Move a couple of files that were in /std/modules that are not really
modules.  Moved them to /std and removed their global define so
files inherit them directly.