Fix module inclusion for pieces