diff --git a/src/r_portal.h b/src/r_portal.h
index 9426aaf6a..fad62a298 100644
--- a/src/r_portal.h
+++ b/src/r_portal.h
@@ -41,6 +41,10 @@ extern portal_t* portal_base;
 extern portal_t* portal_cap;
 extern UINT8 portalrender;
 
+extern sector_t *portalcullsector;
+extern line_t *portalclipline;
+extern INT32 portalclipstart, portalclipend;
+
 void Portal_InitList	(void);
 void Portal_Remove		(portal_t* portal);
 void Portal_Add2Lines	(const INT32 line1, const INT32 line2, const INT32 x1, const INT32 x2);
diff --git a/src/r_segs.c b/src/r_segs.c
index 03c5fb6e5..36ed029ee 100644
--- a/src/r_segs.c
+++ b/src/r_segs.c
@@ -15,6 +15,7 @@
 #include "r_local.h"
 #include "r_sky.h"
 
+#include "r_portal.h"
 #include "r_splats.h"
 
 #include "w_wad.h"
diff --git a/src/r_state.h b/src/r_state.h
index 4959b55bc..da9425bdf 100644
--- a/src/r_state.h
+++ b/src/r_state.h
@@ -82,10 +82,6 @@ extern fixed_t viewx, viewy, viewz;
 extern angle_t viewangle, aimingangle;
 extern sector_t *viewsector;
 extern player_t *viewplayer;
-extern UINT8 portalrender;
-extern sector_t *portalcullsector;
-extern line_t *portalclipline;
-extern INT32 portalclipstart, portalclipend;
 
 extern consvar_t cv_allowmlook;
 extern consvar_t cv_maxportals;
diff --git a/src/r_things.c b/src/r_things.c
index f52ce7ca8..f3113b043 100644
--- a/src/r_things.c
+++ b/src/r_things.c
@@ -24,6 +24,7 @@
 #include "i_video.h" // rendermode
 #include "r_things.h"
 #include "r_plane.h"
+#include "r_portal.h"
 #include "p_tick.h"
 #include "p_local.h"
 #include "p_slopes.h"