diff --git a/visualizer.mk b/visualizer.mk
index eef2d5cc8a..13c5d31587 100644
--- a/visualizer.mk
+++ b/visualizer.mk
@@ -23,16 +23,16 @@
 GFXLIB = $(VISUALIZER_DIR)/ugfx
 ifdef LCD_ENABLE
 include $(GFXLIB)/gfx.mk
-OPT_DEFS += -DLCD_ENABLE
-OPT_LIBS += -lm
+UDEFS += -DLCD_ENABLE
+ULIBS += -lm
 endif
 SRC += $(GFXSRC) $(VISUALIZER_DIR)/visualizer.c
-INC += $(GFXINC) $(VISUALIZER_DIR)
+UINCDIR += $(GFXINC) $(VISUALIZER_DIR)
 
 ifdef LCD_BACKLIGHT_ENABLE
 SRC += $(VISUALIZER_DIR)/lcd_backlight.c
 SRC += lcd_backlight_hal.c
-OPT_DEFS += -DLCD_BACKLIGHT_ENABLE
+UDEFS += -DLCD_BACKLIGHT_ENABLE
 endif
 
 ifndef VISUALIZER_USER