This matches the previous commit doing the same for CFLAGS in response to the common/ module changes.