diff --git a/Makefile.inc b/Makefile.inc
index 36fbb94..93bdd6d 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -101,8 +101,8 @@
 			 QT_WEBKIT_LIB QT_QML_LIB QT_LOCATION_LIB QT_WIDGETS_LIB QT_NETWORK_LIB \
 			 QT_POSITIONING_LIB QT_SENSORS_LIB QT_GUI_LIB QT_CORE_LIB QT_QML_DEBUG \
 			 QT_DECLARATIVE_DEBUG _REENTRANT
-  QTDIR = /usr/include/qt5
-  QMAKEDIR = /usr/lib/x86_64-linux-gnu/qt5/mkspecs/linux-g++-64 
+  QTDIR = /usr/include/x86_64-linux-gnu/qt5
+  QMAKEDIR = $(QTDIR)/mkspecs/linux-g++-64 
   INCLUDE_PATHS += $(QMAKEDIR) $(QTDIR) $(QTDIR)/QtWebKitWidgets \
 				   $(QTDIR)/QtQuick $(QTDIR)/QtOpenGL $(QTDIR)/QtPrintSupport \
 				   $(QTDIR)/QtWebKit $(QTDIR)/QtQml $(QTDIR)/QtLocation \
@@ -150,6 +150,7 @@
 UIC    = uic
 RCC    = rcc
 LINT   := $(dir $(lastword $(MAKEFILE_LIST)))Build/cpplint.py
+TIDY   = clang-tidy
 
 
 #
@@ -209,6 +210,9 @@
 lint:
 	$(LINT) --linelength=120 --filter=-whitespace $(SOURCES)
 
+tidy:
+	$(TIDY) -checks='c*,l*,m*' $(SOURCES) -- $(CXXFLAGS)
+
 $(OBJECTS_PATH)/%.o: %.c $(DEPENDS)
 	@$(MKDIR) $(dir $@)
 	$(CC) -c -o $@ $< $(CFLAGS)