diff --git a/include/vis/vis.hh b/include/vis/vis.hh
index 54fc9689..ac037cb5 100644
--- a/include/vis/vis.hh
+++ b/include/vis/vis.hh
@@ -39,32 +39,32 @@ enum pstatus_t
     pstat_done
 };
 
-struct winding_t : polylib::winding_base_t<polylib::winding_storage_hybrid_t<MAX_WINDING_FIXED>>
+struct viswinding_t : polylib::winding_base_t<polylib::winding_storage_hybrid_t<MAX_WINDING_FIXED>>
 {
     qvec3d origin; // Bounding sphere for fast clipping tests
     vec_t radius; // Not updated, so won't shrink when clipping
 
-    inline winding_t() : polylib::winding_base_t<polylib::winding_storage_hybrid_t<MAX_WINDING_FIXED>>() { }
+    inline viswinding_t() : polylib::winding_base_t<polylib::winding_storage_hybrid_t<MAX_WINDING_FIXED>>() { }
 
     // construct winding from range.
     // iterators must have operator+ and operator-.
     template<typename Iter, std::enable_if_t<is_iterator_v<Iter>, int> = 0>
-    inline winding_t(Iter begin, Iter end) : polylib::winding_base_t<polylib::winding_storage_hybrid_t<MAX_WINDING_FIXED>>(begin, end)
+    inline viswinding_t(Iter begin, Iter end) : polylib::winding_base_t<polylib::winding_storage_hybrid_t<MAX_WINDING_FIXED>>(begin, end)
     {
         set_winding_sphere();
     }
 
     // initializer list constructor
-    inline winding_t(std::initializer_list<qvec3d> l) : polylib::winding_base_t<polylib::winding_storage_hybrid_t<MAX_WINDING_FIXED>>(l)
+    inline viswinding_t(std::initializer_list<qvec3d> l) : polylib::winding_base_t<polylib::winding_storage_hybrid_t<MAX_WINDING_FIXED>>(l)
     {
         set_winding_sphere();
     }
 
     // copy constructor
-    inline winding_t(const winding_t &copy) = delete;
+    inline viswinding_t(const viswinding_t &copy) = delete;
 
     // move constructor
-    inline winding_t(winding_t &&move) noexcept : winding_base_t(std::move(move)), origin(move.origin), radius(move.radius) { }
+    inline viswinding_t(viswinding_t &&move) noexcept : winding_base_t(std::move(move)), origin(move.origin), radius(move.radius) { }
 
     // sets origin & radius
     inline void set_winding_sphere()
@@ -84,10 +84,10 @@ struct winding_t : polylib::winding_base_t<polylib::winding_storage_hybrid_t<MAX
     }
 
     // assignment copy
-    inline winding_t &operator=(const winding_t &copy)  = delete;
+    inline viswinding_t &operator=(const viswinding_t &copy)  = delete;
 
     // assignment move
-    inline winding_t &operator=(winding_t &&move) noexcept
+    inline viswinding_t &operator=(viswinding_t &&move) noexcept
     {
         origin = move.origin;
         radius = move.radius;
@@ -109,14 +109,14 @@ struct portal_t
 {
     qplane3d plane; // normal pointing into neighbor
     int leaf; // neighbor
-    winding_t winding;
+    viswinding_t winding;
     pstatus_t status;
     leafbits_t visbits, mightsee;
     int nummightsee;
     int numcansee;
 };
 
-inline float winding_t::distFromPortal(portal_t &p)
+inline float viswinding_t::distFromPortal(portal_t &p)
 {
     vec_t mindist = 1e20;
 
@@ -158,8 +158,8 @@ struct pstack_t
     pstack_t *next;
     leaf_t *leaf;
     portal_t *portal; // portal exiting
-    winding_t *source, *pass;
-    winding_t windings[STACK_WINDINGS]; // Fixed size windings
+    viswinding_t *source, *pass;
+    viswinding_t windings[STACK_WINDINGS]; // Fixed size windings
     bool windings_used[STACK_WINDINGS];
     qplane3d portalplane;
     leafbits_t *mightsee; // bit string
@@ -167,9 +167,9 @@ struct pstack_t
     int numseparators[2];
 };
 
-winding_t *AllocStackWinding(pstack_t &stack);
-void FreeStackWinding(winding_t *&w, pstack_t &stack);
-winding_t *ClipStackWinding(winding_t *in, pstack_t &stack, const qplane3d &split);
+viswinding_t *AllocStackWinding(pstack_t &stack);
+void FreeStackWinding(viswinding_t *&w, pstack_t &stack);
+viswinding_t *ClipStackWinding(viswinding_t *in, pstack_t &stack, const qplane3d &split);
 
 struct threaddata_t
 {
diff --git a/vis/flow.cc b/vis/flow.cc
index 705ebcc2..bbed5b02 100644
--- a/vis/flow.cc
+++ b/vis/flow.cc
@@ -30,7 +30,7 @@ static int c_leafskip;
   pointer, was measurably faster
   ==============
 */
-static void ClipToSeparators(const winding_t *source, const qplane3d src_pl, const winding_t *pass, winding_t *&target,
+static void ClipToSeparators(const viswinding_t *source, const qplane3d src_pl, const viswinding_t *pass, viswinding_t *&target,
     unsigned int test, pstack_t &stack)
 {
     int i, j, k, l;
@@ -389,7 +389,7 @@ static void BasePortalThread(size_t portalnum)
     leafbits_t portalsee(numportals * 2);
 
     portal_t &p = portals[portalnum];
-    winding_t &w = p.winding;
+    viswinding_t &w = p.winding;
 
     p.mightsee.resize(portalleafs);
 
@@ -399,7 +399,7 @@ static void BasePortalThread(size_t portalnum)
         }
 
         portal_t &tp = portals[i];
-        winding_t &tw = tp.winding;
+        viswinding_t &tw = tp.winding;
 
         // Quick test - completely at the back?
         d = p.plane.distance_to(tw.origin);
diff --git a/vis/vis.cc b/vis/vis.cc
index 910e401f..6243f5ce 100644
--- a/vis/vis.cc
+++ b/vis/vis.cc
@@ -88,7 +88,7 @@ fs::path portalfile, statefile, statetmpfile;
   Return a pointer to a free fixed winding on the stack
   ==================
 */
-winding_t *AllocStackWinding(pstack_t &stack)
+viswinding_t *AllocStackWinding(pstack_t &stack)
 {
     for (size_t i = 0; i < STACK_WINDINGS; i++) {
         if (!stack.windings_used[i]) {
@@ -110,7 +110,7 @@ winding_t *AllocStackWinding(pstack_t &stack)
   structure further up the call chain).
   ==================
 */
-void FreeStackWinding(winding_t *&w, pstack_t &stack)
+void FreeStackWinding(viswinding_t *&w, pstack_t &stack)
 {
     if (w >= stack.windings && w <= &stack.windings[STACK_WINDINGS]) {
         stack.windings_used[w - stack.windings] = false;
@@ -128,7 +128,7 @@ void FreeStackWinding(winding_t *&w, pstack_t &stack)
   is returned.
   ==================
 */
-winding_t *ClipStackWinding(winding_t *in, pstack_t &stack, const qplane3d &split)
+viswinding_t *ClipStackWinding(viswinding_t *in, pstack_t &stack, const qplane3d &split)
 {
     vec_t *dists = (vec_t *)alloca(sizeof(vec_t) * (in->size() + 1));
     int *sides = (int *)alloca(sizeof(int) * (in->size() + 1));
@@ -653,7 +653,7 @@ static void LoadPortals(const fs::path &name, mbsp_t *bsp)
 
         {
             auto &p = *dest_portal_it;
-            p.winding = winding_t{sourceportal.winding.begin(), sourceportal.winding.end()};
+            p.winding = viswinding_t{sourceportal.winding.begin(), sourceportal.winding.end()};
 
             // calc plane
             plane = p.winding.plane();
@@ -681,7 +681,7 @@ static void LoadPortals(const fs::path &name, mbsp_t *bsp)
 
             // Create a reverse winding
             const auto flipped = sourceportal.winding.flip();
-            p.winding = winding_t{flipped.begin(), flipped.end()};
+            p.winding = viswinding_t{flipped.begin(), flipped.end()};
             p.plane = plane;
             p.leaf = sourceportal.leafnums[0];
             dest_portal_it++;