diff --git a/.gitignore b/.gitignore
index b2ca36fd4..7328f65e5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -96,6 +96,8 @@ net-snmp/net-snmp-5.7.3/include/net-snmp/agent/mib_module_config.h
 *MYMETA.json
 utils/loggingcpp/errorids.h
 utils/loggingcpp/messageids.h
+utils/loggingcpp/errorids-temp.h
+utils/loggingcpp/messageids-temp.h
 CPackConfig.cmake
 CPackSourceConfig.cmake
 build/columnstore.community.spec
diff --git a/dbcon/ddlpackage/CMakeLists.txt b/dbcon/ddlpackage/CMakeLists.txt
index c18bf6ab2..7ce5207ff 100644
--- a/dbcon/ddlpackage/CMakeLists.txt
+++ b/dbcon/ddlpackage/CMakeLists.txt
@@ -1,7 +1,9 @@
 INCLUDE_DIRECTORIES( ${ENGINE_COMMON_INCLUDES} )
 
 FIND_PACKAGE(BISON REQUIRED)
-BISON_TARGET(ddl_gram ddl.y ${CMAKE_CURRENT_BINARY_DIR}/ddl-gram.cpp DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/ddl-gram.h COMPILE_FLAGS "-l -d -p ddl")
+BISON_TARGET(ddl_gram ddl.y ${CMAKE_CURRENT_BINARY_DIR}/ddl-gram.cpp
+  DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/ddl-gram.h
+  COMPILE_FLAGS "-l -p ddl --defines=${CMAKE_CURRENT_BINARY_DIR}/ddl-gram.h")
 
 FIND_PACKAGE(FLEX REQUIRED)
 FLEX_TARGET(ddl_scan ddl.l ${CMAKE_CURRENT_BINARY_DIR}/ddl-scan.cpp COMPILE_FLAGS "-i -L -Pddl")
diff --git a/dbcon/dmlpackage/CMakeLists.txt b/dbcon/dmlpackage/CMakeLists.txt
index 8982de1a9..da3129ac7 100644
--- a/dbcon/dmlpackage/CMakeLists.txt
+++ b/dbcon/dmlpackage/CMakeLists.txt
@@ -2,7 +2,9 @@
 INCLUDE_DIRECTORIES( ${ENGINE_COMMON_INCLUDES} )
 
 FIND_PACKAGE(BISON REQUIRED)
-BISON_TARGET(dml_gram dml.y ${CMAKE_CURRENT_BINARY_DIR}/dml-gram.cpp DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/dml-gram.h COMPILE_FLAGS "-l -d -p dml")
+BISON_TARGET(dml_gram dml.y ${CMAKE_CURRENT_BINARY_DIR}/dml-gram.cpp
+  DEFINES_FILE ${CMAKE_CURRENT_BINARY_DIR}/dml-gram.h
+  COMPILE_FLAGS "-l -p dml --defines=${CMAKE_CURRENT_BINARY_DIR}/dml-gram.h")
 
 FIND_PACKAGE(FLEX REQUIRED)
 FLEX_TARGET(dml_scan dml.l ${CMAKE_CURRENT_BINARY_DIR}/dml-scan.cpp COMPILE_FLAGS "-i -L -Pdml")