diff --git a/src/p_effect.h b/src/p_effect.h
index 5e41929c6..f8f661ce9 100644
--- a/src/p_effect.h
+++ b/src/p_effect.h
@@ -49,6 +49,8 @@
 #define FX_BLACKFOUNTAIN	0x00060000
 #define FX_WHITEFOUNTAIN	0x00070000
 
+struct subsector_t;
+
 // [RH] Particle details
 struct particle_t
 {
diff --git a/src/r_main.h b/src/r_main.h
index 4230b3311..223b1e4b0 100644
--- a/src/r_main.h
+++ b/src/r_main.h
@@ -38,9 +38,6 @@ extern DCanvas			*RenderTarget;
 extern bool				bRenderingToCanvas;
 extern fixed_t			viewcos;
 extern fixed_t			viewsin;
-extern fixed_t			viewtancos;
-extern fixed_t			viewtansin;
-extern fixed_t			FocalTangent;
 extern fixed_t			viewingrangerecip;
 extern fixed_t			FocalLengthX, FocalLengthY;
 extern float			FocalLengthXfloat;
diff --git a/src/r_utility.h b/src/r_utility.h
index e885a9ef9..9aec22e99 100644
--- a/src/r_utility.h
+++ b/src/r_utility.h
@@ -12,6 +12,10 @@
 extern fixed_t			viewx;
 extern fixed_t			viewy;
 
+extern fixed_t			viewtancos;
+extern fixed_t			viewtansin;
+extern fixed_t			FocalTangent;
+
 extern bool				r_NoInterpolate;
 extern int				validcount;
 
diff --git a/zdoom.vcproj b/zdoom.vcproj
index 832fdf305..b31f108f3 100644
--- a/zdoom.vcproj
+++ b/zdoom.vcproj
@@ -1341,10 +1341,6 @@
 				RelativePath=".\src\m_joy.h"
 				>
 			</File>
-			<File
-				RelativePath=".\src\m_menu.h"
-				>
-			</File>
 			<File
 				RelativePath=".\src\m_misc.h"
 				>