Merge remote-tracking branch 'upstream/debian/sid' into feature/apt-manpage

Conflicts:
	cmdline/apt.cc

1 files changed, 5 insertions, 3 deletions

diff --git a/test/interactive-helper/test_udevcdrom.cc b/test/interactive-helper/test_udevcdrom.cc
index 88f5f0153..b87dcd935 100644
--- a/test/interactive-helper/test_udevcdrom.cc
+++ b/test/interactive-helper/test_udevcdrom.cc
@@ -1,7 +1,10 @@
+#include <config.h>
+
 #include <apt-pkg/cdrom.h>
-#include <stdio.h>
-#include <assert.h>
 
+#include <stddef.h>
+#include <string>
+#include <assert.h>
 #include <vector>
 #include <iostream>
 
@@ -17,5 +20,4 @@ int main()
       std::cerr << l[i].DeviceName << " " 
 		<< l[i].Mounted << " " 
 		<< l[i].MountPath << std::endl;
-   
 }