3 files changed, 2 insertions, 12 deletions

diff --git a/apps/recorder/bmp.c b/apps/recorder/bmp.c
index b67615b840..4e8cdd70c5 100644
--- a/apps/recorder/bmp.c
+++ b/apps/recorder/bmp.c
@@ -42,6 +42,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "inttypes.h"
+#include "system.h"
 #ifndef PLUGIN
 #include "debug.h"
 #endif
@@ -58,10 +59,8 @@
 #endif
 #ifndef __PCTOOL__
 #include "config.h"
-#include "system.h"
 #include "resize.h"
 #else
-#include "checkwps.h"
 #undef DEBUGF
 #define DEBUGF(...)
 #endif
diff --git a/firmware/export/system.h b/firmware/export/system.h
index 196c20a33b..d1b5df546b 100644
--- a/firmware/export/system.h
+++ b/firmware/export/system.h
@@ -230,10 +230,9 @@ enum {
     MAXMEMGUARD
 };
 
-#ifndef SIMULATOR
+#if !defined(SIMULATOR) && !defined(__PCTOOL__) 
 #include "system-target.h"
 #else /* SIMULATOR */
-
 static inline uint16_t swap16(uint16_t value)
     /*
       result[15..8] = value[ 7..0];
diff --git a/tools/checkwps/checkwps.h b/tools/checkwps/checkwps.h
index dd7da32776..fd494ce694 100644
--- a/tools/checkwps/checkwps.h
+++ b/tools/checkwps/checkwps.h
@@ -27,12 +27,4 @@
 
 #define SYSFONT_HEIGHT 8
 
-#ifndef MIN
-#define MIN(a, b) (((a)<(b))?(a):(b))
-#endif
-
-#ifndef BIT_N
-#define BIT_N(n) (1U << (n))
-#endif
-
 #endif