Fix to make external plugin compile again and clean public headers

!784 (merged)

!852 (merged)