diff --git a/src/gamecode.vcxproj b/src/gamecode.vcxproj
index 0872d49ec..17572c776 100644
--- a/src/gamecode.vcxproj
+++ b/src/gamecode.vcxproj
@@ -99,10 +99,7 @@
     <ClCompile Include="gamecode\laws.c" />
     <ClCompile Include="gamecode\laws_test.c" />
     <ClCompile Include="gamecode\market.c" />
-    <ClCompile Include="gamecode\market_test.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
+    <ClCompile Include="gamecode\market_test.c" />
     <ClCompile Include="gamecode\monster.c" />
     <ClCompile Include="gamecode\randenc.c" />
     <ClCompile Include="gamecode\report.c" />
diff --git a/src/gamecode/market.c b/src/gamecode/market.c
index 569a29b37..d49e528b6 100644
--- a/src/gamecode/market.c
+++ b/src/gamecode/market.c
@@ -177,7 +177,3 @@ void do_markets(void)
     ql_free(traders);
   }
 }
-
-#ifndef DISABLE_TESTS
-#include "market_test.c"
-#endif
diff --git a/src/gamecode/market_test.c b/src/gamecode/market_test.c
index b697ccc53..d60c71982 100644
--- a/src/gamecode/market_test.c
+++ b/src/gamecode/market_test.c
@@ -1,7 +1,21 @@
 #include <cutest/CuTest.h>
 
-#include <util/language.h>
+#include "platform.h"
+#include "market.h"
+#include "tests.h"
+
+#include <kernel/building.h>
+#include <kernel/config.h>
+#include <kernel/faction.h>
+#include <kernel/item.h>
+#include <kernel/race.h>
+#include <kernel/region.h>
 #include <kernel/terrain.h>
+#include <kernel/unit.h>
+
+#include <util/language.h>
+
+#include <stdlib.h>
 
 static void market_curse(CuTest * tc)
 {
diff --git a/src/tests.c b/src/tests.c
index 7224b4dbf..fa5b6e315 100644
--- a/src/tests.c
+++ b/src/tests.c
@@ -10,8 +10,7 @@
 #include <kernel/curse_test.c>
 #include <kernel/battle_test.c>
 #include <gamecode/laws_test.c>
-
-CuSuite *get_market_suite(void);
+#include <gamecode/market_test.c>
 
 #include <kernel/region.h>
 #include <kernel/terrain.h>
diff --git a/src/tests.h b/src/tests.h
index 01cef3516..2a3c4f625 100644
--- a/src/tests.h
+++ b/src/tests.h
@@ -3,6 +3,8 @@ extern "C" {
 #endif
 
 #ifndef DISABLE_TESTS
+  struct building_type;
+  struct building;
   void test_cleanup(void);
 
   struct terrain_type * test_create_terrain(const char * name, unsigned int flags);