Adapted includes to new DBGL naming pattern