3 files changed, 4 insertions, 2 deletions

diff --git a/firmware/export/button.h b/firmware/export/button.h
index f50f3dd9a4..95da7adc42 100644
--- a/firmware/export/button.h
+++ b/firmware/export/button.h
@@ -22,7 +22,9 @@
 #include <stdbool.h>
 #include <inttypes.h>
 #include "config.h"
+#ifndef __PCTOOL__
 #include "button-target.h"
+#endif
 
 extern struct event_queue button_queue;
 
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h
index b046c0736d..55d3f6fb38 100644
--- a/firmware/export/lcd-remote.h
+++ b/firmware/export/lcd-remote.h
@@ -23,12 +23,11 @@
 #include <stdbool.h>
 #include "cpu.h"
 #include "config.h"
-#include "adc.h"
 #include "lcd.h"
 
 #ifdef HAVE_REMOTE_LCD
 
-#if defined(TARGET_TREE)
+#if defined(TARGET_TREE) && !defined(__PCTOOL__)
 #include "lcd-remote-target.h"
 #endif
 
diff --git a/firmware/rolo.c b/firmware/rolo.c
index 30eba91316..bfc0c13ff7 100644
--- a/firmware/rolo.c
+++ b/firmware/rolo.c
@@ -28,6 +28,7 @@
 #include "audio.h"
 #include "system.h"
 #include "i2c.h"
+#include "adc.h"
 #include "string.h"
 #include "buffer.h"