diff --git a/aegisub/build/Aegisub/Aegisub.targets b/aegisub/build/Aegisub/Aegisub.targets
index c433c6303..a299342ad 100644
--- a/aegisub/build/Aegisub/Aegisub.targets
+++ b/aegisub/build/Aegisub/Aegisub.targets
@@ -73,7 +73,7 @@
     <SubWCRev Include="$(AegisubSourceBase)build\svn-revision-base.h" />
   </ItemGroup>
 
-  
+
   <!-- Create build configuration file if it does not exist-target -->
   <Target
     Name="CreateDefaultConfigurationHeader"
@@ -101,8 +101,8 @@
       Text="Created %(CreateDefaultConfigurationHeader.TargetFile)"
       />
   </Target>
-  
-  
+
+
   <!-- Default configuration -->
   <Import Project="$(MSBuildThisFileDirectory)Aegisub.DefaultConfiguration.props" />
 
@@ -116,7 +116,7 @@
       <PreprocessorDefinitions>BUILD_CREDIT="$(AegisubBuildCredit)";%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
-  
+
   <!-- Skip config_windows.h support -->
   <ItemDefinitionGroup Condition="'$(AegisubUseConfigWindowsH)'=='false'">
     <ClCompile>
@@ -130,39 +130,30 @@
       <TargetFile>$(AegisubSourceBase)src\config\config_windows.h</TargetFile>
     </CreateDefaultConfigurationHeader>
   </ItemGroup>
-  
+
   <!-- Automation Lua support -->
   <ItemDefinitionGroup Condition="'$(AegisubUseAutomationLua)'=='true'">
     <ClCompile>
       <PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_AUTO4_LUA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(AegisubContribBase)lua51\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
-    <Link>
-      <AdditionalDependencies>lua51.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
   </ItemDefinitionGroup>
-  
+
   <!-- Hunspell support -->
   <ItemDefinitionGroup Condition="'$(AegisubUseHunspell)'=='true'">
     <ClCompile>
       <PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_HUNSPELL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <AdditionalIncludeDirectories>$(AegisubContribBase)hunspell\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
-    <Link>
-      <AdditionalDependencies>hunspell.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
   </ItemDefinitionGroup>
-  
+
   <!-- CSRI helper library support -->
   <ItemDefinitionGroup Condition="'$(AegisubUseCsri)'=='HelperLibrary'">
     <ClCompile>
       <PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_CSRI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <Link>
-      <AdditionalDependencies>csrihelper.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
   </ItemDefinitionGroup>
-  
+
   <!-- CSRI external library support -->
   <ItemDefinitionGroup Condition="'$(AegisubUseCsri)'=='External'">
     <ClCompile>
@@ -173,7 +164,7 @@
       <AdditionalDependencies>$(CsriLibraryName);%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  
+
   <!-- libass support -->
   <ItemDefinitionGroup Condition="'$(AegisubUseLibass)'=='true'">
     <ClCompile>
@@ -197,7 +188,7 @@
 			<AdditionalDependencies>$(Ft2LibraryName);%(AdditionalDependencies)</AdditionalDependencies>
 		</Link>
 	</ItemDefinitionGroup>
-  
+
   <!-- FFmpegSource support -->
   <ItemDefinitionGroup Condition="'$(AegisubUseFfms)'=='true'">
     <ClCompile>
@@ -209,14 +200,14 @@
       <AdditionalDependencies>$(FFmpegSourceLibraryName);%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  
+
   <!-- Avisynth support -->
   <ItemDefinitionGroup Condition="'$(AegisubUseAvisynth)'=='true'">
     <ClCompile>
       <PreprocessorDefinitions Condition="'$(AegisubUseConfigWindowsH)'=='false'">WITH_AVISYNTH;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
-  
+
   <!-- FFTW support -->
 	<ItemDefinitionGroup Condition="'$(AegisubUseFftw)'=='true'">
     <ClCompile>
@@ -253,7 +244,7 @@
 	<ItemGroup Condition="'$(AegisubUseDSound)'=='true'">
 		<AegisubCheckDirectXSDK Include="dsound" />
 	</ItemGroup>
-  
+
   <!-- Special builds -->
   <ItemDefinitionGroup Condition="'$(AegisubUseConfigWindowsH)'=='false'">
     <ClCompile>
@@ -261,7 +252,7 @@
       <PreprocessorDefinitions Condition="'$(AegisubSpecialBuild)'=='StartupLog'">WITH_STARTUPLOG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
-  
+
   <!-- General configuration, always required libraries -->
   <ItemDefinitionGroup>
     <ClCompile>
@@ -274,18 +265,7 @@
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
     </ClCompile>
-    <Link>
-      <AdditionalLibraryDirectories>$(AegisubLibraryDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>
-        libiconv.lib;
-        libresrc.lib;
-        libaegisub.lib;
-        universalchardet.lib;
-        %(AdditionalDependencies)
-      </AdditionalDependencies>
-    </Link>
   </ItemDefinitionGroup>
-  
 
   <!-- Add property pages -->
   <ItemGroup>
diff --git a/aegisub/build/Aegisub/Aegisub.vcxproj b/aegisub/build/Aegisub/Aegisub.vcxproj
index 2250f86e1..8634e0544 100644
--- a/aegisub/build/Aegisub/Aegisub.vcxproj
+++ b/aegisub/build/Aegisub/Aegisub.vcxproj
@@ -423,4 +423,27 @@
   <ItemGroup>
     <ResourceCompile Include="$(SrcDir)res.rc" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\csrihelper\csrihelper.vcxproj">
+      <Project>{c832eaf3-860d-4373-a02c-933626b47a5e}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\hunspell\hunspell.vcxproj">
+      <Project>{cc791693-6b28-40ac-879d-64a6c16468e3}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\libaegisub\libaegisub.vcxproj">
+      <Project>{bb3fed86-db7a-4dc7-964a-260fb86cde61}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\libiconv\libiconv.vcxproj">
+      <Project>{965054d2-44f2-4eb2-9879-051cc3d7ef08}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\libresrc\libresrc.vcxproj">
+      <Project>{bd00d65f-24da-4784-8860-3b972ea125fc}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\lua51\lua51.vcxproj">
+      <Project>{5391a8b1-9c70-4dc4-92ad-d3e34c6b803f}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\universalchardet\universalchardet.vcxproj">
+      <Project>{7b56955d-5162-4698-aa5b-47484edc8783}</Project>
+    </ProjectReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file