diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index be38b4fea6..02f1c65f80 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -486,6 +486,7 @@ add_executable( zdoom WIN32
 	p_sight.cpp
 	p_slopes.cpp
 	p_spec.cpp
+	p_states.cpp
 	p_switch.cpp
 	p_teleport.cpp
 	p_terrain.cpp
@@ -624,6 +625,7 @@ add_executable( zdoom WIN32
 	thingdef/thingdef_codeptr.cpp
 	thingdef/thingdef_exp.cpp
 	thingdef/thingdef_main.cpp
+	thingdef/thingdef_parse.cpp
 	thingdef/thingdef_properties.cpp
 	thingdef/thingdef_states.cpp
 	timidity/common.cpp
diff --git a/src/m_png.h b/src/m_png.h
index aabcc978fe..7815369cad 100644
--- a/src/m_png.h
+++ b/src/m_png.h
@@ -35,6 +35,7 @@
 
 #include <stdio.h>
 #include "doomtype.h"
+#include "v_video.h"
 
 // PNG Writing --------------------------------------------------------------
 
diff --git a/src/r_main.h b/src/r_main.h
index 049f12131e..515f77175d 100644
--- a/src/r_main.h
+++ b/src/r_main.h
@@ -54,8 +54,8 @@ extern bool				LocalKeyboardTurner;	// [RH] The local player used the keyboard t
 extern float			WallTMapScale;
 extern float			WallTMapScale2;
 
-extern int				viewwidth;
-extern int				viewheight;
+extern "C" int				viewwidth;
+extern "C" int				viewheight;
 extern int				viewwindowx;
 extern int				viewwindowy;
 
diff --git a/src/s_sound.cpp b/src/s_sound.cpp
index 9cf9865971..96f5e807be 100644
--- a/src/s_sound.cpp
+++ b/src/s_sound.cpp
@@ -1478,6 +1478,7 @@ void S_RelinkSound (AActor *from, AActor *to)
 			}
 			else
 			{
+				chan->Actor = NULL;
 				S_StopChannel(chan);
 			}
 		}
diff --git a/src/sdl/i_main.cpp b/src/sdl/i_main.cpp
index 37771d7bef..5650c07819 100644
--- a/src/sdl/i_main.cpp
+++ b/src/sdl/i_main.cpp
@@ -185,7 +185,7 @@ static int DoomSpecificInfo (char *buffer, char *end)
 
 		if (!viewactive)
 		{
-			buffer += snprintf (buffer+p, size-p, "\n\nView not active.");
+			p += snprintf (buffer+p, size-p, "\n\nView not active.");
 		}
 		else
 		{
diff --git a/src/thingdef/thingdef.h b/src/thingdef/thingdef.h
index 87a49f2920..958f14196c 100644
--- a/src/thingdef/thingdef.h
+++ b/src/thingdef/thingdef.h
@@ -254,16 +254,16 @@ int MatchString (const char *in, const char **strings);
 
 #define DEFINE_PROPERTY_BASE(name, paramlist, clas, cat) \
 	static void Handler_##name##_##paramlist##_##clas(A##clas *defaults, Baggage &bag, FPropParam *params); \
-	static FPropertyInfo Prop_####name##_##paramlist##_##clas = \
+	static FPropertyInfo Prop_##name##_##paramlist##_##clas = \
 		{ #name, #paramlist, RUNTIME_CLASS(A##clas), (PropHandler)Handler_##name##_##paramlist##_##clas, cat }; \
-	MSVC_PSEG FPropertyInfo *infoptr_##name##_##paramlist##_##clas GCC_PSEG = &Prop_####name##_##paramlist##_##clas; \
+	MSVC_PSEG FPropertyInfo *infoptr_##name##_##paramlist##_##clas GCC_PSEG = &Prop_##name##_##paramlist##_##clas; \
 	static void Handler_##name##_##paramlist##_##clas(A##clas *defaults, Baggage &bag, FPropParam *params)
 
 #define DEFINE_PREFIXED_PROPERTY_BASE(prefix, name, paramlist, clas, cat) \
 	static void Handler_##name##_##paramlist##_##clas(A##clas *defaults, Baggage &bag, FPropParam *params); \
-	static FPropertyInfo Prop_####name##_##paramlist##_##clas = \
+	static FPropertyInfo Prop_##name##_##paramlist##_##clas = \
 { #prefix"."#name, #paramlist, RUNTIME_CLASS(A##clas), (PropHandler)Handler_##name##_##paramlist##_##clas, cat }; \
-	MSVC_PSEG FPropertyInfo *infoptr_##name##_##paramlist##_##clas GCC_PSEG = &Prop_####name##_##paramlist##_##clas; \
+	MSVC_PSEG FPropertyInfo *infoptr_##name##_##paramlist##_##clas GCC_PSEG = &Prop_##name##_##paramlist##_##clas; \
 	static void Handler_##name##_##paramlist##_##clas(A##clas *defaults, Baggage &bag, FPropParam *params)
 
 
diff --git a/src/thingdef/thingdef_parse.cpp b/src/thingdef/thingdef_parse.cpp
index cd6cada337..f06b8d80cb 100644
--- a/src/thingdef/thingdef_parse.cpp
+++ b/src/thingdef/thingdef_parse.cpp
@@ -49,6 +49,7 @@
 #include "v_palette.h"
 #include "doomerrors.h"
 #include "autosegs.h"
+#include "i_system.h"
 
 
 //==========================================================================