diff --git a/msvc/libdivecomputer.vcproj b/msvc/libdivecomputer.vcproj
index 068f4cf..0505056 100644
--- a/msvc/libdivecomputer.vcproj
+++ b/msvc/libdivecomputer.vcproj
@@ -42,7 +42,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBDIVECOMPUTER_EXPORTS;ENABLE_LOGGING"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBDIVECOMPUTER_EXPORTS;ENABLE_LOGGING;HAVE_IRDA"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -119,7 +119,7 @@
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
 				AdditionalIncludeDirectories="..\include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBDIVECOMPUTER_EXPORTS;ENABLE_LOGGING"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBDIVECOMPUTER_EXPORTS;ENABLE_LOGGING;HAVE_IRDA"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
 				UsePrecompiledHeader="0"
@@ -238,6 +238,10 @@
 				RelativePath="..\src\hw_ostc.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\hw_ostc3.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\hw_ostc_parser.c"
 				>
@@ -346,6 +350,14 @@
 				RelativePath="..\src\serial_win32.c"
 				>
 			</File>
+			<File
+				RelativePath="..\src\shearwater_common.c"
+				>
+			</File>
+			<File
+				RelativePath="..\src\shearwater_petrel.c"
+				>
+			</File>
 			<File
 				RelativePath="..\src\shearwater_predator.c"
 				>
@@ -433,7 +445,7 @@
 			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
 			>
 			<File
-				RelativePath="..\include\libdivecomputer\array.h"
+				RelativePath="..\src\array.h"
 				>
 			</File>
 			<File
@@ -449,7 +461,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\include\libdivecomputer\checksum.h"
+				RelativePath="..\src\checksum.h"
 				>
 			</File>
 			<File
@@ -481,7 +493,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\include\libdivecomputer\device-private.h"
+				RelativePath="..\src\device-private.h"
 				>
 			</File>
 			<File
@@ -501,7 +513,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\include\libdivecomputer\irda.h"
+				RelativePath="..\include\libdivecomputer\hw_ostc3.h"
+				>
+			</File>
+			<File
+				RelativePath="..\src\irda.h"
 				>
 			</File>
 			<File
@@ -513,7 +529,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\include\libdivecomputer\mares_common.h"
+				RelativePath="..\src\mares_common.h"
 				>
 			</File>
 			<File
@@ -541,7 +557,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\include\libdivecomputer\oceanic_common.h"
+				RelativePath="..\src\oceanic_common.h"
 				>
 			</File>
 			<File
@@ -553,7 +569,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\include\libdivecomputer\parser-private.h"
+				RelativePath="..\src\parser-private.h"
 				>
 			</File>
 			<File
@@ -577,17 +593,25 @@
 				>
 			</File>
 			<File
-				RelativePath="..\include\libdivecomputer\ringbuffer.h"
+				RelativePath="..\src\ringbuffer.h"
 				>
 			</File>
 			<File
-				RelativePath="..\include\libdivecomputer\serial.h"
+				RelativePath="..\src\serial.h"
 				>
 			</File>
 			<File
 				RelativePath="..\include\libdivecomputer\shearwater.h"
 				>
 			</File>
+			<File
+				RelativePath="..\src\shearwater_common.h"
+				>
+			</File>
+			<File
+				RelativePath="..\include\libdivecomputer\shearwater_petrel.h"
+				>
+			</File>
 			<File
 				RelativePath="..\include\libdivecomputer\shearwater_predator.h"
 				>
@@ -597,11 +621,11 @@
 				>
 			</File>
 			<File
-				RelativePath="..\include\libdivecomputer\suunto_common.h"
+				RelativePath="..\src\suunto_common.h"
 				>
 			</File>
 			<File
-				RelativePath="..\include\libdivecomputer\suunto_common2.h"
+				RelativePath="..\src\suunto_common2.h"
 				>
 			</File>
 			<File