consolidated headers on ecosystem/devreg (bug 840253)