added stubs for PassThrough{Slot,Callback}, reorganized includes