diff --git a/includes/element.h b/includes/element.h
index ec32df266..be0388df7 100644
--- a/includes/element.h
+++ b/includes/element.h
@@ -4,5 +4,6 @@
 
 #include "powder.h"
 #include "misc.h"
+#include "math.h"
 
 #endif
diff --git a/includes/powder.h b/includes/powder.h
index 9991317aa..251605b32 100644
--- a/includes/powder.h
+++ b/includes/powder.h
@@ -837,9 +837,9 @@ extern inline int is_wire_off(int x, int y);
 void set_emap(int x, int y);
 
 #if defined(WIN32) && !defined(__GNUC__)
-_inline int parts_avg(int ci, int ni, int t);
+extern _inline int parts_avg(int ci, int ni, int t);
 #else
-int parts_avg(int ci, int ni, int t);
+extern int parts_avg(int ci, int ni, int t);
 #endif
 
 int nearest_part(int ci, int t);
diff --git a/src/elements/misc.c b/src/elements/elementmisc.c
similarity index 100%
rename from src/elements/misc.c
rename to src/elements/elementmisc.c
diff --git a/src/elements/firw.c b/src/elements/firw.c
index ae1f56de1..c41400e9c 100644
--- a/src/elements/firw.c
+++ b/src/elements/firw.c
@@ -35,12 +35,13 @@ int update_FIRW(UPDATE_FUNC_ARGS) {
 	}
 	else if (parts[i].tmp==2) {
 		int col = rand()%200+4;
+		int tmul;
 		for (rx=-2; rx<3; rx++)
 			for (ry=-2; ry<3; ry++)
 				if (x+rx>=0 && y+ry>0 && x+rx<XRES && y+ry<YRES && (rx || ry))
 				{
 					r = pmap[y+ry][x+rx];
-					int tmul = rand()%7;
+					tmul = rand()%7;
 					create_part(-1, x+rx, y+ry, PT_FIRW);
 					r = pmap[y+ry][x+rx];
 					if ((r>>8)>=NPART || !r)