ADIv5 header cleanup (+ #defines)