diff --git a/reactos/include/reactos/typedefs_host.h b/reactos/include/reactos/typedefs_host.h
index bf100830acd..be13306961b 100644
--- a/reactos/include/reactos/typedefs_host.h
+++ b/reactos/include/reactos/typedefs_host.h
@@ -21,13 +21,13 @@
 #error Unknown compiler
 #endif
 
-#ifndef __fastcall
+#if !defined(_MSC_VER) && !defined(__fastcall)
 #define __fastcall __attribute__((fastcall))
 #endif
-#ifndef __cdecl
+#if !defined(_MSC_VER) && !defined(__cdecl)
 #define __cdecl __attribute__((cdecl))
 #endif
-#ifndef __stdcall
+#if !defined(_MSC_VER) && !defined(__stdcall)
 #define __stdcall __attribute__((stdcall))
 #endif
 
diff --git a/reactos/tools/mkhive/mkhive.vcproj b/reactos/tools/mkhive/mkhive.vcproj
index 4d69557ba3a..b89794fe56f 100644
--- a/reactos/tools/mkhive/mkhive.vcproj
+++ b/reactos/tools/mkhive/mkhive.vcproj
@@ -62,7 +62,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="kernel32.lib ../../obj-i386/lib/cmlib/cmlib.a ../../obj-i386/lib/inflib_host/infcore.o ../../obj-i386/lib/inflib_host/infget.o ../../obj-i386/lib/inflib_host/infhostgen.o ../../obj-i386/lib/inflib_host/infhostget.o ../../obj-i386/lib/inflib_host/infhostglue.o ../../obj-i386/lib/inflib_host/infhostput.o ../../obj-i386/lib/inflib_host/infput.o ../../obj-i386/lib/rtl/rtl.a $(NOINHERIT)"
+				AdditionalDependencies="kernel32.lib ../../obj-i386/lib/cmlib_host/cminit.o ../../obj-i386/lib/cmlib_host/hivebin.o ../../obj-i386/lib/cmlib_host/hivecell.o ../../obj-i386/lib/cmlib_host/hiveinit.o ../../obj-i386/lib/cmlib_host/hivesum.o ../../obj-i386/lib/cmlib_host/hivewrt.o ../../obj-i386/lib/inflib_host/infcore.o ../../obj-i386/lib/inflib_host/infget.o ../../obj-i386/lib/inflib_host/infhostgen.o ../../obj-i386/lib/inflib_host/infhostget.o ../../obj-i386/lib/inflib_host/infhostput.o ../../obj-i386/lib/inflib_host/infput.o $(NOINHERIT)"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -118,7 +118,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories=""
+				AdditionalIncludeDirectories="../../include/ddk;../../include/psdk;../../include/reactos;../../lib/cmlib;../../lib/inflib;../../lib/rtl"
 				PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_WARNINGS"
 				RuntimeLibrary="2"
 				UsePrecompiledHeader="0"
@@ -137,7 +137,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="kernel32.lib $(NOINHERIT)"
+				AdditionalDependencies="kernel32.lib ../../obj-i386/lib/cmlib_host/cminit.o ../../obj-i386/lib/cmlib_host/hivebin.o ../../obj-i386/lib/cmlib_host/hivecell.o ../../obj-i386/lib/cmlib_host/hiveinit.o ../../obj-i386/lib/cmlib_host/hivesum.o ../../obj-i386/lib/cmlib_host/hivewrt.o ../../obj-i386/lib/inflib_host/infcore.o ../../obj-i386/lib/inflib_host/infget.o ../../obj-i386/lib/inflib_host/infhostgen.o ../../obj-i386/lib/inflib_host/infhostget.o ../../obj-i386/lib/inflib_host/infhostput.o ../../obj-i386/lib/inflib_host/infput.o $(NOINHERIT)"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"