diff --git a/tasm/encoding/include/EncodeAPI.h b/tasm/encoding/include/EncodeAPI.h
index 82d86d74..1d0b7422 100644
--- a/tasm/encoding/include/EncodeAPI.h
+++ b/tasm/encoding/include/EncodeAPI.h
@@ -2,9 +2,9 @@
 #define TASM_ENCODEAPI_H
 
 #include "nvEncodeAPI.h"
-#include "nvUtils.h"
 #include <cuda.h>
 #include <cassert>
+#include <cstring>
 #include <functional>
 
 class GPUContext;
@@ -24,6 +24,14 @@ struct MotionEstimationBuffer;
 #define NVENCAPI
 #endif
 
+inline bool operator==(const GUID &guid1, const GUID &guid2) {
+    return !memcmp(&guid1, &guid2, sizeof(GUID));
+}
+
+inline bool operator!=(const GUID &guid1, const GUID &guid2) {
+    return !(guid1 == guid2);
+}
+
 #define DEFAULT_I_QFACTOR -0.8f
 #define DEFAULT_B_QFACTOR 1.25f
 #define DEFAULT_I_QOFFSET 0.f
@@ -86,7 +94,7 @@ class EncodeAPI
     GUID                                                 codecGUID;
 
     NV_ENCODE_API_FUNCTION_LIST*                         m_pEncodeAPI;
-    HINSTANCE                                            m_hinstLib;
+    void                                                 *m_hinstLib;
     FrameEncodedHandler                                  *frameEncodedHandler;
     MotionEstimationEncodedHandler                       *motionEstimationEncodedHandler;
     EncodeSessionHandle                                  *encodeSessionHandle;
diff --git a/tasm/encoding/include/EncodeBuffer.h b/tasm/encoding/include/EncodeBuffer.h
index cf7299c0..767ed0bf 100644
--- a/tasm/encoding/include/EncodeBuffer.h
+++ b/tasm/encoding/include/EncodeBuffer.h
@@ -25,7 +25,7 @@ struct EncodeOutputBuffer
 {
     unsigned int          bitstreamBufferSize;
     NV_ENC_OUTPUT_PTR     bitstreamBuffer;
-    HANDLE                outputEvent;
+    void                  *outputEvent;
     bool                  waitOnEvent;
     bool                  EOSFlag;
 };