Header minimize A

To keep the pull requests limited, we're going through the headers alphabetically and are batching them by header starting letter. These are the changes to OTAxxx.hpp and their dependant header/source files