remove unneeded includes, sync my copyright across files & whitespace; ok djm@
re-add our own aesctr implementation; ok djm@