Bug 6261 [Revised] Consolidate patron toolbar include files