diff --git a/acdb/ats/transports/diag/linux/audtp/inc/audtp.h b/acdb/ats/transports/diag/linux/audtp/inc/audtp.h
index 3f493b5e..912ba157 100644
--- a/acdb/ats/transports/diag/linux/audtp/inc/audtp.h
+++ b/acdb/ats/transports/diag/linux/audtp/inc/audtp.h
@@ -25,10 +25,6 @@
       --------------------
  */
 
-/** Definitions for char_t, word, etc. */
-#ifndef ATS_USES_DUMMY_DIAG
-#include "comdef.h"
-#endif
 #include "audtpi.h"
 #include "diagcmd.h"
 #include "diagpkt.h"
diff --git a/ar_osal/Makefile.am b/ar_osal/Makefile.am
index 2cb07c4c..500813b3 100644
--- a/ar_osal/Makefile.am
+++ b/ar_osal/Makefile.am
@@ -54,6 +54,7 @@ AM_CFLAGS += -I$(top_srcdir)/acdb/ats/transports/diag/linux/inc/
 osal_c_sources += ./src/linux/ar_osal_stub_log_pkt_op.c
 else
 osal_c_sources += ./src/linux/qcom/ar_osal_log_pkt_op.c
+AM_CFLAGS += -DUSE_DIAG_HEADERS
 endif
 
 
@@ -84,7 +85,7 @@ endif
 if USE_DUMMY_DIAG
 #dummy diag, do not link real diag libs
 else
-libar_osal_la_LIBADD += -llog -ldiag
+libar_osal_la_LIBADD += -ldiag
 endif
 
 if USE_G_STR_FUNC
diff --git a/ar_osal/src/linux/qcom/ar_osal_log_pkt_op.c b/ar_osal/src/linux/qcom/ar_osal_log_pkt_op.c
index b254f81f..d404bf18 100644
--- a/ar_osal/src/linux/qcom/ar_osal_log_pkt_op.c
+++ b/ar_osal/src/linux/qcom/ar_osal_log_pkt_op.c
@@ -11,7 +11,11 @@
 #include "ar_osal_log_pkt_op.h"
 #include "ar_osal_error.h"
 #include "ar_osal_log.h"
+#ifndef USE_DIAG_HEADERS
 #include "comdef.h"
+#else
+#include "diag_comdef.h"
+#endif
 #include "diag_lsm.h"
 #include "log.h"
 
diff --git a/ci/build_options.txt b/ci/build_options.txt
index d82700a9..d0e99901 100644
--- a/ci/build_options.txt
+++ b/ci/build_options.txt
@@ -19,7 +19,7 @@
 --with-syslog
 --with-glib
 --without-cutils
---with-dummy_diag
+--without-dummy_diag
 --with-qcom
 --with-audio_dma_support
 --without-ats_transport_tcp_ip