diff --git a/firmware/common/dir.h b/firmware/common/dir.h
index 622af11f6d..a35e3fc9a8 100644
--- a/firmware/common/dir.h
+++ b/firmware/common/dir.h
@@ -31,13 +31,13 @@ typedef struct {
     int offset;
 } DIR;
 #else // SIMULATOR
-#ifdef _WIN32
+#ifdef WIN32
 typedef struct DIRtag
 {
     struct dirent   fd;
     intptr_t        handle;
 } DIR;
-#endif //   _WIN32
+#endif //   WIN32
 #endif // SIMULATOR
 
 extern DIR* opendir(char* name);
diff --git a/firmware/common/file.h b/firmware/common/file.h
index dde78bc17d..02f853250b 100644
--- a/firmware/common/file.h
+++ b/firmware/common/file.h
@@ -36,10 +36,10 @@ extern int lseek(int fd, int offset, int whence);
 extern int remove(char* pathname);
 extern int rename(char* oldname, char* newname);
 #else
-#ifdef _WIN32
+#ifdef WIN32
 #include <io.h>
 #include <stdio.h>
-#endif
-#endif
+#endif // WIN32
+#endif // SIMULATOR
 
 #endif