Fixed dependencies for 0.13.x style macros