Eliminated includes of mysql.* and fixed import