-HEADER_SEARCH_PATHS = $(WXROOT)/src/tiff/libtiff
-USER_HEADER_SEARCH_PATHS = $(WXROOT)/include $(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include $(WXROOT)/src/jpeg $(WXROOT)/src/png $(WXROOT)/src/regex $(WXROOT)/src/expat/lib $(WXROOT)/src/tiff/libtiff
+HEADER_SEARCH_PATHS = "$(WXROOT)/src/tiff/libtiff"
+USER_HEADER_SEARCH_PATHS = "$(WXROOT)/include" "$(WXROOT)/build/osx/setup/$(WXTOOLKIT)/include" "$(WXROOT)/src/jpeg" "$(WXROOT)/src/png" "$(WXROOT)/src/regex" "$(WXROOT)/src/expat/lib" "$(WXROOT)/src/tiff/libtiff" "$(WXROOT)/src/stc/scintilla/src" "$(WXROOT)/src/stc/scintilla/include" "$(WXROOT)/src/stc/scintilla/lexlib"