diff --git a/lib/nfc/protocols/type_4_tag/type_4_tag.c b/lib/nfc/protocols/type_4_tag/type_4_tag.c
index 47e8e7352..3bcb0ee41 100644
--- a/lib/nfc/protocols/type_4_tag/type_4_tag.c
+++ b/lib/nfc/protocols/type_4_tag/type_4_tag.c
@@ -1,7 +1,5 @@
 #include "type_4_tag_i.h"
 
-#include <furi.h>
-
 #define TYPE_4_TAG_PROTOCOL_NAME "Type 4 Tag"
 
 const NfcDeviceBase nfc_device_type_4_tag = {
diff --git a/lib/nfc/protocols/type_4_tag/type_4_tag.h b/lib/nfc/protocols/type_4_tag/type_4_tag.h
index edbe320a4..bfa9f9478 100644
--- a/lib/nfc/protocols/type_4_tag/type_4_tag.h
+++ b/lib/nfc/protocols/type_4_tag/type_4_tag.h
@@ -2,8 +2,6 @@
 
 #include <lib/nfc/protocols/iso14443_4a/iso14443_4a.h>
 
-#include <lib/toolbox/simple_array.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/lib/nfc/protocols/type_4_tag/type_4_tag_poller.c b/lib/nfc/protocols/type_4_tag/type_4_tag_poller.c
index 79f20152c..3ff58ea2e 100644
--- a/lib/nfc/protocols/type_4_tag/type_4_tag_poller.c
+++ b/lib/nfc/protocols/type_4_tag/type_4_tag_poller.c
@@ -1,10 +1,7 @@
 #include "type_4_tag_poller_i.h"
+#include "type_4_tag_poller_defs.h"
 #include "type_4_tag_i.h"
 
-#include <nfc/protocols/nfc_poller_base.h>
-
-#include <furi.h>
-
 #define TAG "Type4TagPoller"
 
 // Read returns 2 byte status trailer, write sends 5 byte command header
diff --git a/lib/nfc/protocols/type_4_tag/type_4_tag_poller.h b/lib/nfc/protocols/type_4_tag/type_4_tag_poller.h
index c3ba91c32..eb5e03a14 100644
--- a/lib/nfc/protocols/type_4_tag/type_4_tag_poller.h
+++ b/lib/nfc/protocols/type_4_tag/type_4_tag_poller.h
@@ -2,8 +2,6 @@
 
 #include "type_4_tag.h"
 
-#include <lib/nfc/protocols/iso14443_4a/iso14443_4a_poller.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/lib/nfc/protocols/type_4_tag/type_4_tag_poller_i.c b/lib/nfc/protocols/type_4_tag/type_4_tag_poller_i.c
index 0131b53c1..b356604c0 100644
--- a/lib/nfc/protocols/type_4_tag/type_4_tag_poller_i.c
+++ b/lib/nfc/protocols/type_4_tag/type_4_tag_poller_i.c
@@ -1,9 +1,7 @@
 #include "type_4_tag_poller_i.h"
+#include "type_4_tag_i.h"
 
 #include <bit_lib/bit_lib.h>
-#include <furi.h>
-
-#include "type_4_tag_i.h"
 
 #define TAG "Type4TagPoller"