merged caf headers into source to hopefully fix any and all errors in the build env as far as caf hw goes