Don't make any assumptions about the dcdb folder name

analytics/Makefile

 include ../config.mk
 include ../common.mk
 
-CXXFLAGS =	-std=c++11 -DBOOST_DATE_TIME_POSIX_TIME_STD_CONFIG -DBOOST_NETWORK_ENABLE_HTTPS -O2 -g -Wall -Wno-unused-function -Wno-unused-local-typedefs -Wno-deprecated-declarations -Wno-unused-variable -DBOOST_LOG_DYN_LINK -I$(DCDBBASEPATH)/dcdb/common/include -I$(DCDBDEPLOYPATH)/include -DVERSION=\"$(VERSION)\"
+CXXFLAGS =	-std=c++11 -DBOOST_DATE_TIME_POSIX_TIME_STD_CONFIG -DBOOST_NETWORK_ENABLE_HTTPS -O2 -g -Wall -Wno-unused-function -Wno-unused-local-typedefs -Wno-deprecated-declarations -Wno-unused-variable -DBOOST_LOG_DYN_LINK -I../common/include -I$(DCDBDEPLOYPATH)/include -DVERSION=\"$(VERSION)\"
 LIBS = -L../lib -L$(DCDBDEPLOYPATH)/lib/ -ldl -lboost_system -lboost_thread -lboost_log_setup -lboost_log -lboost_regex -lpthread -rdynamic
 
 ANALYZERS = aggregator

dcdbpusher/Makefile

@@ -4,7 +4,7 @@ include ../common.mk
 CXXFLAGS = -std=c++11 -O2 -g -Wall \
            -Wno-unused-function -Wno-unused-local-typedefs -Wno-deprecated-declarations -Wno-unused-variable \
            -DBOOST_DATE_TIME_POSIX_TIME_STD_CONFIG -DBOOST_LOG_DYN_LINK -DBOOST_NETWORK_ENABLE_HTTPS \
-           -I$(DCDBBASEPATH)/dcdb/common/include \
+           -I../common/include \
            -I$(DCDBDEPLOYPATH)/include \
            -DVERSION=\"$(VERSION)\"