After running the patch, everything looks ok, except the G15 is still missing from the include.
Manually added to eq2_mainhud.xml:
<include>eq2ui_mainhud_g15.xml</include>
Mapfog button is there,
Clock is hideable. (yay!)
Broker window works fine.
No errors on patcher on main system. about to try my 2nd system. (only uses default so it will be a vanilla install)