update references and includes