diff --git a/include/WinStd/COM.h b/include/WinStd/COM.h
index 186e1c1c..6c66a08e 100644
--- a/include/WinStd/COM.h
+++ b/include/WinStd/COM.h
@@ -143,7 +143,7 @@ namespace winstd
         virtual ~com_obj()
         {
             if (m_h != invalid)
-                m_h->Release();
+                free_internal();
         }
 
 
@@ -262,7 +262,7 @@ namespace winstd
         virtual ~bstr()
         {
             if (m_h != invalid)
-                SysFreeString(m_h);
+                free_internal();
         }
 
         ///
diff --git a/include/WinStd/Crypt.h b/include/WinStd/Crypt.h
index fffbe29d..3fc93a3e 100644
--- a/include/WinStd/Crypt.h
+++ b/include/WinStd/Crypt.h
@@ -128,7 +128,7 @@ namespace winstd
         virtual ~cert_context()
         {
             if (m_h != invalid)
-                CertFreeCertificateContext(m_h);
+                free_internal();
         }
 
         ///
@@ -278,7 +278,7 @@ namespace winstd
         virtual ~cert_chain_context()
         {
             if (m_h != invalid)
-                CertFreeCertificateChain(m_h);
+                free_internal();
         }
 
         ///
@@ -343,7 +343,7 @@ namespace winstd
         virtual ~cert_store()
         {
             if (m_h != invalid)
-                CertCloseStore(m_h, 0);
+                free_internal();
         }
 
         ///
@@ -413,7 +413,7 @@ namespace winstd
         virtual ~crypt_prov()
         {
             if (m_h != invalid)
-                CryptReleaseContext(m_h, 0);
+                free_internal();
         }
 
         ///
@@ -464,7 +464,7 @@ namespace winstd
         virtual ~crypt_hash()
         {
             if (m_h != invalid)
-                CryptDestroyHash(m_h);
+                free_internal();
         }
 
         ///
@@ -530,7 +530,7 @@ namespace winstd
         virtual ~crypt_key()
         {
             if (m_h != invalid)
-                CryptDestroyKey(m_h);
+                free_internal();
         }
 
         ///
diff --git a/include/WinStd/EAP.h b/include/WinStd/EAP.h
index 62a5fab4..9a8b3cba 100644
--- a/include/WinStd/EAP.h
+++ b/include/WinStd/EAP.h
@@ -438,7 +438,7 @@ namespace winstd
         virtual ~eap_packet()
         {
             if (m_h != invalid)
-                HeapFree(GetProcessHeap(), 0, m_h);
+                free_internal();
         }
 
 
diff --git a/include/WinStd/ETW.h b/include/WinStd/ETW.h
index 4ca58165..171f2631 100644
--- a/include/WinStd/ETW.h
+++ b/include/WinStd/ETW.h
@@ -480,7 +480,7 @@ namespace winstd
         virtual ~event_provider()
         {
             if (m_h != invalid)
-                EventUnregister(m_h);
+                free_internal();
         }
 
 
@@ -753,7 +753,7 @@ namespace winstd
         virtual ~event_session()
         {
             if (m_h != invalid)
-                ControlTrace(m_h, name(), m_prop.get(), EVENT_TRACE_CONTROL_STOP);
+                free_internal();
         }
 
 
@@ -913,7 +913,7 @@ namespace winstd
         virtual ~event_trace()
         {
             if (m_h != invalid)
-                CloseTrace(m_h);
+                free_internal();
         }
 
 
diff --git a/include/WinStd/GDI.h b/include/WinStd/GDI.h
index e47d13e5..f6597b9b 100644
--- a/include/WinStd/GDI.h
+++ b/include/WinStd/GDI.h
@@ -44,7 +44,7 @@ namespace winstd
         virtual ~gdi_handle()
         {
             if (m_h != invalid)
-                DeleteObject(m_h);
+                free_internal();
         }
 
     protected:
@@ -76,7 +76,7 @@ namespace winstd
         virtual ~dc()
         {
             if (m_h != invalid)
-                DeleteDC(m_h);
+                free_internal();
         }
 
     protected:
@@ -130,7 +130,7 @@ namespace winstd
         virtual ~window_dc()
         {
             if (m_h != invalid)
-                ReleaseDC(m_hwnd, m_h);
+                free_internal();
         }
 
     protected:
diff --git a/include/WinStd/Sec.h b/include/WinStd/Sec.h
index b960a64d..c1a2a74e 100644
--- a/include/WinStd/Sec.h
+++ b/include/WinStd/Sec.h
@@ -98,10 +98,8 @@ namespace winstd
         ///
         virtual ~sec_credentials()
         {
-            if (m_h != invalid) {
-                FreeCredentialsHandle(m_h);
-                delete m_h;
-            }
+            if (m_h != invalid)
+                free_internal();
         }
 
         ///
@@ -199,10 +197,8 @@ namespace winstd
         ///
         virtual ~sec_context()
         {
-            if (m_h != invalid) {
-                DeleteSecurityContext(m_h);
-                delete m_h;
-            }
+            if (m_h != invalid)
+                free_internal();
         }
 
         ///
diff --git a/include/WinStd/SetupAPI.h b/include/WinStd/SetupAPI.h
index 1b473276..cf423c6c 100644
--- a/include/WinStd/SetupAPI.h
+++ b/include/WinStd/SetupAPI.h
@@ -44,7 +44,7 @@ namespace winstd
         virtual ~setup_device_info_list()
         {
             if (m_h != invalid)
-                SetupDiDestroyDeviceInfoList(m_h);
+                free_internal();
         }
 
         ///
diff --git a/include/WinStd/WLAN.h b/include/WinStd/WLAN.h
index 6699dbc8..a384cd2a 100644
--- a/include/WinStd/WLAN.h
+++ b/include/WinStd/WLAN.h
@@ -124,7 +124,7 @@ namespace winstd
         virtual ~wlan_handle()
         {
             if (m_h != invalid)
-                WlanCloseHandle(m_h, NULL);
+                free_internal();
         }
 
         ///
diff --git a/include/WinStd/Win.h b/include/WinStd/Win.h
index b6ad72f7..bd3b470d 100644
--- a/include/WinStd/Win.h
+++ b/include/WinStd/Win.h
@@ -437,7 +437,7 @@ namespace winstd
         virtual ~win_handle()
         {
             if (m_h != invalid)
-                CloseHandle(m_h);
+                free_internal();
         }
 
     protected:
@@ -469,7 +469,7 @@ namespace winstd
         virtual ~library()
         {
             if (m_h != invalid)
-                FreeLibrary(m_h);
+                free_internal();
         }
 
         ///
@@ -667,9 +667,8 @@ namespace winstd
         ///
         virtual ~find_file()
         {
-            if (m_h != invalid) {
-                FindClose(m_h);
-            }
+            if (m_h != invalid)
+                free_internal();
         }
 
         ///
@@ -719,10 +718,8 @@ namespace winstd
         ///
         virtual ~heap()
         {
-            if (m_h != invalid) {
-                enumerate();
-                HeapDestroy(m_h);
-            }
+            if (m_h != invalid)
+                free_internal();
         }
 
         ///
@@ -1168,7 +1165,7 @@ namespace winstd
         virtual ~reg_key()
         {
             if (m_h != invalid)
-                RegCloseKey(m_h);
+                free_internal();
         }
 
         ///
@@ -1300,7 +1297,7 @@ namespace winstd
         virtual ~security_id()
         {
             if (m_h != invalid)
-                FreeSid(m_h);
+                free_internal();
         }
 
     protected:
diff --git a/include/WinStd/WinSock2.h b/include/WinStd/WinSock2.h
index 8d28ae25..f0044307 100644
--- a/include/WinStd/WinSock2.h
+++ b/include/WinStd/WinSock2.h
@@ -138,7 +138,7 @@ namespace winstd
         virtual ~addrinfo()
         {
             if (m_h != invalid)
-                FreeAddrInfo(m_h);
+                free_internal();
         }