-INCLUDES = -I. -Idatabase -Icommon -Iyajl/build/yajl-1.0.11/include
-HTTP_INCLUDES = -Ihttp -Ilibmicrohttpd-0.9.3/src/include
-CGI_INCLUDES = -Icgi -Icgi-util-2.2.1
+INCLUDES = -I. -Idatabase -Icommon $(YAJL_INCLUDES)
+HTTP_INCLUDES = -Ihttp $(MHD_INCLUDES)
+CGI_INCLUDES = -Icgi $(CGI_UTIL_INCLUDES)