[#865390] Ensure MakeAPI is working when included client side and node/server side