Moved draw definitions to internal header