diff --git a/OpenAuraSDK/OpenAuraSDK.cpp b/OpenAuraSDK/OpenAuraSDK.cpp
index a927ff0b..096c7478 100644
--- a/OpenAuraSDK/OpenAuraSDK.cpp
+++ b/OpenAuraSDK/OpenAuraSDK.cpp
@@ -65,7 +65,7 @@ void DetectI2CBusses()
         // Analysis of many AMD boards has shown that AMD SMBus controllers have two adapters with fixed I/O spaces at 0x0B00 and 0x0B20
         // AMD SMBus adapters use the PIIX4 driver
         if (i["Manufacturer"].find("Advanced Micro Devices, Inc") != std::string::npos)
-        {#include <dirent.h>
+        {
             bus = new i2c_smbus_piix4();
             ((i2c_smbus_piix4 *)bus)->piix4_smba = 0x0B00;
             busses.push_back(bus);
@@ -355,8 +355,8 @@ int main()
 
             AuraController * temp_controller = CreateAuraDevice(busses[bus], 0x77);
 
-            controllers[0]->AuraRegisterWrite(AURA_REG_SLOT_INDEX,  slot);
-            controllers[0]->AuraRegisterWrite(AURA_REG_I2C_ADDRESS, 0xE0 + ( slot << 1 ) );
+            temp_controller->AuraRegisterWrite(AURA_REG_SLOT_INDEX,  slot);
+            temp_controller->AuraRegisterWrite(AURA_REG_I2C_ADDRESS, 0xE0 + ( slot << 1 ) );
 
             delete temp_controller;
         }
diff --git a/OpenAuraSDK/OpenAuraSDK.vcxproj b/OpenAuraSDK/OpenAuraSDK.vcxproj
index 1a176d5d..4b19a86c 100644
--- a/OpenAuraSDK/OpenAuraSDK.vcxproj
+++ b/OpenAuraSDK/OpenAuraSDK.vcxproj
@@ -92,7 +92,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;OPENAURASDK_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <AdditionalIncludeDirectories>..\dependencies\inpout32_1501\Win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -111,7 +111,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;OPENAURASDK_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
@@ -131,7 +131,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;OPENAURASDK_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <AdditionalIncludeDirectories>..\dependencies\inpout32_1501\Win32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -154,7 +154,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;OPENAURASDK_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
diff --git a/OpenAuraSDK/i2c_smbus_i801.cpp b/OpenAuraSDK/i2c_smbus_i801.cpp
index 5e5e1f0a..d3c47a0e 100644
--- a/OpenAuraSDK/i2c_smbus_i801.cpp
+++ b/OpenAuraSDK/i2c_smbus_i801.cpp
@@ -9,6 +9,10 @@
 \*-----------------------------------------*/
 
 #include "i2c_smbus_i801.h"
+#include <Windows.h>
+#include "inpout32.h"
+
+#pragma comment(lib, "inpout32.lib")
 
 /* Return negative errno on error. */
 s32 i2c_smbus_i801::i801_access(u16 addr, char read_write, u8 command, int size, i2c_smbus_data *data)
diff --git a/OpenAuraSDK/i2c_smbus_piix4.cpp b/OpenAuraSDK/i2c_smbus_piix4.cpp
index b762a5a8..7a6edd62 100644
--- a/OpenAuraSDK/i2c_smbus_piix4.cpp
+++ b/OpenAuraSDK/i2c_smbus_piix4.cpp
@@ -9,6 +9,10 @@
 \*-----------------------------------------*/
 
 #include "i2c_smbus_piix4.h"
+#include <Windows.h>
+#include "inpout32.h"
+
+#pragma comment(lib, "inpout32.lib")
 
 //Logic adapted from piix4_transaction() in i2c-piix4.c
 int i2c_smbus_piix4::piix4_transaction()