Revert "Do not copy ion.h"

This reverts commit 2889d100cf3313e4c5d00d598a9bbd1e71c58417.
Also changes it to include ion.h only once