Bug 1017650 - Re-arrange the GC API include dependency ordering; r=jonco

--HG--
extra : rebase_source : bc27b7206c674ef2247169dd700b9fbf61e5bd74
Bug 1017650 - Remove the unused |proto| arg from the wrapping machinery; r=efaust