diff --git a/libqpdf/QPDF_Stream.cc b/libqpdf/QPDF_Stream.cc
index 5244ac2..b6de284 100644
--- a/libqpdf/QPDF_Stream.cc
+++ b/libqpdf/QPDF_Stream.cc
@@ -4,7 +4,6 @@
 #include <qpdf/JSON_writer.hh>
 #include <qpdf/Pipeline.hh>
 #include <qpdf/Pipeline_private.hh>
-#include <qpdf/Pl_Base64.hh>
 #include <qpdf/Pl_Buffer.hh>
 #include <qpdf/Pl_Count.hh>
 #include <qpdf/Pl_Discard.hh>
diff --git a/libqpdf/qpdf/QPDFObjectHandle_private.hh b/libqpdf/qpdf/QPDFObjectHandle_private.hh
index e6d75ff..3f6827b 100644
--- a/libqpdf/qpdf/QPDFObjectHandle_private.hh
+++ b/libqpdf/qpdf/QPDFObjectHandle_private.hh
@@ -445,6 +445,23 @@ namespace qpdf
         {
         }
 
+        Stream() = default;
+        Stream(Stream const&) = default;
+        Stream(Stream&&) = default;
+        Stream& operator=(Stream const&) = default;
+        Stream& operator=(Stream&&) = default;
+        ~Stream() = default;
+
+        Stream(QPDFObjectHandle const& oh) :
+            BaseHandle(oh.type_code() == ::ot_stream ? oh : QPDFObjectHandle())
+        {
+        }
+
+        Stream(QPDFObjectHandle&& oh) :
+            BaseHandle(oh.type_code() == ::ot_stream ? std::move(oh) : QPDFObjectHandle())
+        {
+        }
+
         Stream(
             QPDF& qpdf,
             QPDFObjGen og,