Fix introspection in makefiles