diff --git a/apps/rbcodecconfig.h b/apps/rbcodecconfig.h
index 0149bb529e..9777ded345 100644
--- a/apps/rbcodecconfig.h
+++ b/apps/rbcodecconfig.h
@@ -21,6 +21,9 @@
 /* HZ, TIME_AFTER, current_tick */
 #include "kernel.h"
 
+/* MAX_PATH */
+#include "fs_defines.h"
+
 /* Structure to record some info during processing call */
 struct dsp_loop_context
 {
diff --git a/firmware/include/dir.h b/firmware/include/dir.h
index 4599877ede..6336cee81d 100644
--- a/firmware/include/dir.h
+++ b/firmware/include/dir.h
@@ -26,6 +26,7 @@
 #include <time.h>
 #include "config.h"
 #include "fs_attr.h"
+#include "fs_defines.h"
 
 #if defined (APPLICATION) || defined(CHECKWPS)
 #include "filesystem-app.h"
diff --git a/firmware/include/file.h b/firmware/include/file.h
index 02d2077977..20b2224db6 100644
--- a/firmware/include/file.h
+++ b/firmware/include/file.h
@@ -29,11 +29,9 @@
 #include <stdio.h>
 #endif
 #include "config.h"
+#include "fs_defines.h"
 #include "gcc_extensions.h"
 
-#undef MAX_PATH /* this avoids problems when building simulator */
-#define MAX_PATH 260
-
 enum relate_result
 {
                           /* < 0 == failure */
diff --git a/firmware/include/fs_attr.h b/firmware/include/fs_attr.h
index 0e1d25e1de..299ebca82d 100644
--- a/firmware/include/fs_attr.h
+++ b/firmware/include/fs_attr.h
@@ -23,9 +23,6 @@
 
 #include <stdbool.h>
 
-#undef MAX_PATH /* this avoids problems when building simulator */
-#define MAX_PATH 260
-
 /* also used by fat.c so values must not change */
 #define ATTR_READ_ONLY   0x01
 #define ATTR_HIDDEN      0x02