Fix build after aout reorganization
Merge pull request #32 from jturner/fix-build

Fix build after aout reorganization.