Fix for M0P library inclusions