Fixed main assembly header import dependency ordering