diff --git a/src/Gnutella.cc b/src/Gnutella.cc
index 448c8dcb3b..6b5e901bc5 100644
--- a/src/Gnutella.cc
+++ b/src/Gnutella.cc
@@ -42,6 +42,12 @@ Gnutella_Analyzer::Gnutella_Analyzer(Connection* conn)
 	resp_msg_state = new GnutellaMsgState();
 	}
 
+Gnutella_Analyzer::~Gnutella_Analyzer()
+	{
+	delete orig_msg_state;
+	delete resp_msg_state;
+	}
+
 void Gnutella_Analyzer::Done()
 	{
 	TCP_ApplicationAnalyzer::Done();
diff --git a/src/Gnutella.h b/src/Gnutella.h
index f06c816c90..455876462d 100644
--- a/src/Gnutella.h
+++ b/src/Gnutella.h
@@ -35,6 +35,7 @@ public:
 class Gnutella_Analyzer : public TCP_ApplicationAnalyzer {
 public:
 	Gnutella_Analyzer(Connection* conn);
+	~Gnutella_Analyzer();
 
 	virtual void Done ();
 	virtual void DeliverStream(int len, const u_char* data, bool orig);
diff --git a/src/NCP.cc b/src/NCP.cc
index 83378a09a7..edd882747c 100644
--- a/src/NCP.cc
+++ b/src/NCP.cc
@@ -225,5 +225,7 @@ NCP_Analyzer::NCP_Analyzer(Connection* conn)
 NCP_Analyzer::~NCP_Analyzer()
 	{
 	delete session;
+	delete o_ncp;
+	delete r_ncp;
 	}
 
diff --git a/src/Sessions.cc b/src/Sessions.cc
index d78032a25b..b78fdd67d0 100644
--- a/src/Sessions.cc
+++ b/src/Sessions.cc
@@ -135,6 +135,10 @@ NetSessions::~NetSessions()
 	delete SYN_OS_Fingerprinter;
 	delete pkt_profiler;
 	Unref(arp_analyzer);
+	if (discarder)
+		delete discarder;
+	if (stp_manager)
+		delete stp_manager;
 	}
 
 void NetSessions::Done()