Remove define conflicts