diff -Nru openscap-1.2.16/debian/changelog openscap-1.2.16/debian/changelog
--- openscap-1.2.16/debian/changelog	2019-06-17 11:09:59.000000000 +0000
+++ openscap-1.2.16/debian/changelog	2019-06-18 09:52:00.000000000 +0000
@@ -1,3 +1,9 @@
+openscap (1.2.16-2ubuntu1) eoan; urgency=medium
+
+  * Port to apt 1.9.0 (include more headers)
+
+ -- Julian Andres Klode <juliank@ubuntu.com>  Tue, 18 Jun 2019 11:52:00 +0200
+
 openscap (1.2.16-2build2) eoan; urgency=high
 
   * No change rebuild against apt 1.9.0.
diff -Nru openscap-1.2.16/debian/patches/apt-1.9.0.patch openscap-1.2.16/debian/patches/apt-1.9.0.patch
--- openscap-1.2.16/debian/patches/apt-1.9.0.patch	1970-01-01 00:00:00.000000000 +0000
+++ openscap-1.2.16/debian/patches/apt-1.9.0.patch	2019-06-18 09:52:00.000000000 +0000
@@ -0,0 +1,33 @@
+From d328d01ba632a49a57c44fb8075a0753a07c5cac Mon Sep 17 00:00:00 2001
+From: Julian Andres Klode <julian.klode@canonical.com>
+Date: Tue, 18 Jun 2019 11:57:58 +0200
+Subject: [PATCH] Include additional headers in dkpginfo-helper for apt 1.9
+
+apt 1.9 cleans up the header includes a bit, causing the build
+to fail, so add the additional headers we are missing.
+
+Origin: https://github.com/OpenSCAP/openscap/pull/1363
+---
+ src/OVAL/probes/unix/linux/dpkginfo-helper.cxx | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/OVAL/probes/unix/linux/dpkginfo-helper.cxx b/src/OVAL/probes/unix/linux/dpkginfo-helper.cxx
+index 952f85204..18acc5637 100644
+--- a/src/OVAL/probes/unix/linux/dpkginfo-helper.cxx
++++ b/src/OVAL/probes/unix/linux/dpkginfo-helper.cxx
+@@ -9,9 +9,12 @@
+ 
+ #include <apt-pkg/init.h>
+ #include <apt-pkg/error.h>
++#include <apt-pkg/configuration.h>
++#include <apt-pkg/fileutl.h>
+ #include <apt-pkg/mmap.h>
+ #include <apt-pkg/pkgcache.h>
+ #include <apt-pkg/pkgrecords.h>
++#include <apt-pkg/pkgsystem.h>
+ 
+ #include "dpkginfo-helper.h"
+ 
+-- 
+2.20.1
+
diff -Nru openscap-1.2.16/debian/patches/series openscap-1.2.16/debian/patches/series
--- openscap-1.2.16/debian/patches/series	2018-05-03 08:03:32.000000000 +0000
+++ openscap-1.2.16/debian/patches/series	2019-06-18 09:51:26.000000000 +0000
@@ -5,3 +5,4 @@
 008_fix_kfreebsd_ftbfs.patch
 009_rename_perl_so,patch
 010-install-cpe-oval.patch
+apt-1.9.0.patch