diff --git a/decoder/build/linux/makefile b/decoder/build/linux/makefile
index 4cd2f5f..f84b057 100644
--- a/decoder/build/linux/makefile
+++ b/decoder/build/linux/makefile
@@ -100,7 +100,7 @@
 export BIN_TEST_TARGET_DIR=$(OCSD_TESTS)/bin/$(PLAT_DIR)
 
 # Fish version out of header file (converting from hex)
-getver:=printf "%d" $$(awk '/\#define VARNAME/ { print $$3 }' $(OCSD_ROOT)/include/ocsd_if_version.h)
+getver:=printf "%d" $$(awk '/\#define VARNAME/ { print $$3 }' $(OCSD_ROOT)/include/opencsd/ocsd_if_version.h)
 export SO_MAJOR_VER := $(shell $(subst VARNAME,OCSD_VER_MAJOR,$(getver)))
 SO_MINOR_VER := $(shell $(subst VARNAME,OCSD_VER_MINOR,$(getver)))
 SO_PATCH_VER := $(shell $(subst VARNAME,OCSD_VER_PATCH,$(getver)))
diff --git a/decoder/build/linux/rctdl_c_api_lib/makefile b/decoder/build/linux/rctdl_c_api_lib/makefile
index d93db7d..a0bd5a3 100644
--- a/decoder/build/linux/rctdl_c_api_lib/makefile
+++ b/decoder/build/linux/rctdl_c_api_lib/makefile
@@ -103,6 +103,7 @@
 	$(INSTALL) -d --mode=0755 $(INST_INC_DST)/
 	$(INSTALL) --mode=0644 $(INST_INC_SRC)/trc_gen_elem_types.h $(INST_INC_DST)/
 	$(INSTALL) --mode=0644 $(INST_INC_SRC)/ocsd_if_types.h $(INST_INC_DST)/
+	$(INSTALL) --mode=0644 $(INST_INC_SRC)/ocsd_if_version.h $(INST_INC_DST)/
 	$(INSTALL) --mode=0644 $(INST_INC_SRC)/trc_pkt_types.h $(INST_INC_DST)/
 	$(INSTALL) -d --mode=0755 $(INST_INC_DST)/ptm
 	$(INSTALL) --mode=0644 $(INST_INC_SRC)/ptm/trc_pkt_types_ptm.h $(INST_INC_DST)/ptm/
diff --git a/decoder/build/win-vs2015/ref_trace_decode_lib/ref_trace_decode_lib.vcxproj b/decoder/build/win-vs2015/ref_trace_decode_lib/ref_trace_decode_lib.vcxproj
index eae071a..095f27b 100644
--- a/decoder/build/win-vs2015/ref_trace_decode_lib/ref_trace_decode_lib.vcxproj
+++ b/decoder/build/win-vs2015/ref_trace_decode_lib/ref_trace_decode_lib.vcxproj
@@ -375,8 +375,8 @@
     <ClInclude Include="..\..\..\include\mem_acc\trc_mem_acc_file.h" />
     <ClInclude Include="..\..\..\include\mem_acc\trc_mem_acc_mapper.h" />
     <ClInclude Include="..\..\..\include\opencsd\ocsd_if_types.h" />
-    <ClInclude Include="..\..\..\include\ocsd_if_version.h" />
     <ClInclude Include="..\..\..\include\opencsd.h" />
+    <ClInclude Include="..\..\..\include\opencsd\ocsd_if_version.h" />
     <ClInclude Include="..\..\..\include\pkt_printers\gen_elem_printer.h" />
     <ClInclude Include="..\..\..\include\pkt_printers\item_printer.h" />
     <ClInclude Include="..\..\..\include\pkt_printers\pkt_printer_t.h" />
diff --git a/decoder/build/win-vs2015/ref_trace_decode_lib/ref_trace_decode_lib.vcxproj.filters b/decoder/build/win-vs2015/ref_trace_decode_lib/ref_trace_decode_lib.vcxproj.filters
index f3044ec..1ef8720 100644
--- a/decoder/build/win-vs2015/ref_trace_decode_lib/ref_trace_decode_lib.vcxproj.filters
+++ b/decoder/build/win-vs2015/ref_trace_decode_lib/ref_trace_decode_lib.vcxproj.filters
@@ -320,9 +320,6 @@
     <ClInclude Include="..\..\..\include\opencsd\stm\trc_pkt_decode_stm.h">
       <Filter>Header Files\stm</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\include\ocsd_if_version.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\include\pkt_printers\gen_elem_printer.h">
       <Filter>Header Files\pkt_printers</Filter>
     </ClInclude>
@@ -359,6 +356,9 @@
     <ClInclude Include="..\..\..\include\mem_acc\trc_mem_acc_cache.h">
       <Filter>Header Files\mem_acc</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\include\opencsd\ocsd_if_version.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\..\source\trc_component.cpp">
diff --git a/decoder/include/opencsd/c_api/ocsd_c_api_types.h b/decoder/include/opencsd/c_api/ocsd_c_api_types.h
index ca61e0a..cde351f 100644
--- a/decoder/include/opencsd/c_api/ocsd_c_api_types.h
+++ b/decoder/include/opencsd/c_api/ocsd_c_api_types.h
@@ -37,6 +37,7 @@
 
 /* select the library types that are C compatible - the interface data types */
 #include "opencsd/ocsd_if_types.h"
+#include "opencsd/ocsd_if_version.h"
 #include "opencsd/trc_gen_elem_types.h"
 #include "opencsd/trc_pkt_types.h"
 
diff --git a/decoder/include/ocsd_if_version.h b/decoder/include/opencsd/ocsd_if_version.h
similarity index 95%
rename from decoder/include/ocsd_if_version.h
rename to decoder/include/opencsd/ocsd_if_version.h
index 0ef1630..c056fd6 100644
--- a/decoder/include/ocsd_if_version.h
+++ b/decoder/include/opencsd/ocsd_if_version.h
@@ -44,7 +44,7 @@
 @{*/
 #define OCSD_VER_MAJOR 0x0 /**< Library Major Version */
 #define OCSD_VER_MINOR 0x9 /**< Library Minor Version */
-#define OCSD_VER_PATCH 0x2 /**< Library Patch Version */
+#define OCSD_VER_PATCH 0x3 /**< Library Patch Version */
 
 /** Library version number - MMMMnnpp format.
     MMMM = major version, 
@@ -53,7 +53,7 @@
 */
 #define OCSD_VER_NUM (((uint32_t)OCSD_VER_MAJOR << 16) | ((uint32_t)OCSD_VER_MINOR << 8) | ((uint32_t)OCSD_VER_PATCH)) 
 
-#define OCSD_VER_STRING "0.9.2"    /**< Library Version string */
+#define OCSD_VER_STRING "0.9.3"    /**< Library Version string */
 #define OCSD_LIB_NAME "OpenCSD Library"  /**< Library name string */
 #define OCSD_LIB_SHORT_NAME "OCSD"    /**< Library Short name string */
 /** @}*/
diff --git a/decoder/source/ocsd_version.cpp b/decoder/source/ocsd_version.cpp
index 33990a0..6dd3f2c 100644
--- a/decoder/source/ocsd_version.cpp
+++ b/decoder/source/ocsd_version.cpp
@@ -32,7 +32,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */ 
 
-#include "ocsd_if_version.h"
+#include "opencsd/ocsd_if_version.h"
 #include "common/ocsd_version.h"
 
 const uint32_t ocsdVersion::vers_num()