Fixed macro dependencies.