We have a bunch of ordering and stuff which could/should be done by 'include aws_api' that is erroneously in our (internal) amazon class. Pull it out!