diff --git a/graph.cpp b/graph.cpp
index 50e3a318..e01ddcc9 100644
--- a/graph.cpp
+++ b/graph.cpp
@@ -1240,7 +1240,7 @@ void drawPlayer(eMonster m, cell *where, const transmatrix& V, color_t col, doub
     }
   }
 
-int wingphase(int period, int phase = 0) {
+int wingphase(int period, int phase) {
   ld t = fractick(period, phase);
   const int WINGS2 = WINGS * 2;
   int ti = int(t * WINGS2) % WINGS2;
diff --git a/hyper.h b/hyper.h
index 9ae360e3..4216b1c5 100644
--- a/hyper.h
+++ b/hyper.h
@@ -5573,4 +5573,23 @@ static const color_t NOCOLOR = 0;
 extern int global_projection;
 void spinEdge(ld aspd);
 
+inline hyperpoint cpush0(int c, ld x) { 
+  hyperpoint h = Hypc;
+  h[GDIM] = cos_auto(x);
+  h[c] = sin_auto(x);
+  return h;
+  }
+
+inline hyperpoint xspinpush0(ld alpha, ld x) { 
+  hyperpoint h = Hypc;
+  h[GDIM] = cos_auto(x);
+  h[0] = sin_auto(x) * cos(alpha);
+  h[1] = sin_auto(x) * -sin(alpha);
+  return h;
+  }
+
+extern renderbuffer *floor_textures;
+
+int wingphase(int period, int phase = 0); 
+
 }
\ No newline at end of file
diff --git a/hyperpoint.cpp b/hyperpoint.cpp
index 55821975..d94127ec 100644
--- a/hyperpoint.cpp
+++ b/hyperpoint.cpp
@@ -319,21 +319,6 @@ transmatrix cpush(int cid, ld alpha) {
 // push alpha units to the right
 transmatrix xpush(ld alpha) { return cpush(0, alpha); }
 
-inline hyperpoint cpush0(int c, ld x) { 
-  hyperpoint h = Hypc;
-  h[GDIM] = cos_auto(x);
-  h[c] = sin_auto(x);
-  return h;
-  }
-
-inline hyperpoint xspinpush0(ld alpha, ld x) { 
-  hyperpoint h = Hypc;
-  h[GDIM] = cos_auto(x);
-  h[0] = sin_auto(x) * cos(alpha);
-  h[1] = sin_auto(x) * -sin(alpha);
-  return h;
-  }
-
 bool eqmatrix(transmatrix A, transmatrix B, ld eps) {
   for(int i=0; i<MDIM; i++)
   for(int j=0; j<MDIM; j++)
diff --git a/rogueviz.cpp b/rogueviz.cpp
index cbe58f8f..a189f5a8 100644
--- a/rogueviz.cpp
+++ b/rogueviz.cpp
@@ -27,10 +27,6 @@
 
 #include "rogueviz.h"
 
-#if MAXMDIM >= 4
-namespace hr { extern renderbuffer *floor_textures; }
-#endif
-
 namespace rogueviz {
 
 ld fat_edges = 0;