diff --git a/cddl/usr.sbin/zfsd/case_file.cc b/cddl/usr.sbin/zfsd/case_file.cc
index e7a4eb1be40c..86c74b12230a 100644
--- a/cddl/usr.sbin/zfsd/case_file.cc
+++ b/cddl/usr.sbin/zfsd/case_file.cc
@@ -83,7 +83,6 @@ using std::setfill;
 using std::setw;
 
 using DevdCtl::Event;
-using DevdCtl::EventBuffer;
 using DevdCtl::EventFactory;
 using DevdCtl::EventList;
 using DevdCtl::Guid;
diff --git a/lib/libdevdctl/consumer.cc b/lib/libdevdctl/consumer.cc
index 6b9822e8c71e..e76989473599 100644
--- a/lib/libdevdctl/consumer.cc
+++ b/lib/libdevdctl/consumer.cc
@@ -129,10 +129,10 @@ Consumer::ConnectToDevd()
 void
 Consumer::DisconnectFromDevd()
 {
-	if (m_devdSockFD != -1)
+	if (m_devdSockFD != -1) {
 		syslog(LOG_INFO, "Disconnecting from devd.");
-
-	close(m_devdSockFD);
+		close(m_devdSockFD);
+	}
 	m_devdSockFD = -1;
 }
 
diff --git a/lib/libdevdctl/consumer.h b/lib/libdevdctl/consumer.h
index 721461e8ae96..0f15b791f53c 100644
--- a/lib/libdevdctl/consumer.h
+++ b/lib/libdevdctl/consumer.h
@@ -44,8 +44,6 @@ namespace DevdCtl
 
 /*=========================== Forward Declarations ===========================*/
 class Event;
-class EventBuffer;
-class FDReader;
 
 /*============================ Class Declarations ============================*/
 /*----------------------------- DevdCtl::Consumer ----------------------------*/
@@ -139,16 +137,6 @@ class Consumer
 	 */
 	int                m_devdSockFD;
 
-	/**
-	 * Reader tied to the devd socket.
-	 */
-	FDReader	  *m_reader;
-
-	/**
-	 * Default EventBuffer connected to m_reader.
-	 */
-	EventBuffer	  *m_eventBuffer;
-
 	EventFactory	   m_eventFactory;
 
 	/** Queued events for replay. */