Fix #40 - Remove partial defs to fix dependency load order issues