diff --git a/src/image-to-tiles.cpp b/src/image-to-tiles.cpp
index 85c4f34..9419486 100644
--- a/src/image-to-tiles.cpp
+++ b/src/image-to-tiles.cpp
@@ -20,11 +20,6 @@
 #include "tile.h"
 #include "main-window.h"
 
-// Avoid "warning C4458: declaration of 'i' hides class member"
-// due to Fl_Window's Fl_X *i
-#pragma warning(push)
-#pragma warning(disable : 4458)
-
 typedef std::set<Fl_Color> Color_Set;
 
 static bool build_tilemap(const Tile *tiles, size_t n, const std::vector<int> tile_palettes, Tilemap &tilemap, std::vector<size_t> &tileset,
@@ -454,5 +449,3 @@ Image_to_Tiles_Result Main_Window::image_to_tiles() {
 	output.success = true;
 	return output;
 }
-
-#pragma warning(pop)
diff --git a/src/main-window.cpp b/src/main-window.cpp
index 4ac58d1..01f2d2b 100644
--- a/src/main-window.cpp
+++ b/src/main-window.cpp
@@ -37,11 +37,6 @@
 #include "app-icon.xpm"
 #endif
 
-// Avoid "warning C4458: declaration of 'i' hides class member"
-// due to Fl_Window's Fl_X *i
-#pragma warning(push)
-#pragma warning(disable : 4458)
-
 Main_Window::Main_Window(int x, int y, int w, int h, const char *) : Fl_Overlay_Window(x, y, w, h, PROGRAM_NAME),
 	_tile_buttons(), _tilemap_file(), _attrmap_file(), _tilemap_basename(), _tileset_files(), _recent_tilemaps(),
 	_recent_tilesets(), _tilemap(), _tilesets(), _wx(x), _wy(y), _ww(w), _wh(h) {
@@ -2955,5 +2950,3 @@ void Main_Window::change_tile_cb(Tile_Tessera *tt, Main_Window *mw) {
 		tt->redraw();
 	}
 }
-
-#pragma warning(pop)
diff --git a/src/palette-format.cpp b/src/palette-format.cpp
index 67bcd29..fe2d35f 100644
--- a/src/palette-format.cpp
+++ b/src/palette-format.cpp
@@ -9,11 +9,6 @@
 #include "image.h"
 #include "option-dialogs.h"
 
-// Avoid "warning C4458: declaration of 'i' hides class member"
-// due to Fl_Window's Fl_X *i
-#pragma warning(push)
-#pragma warning(disable : 4458)
-
 static const char *palette_names[NUM_PALETTE_FORMATS] = {
 	"Indexed in tileset image",
 	"Pixel image (PNG)",
@@ -389,5 +384,3 @@ bool write_tilepal(const char *f, const std::vector<size_t> &tileset, const std:
 	fclose(file);
 	return true;
 }
-
-#pragma warning(pop)