diff --git a/demo/viewer/viewer.pro b/demo/viewer/viewer.pro
index 37169cea4..146c5159d 100644
--- a/demo/viewer/viewer.pro
+++ b/demo/viewer/viewer.pro
@@ -5,20 +5,14 @@ TEMPLATE = app
 QT += core gui widgets
 QT += opengl
 
-QMAKE_CXX = /opt/llvm/bin/clang++
-QMAKE_LINK = /opt/llvm/bin/clang++
+QMAKE_CXX = $$system(mapnik-config --cxx)
+QMAKE_LINK = $$system(mapnik-config --cxx)
 QMAKE_CXXFLAGS += $$system(mapnik-config --cxxflags --defines)
 QMAKE_CXXFLAGS += $$system(mapnik-config --includes --dep-includes)
-QMAKE_CXXFLAGS += "-I/Users/artem/Projects/skia/trunk/include/core"
-QMAKE_CXXFLAGS += "-I/Users/artem/Projects/skia/trunk/include/config"
-QMAKE_CXXFLAGS += "-I/Users/artem/Projects/skia/trunk/include/gpu"
-## QMAKE_CXXFLAGS += "-I/Users/artem/Projects/skia/trunk/include/gpu/gl"
-QMAKE_CXXFLAGS += "-I/Users/artem/Projects/skia/trunk/include/utils"
 
 QMAKE_LFLAGS += $$system(mapnik-config --libs)
 QMAKE_LFLAGS += $$system(mapnik-config --ldflags --dep-libs)
 QMAKE_LFLAGS += -lboost_timer
-QMAKE_LFLAGS += -L/opt/X11/lib
 QMAKE_LFLAGS += "-framework Cocoa"
 
 # Input