diff --git a/source/build/include/build.h b/source/build/include/build.h
index 92a11cbac..25bfcc81c 100644
--- a/source/build/include/build.h
+++ b/source/build/include/build.h
@@ -231,6 +231,9 @@ void yax_drawrooms(void (*SpriteAnimFunc)(int32_t,int32_t,int32_t,int32_t),
 #define CLIPMASK0 (((1L)<<16)+1L)
 #define CLIPMASK1 (((256L)<<16)+64L)
 
+#define NEXTWALL(i) (wall[wall[i].nextwall])
+#define POINT2(i) (wall[wall[i].point2])
+
 // max x/y val (= max editorgridextent in Mapster32)
 #define BXY_MAX 524288
 
diff --git a/source/build/include/editor.h b/source/build/include/editor.h
index 40530aeff..ff3df159d 100644
--- a/source/build/include/editor.h
+++ b/source/build/include/editor.h
@@ -401,8 +401,6 @@ static inline int32_t m32_is2d3dmode(void)
 
 extern int32_t editorGet2dSpriteColor(int32_t spr);
 
-#define NEXTWALL(i) (wall[wall[i].nextwall])
-#define POINT2(i) (wall[wall[i].point2])
 #define SPRITESEC(j) (sector[sprite[j].sectnum])
 
 #define SCRIPTHISTSIZ 32  // should be the same as OSD_HISTORYDEPTH for maximum win, should be a power of two
diff --git a/source/build/src/polymost.cpp b/source/build/src/polymost.cpp
index 6faafbe3b..9b8f26242 100644
--- a/source/build/src/polymost.cpp
+++ b/source/build/src/polymost.cpp
@@ -3587,7 +3587,6 @@ static int32_t should_clip_cfwall(float x0, float y0, float x1, float y1)
 
 #endif
 
-#define POINT2(i) (wall[wall[i].point2])
 
 void polymost_editorfunc(void)
 {