avoid symbol conflict w/ older codebases
more proper includes
more proper includes
fix the arduino platform calls