[#866923] Moved makeapi into require.