diff --git a/armsrc/fpgaloader.c b/armsrc/fpgaloader.c
index a1011ab7c..a96cb5d9e 100644
--- a/armsrc/fpgaloader.c
+++ b/armsrc/fpgaloader.c
@@ -9,16 +9,7 @@
 // Routines to load the FPGA image, and then to configure the FPGA's major
 // mode once it is configured.
 //-----------------------------------------------------------------------------
-
-#include <stdint.h>
-#include <stddef.h>
-#include <stdbool.h>
 #include "fpgaloader.h"
-#include "proxmark3.h"
-#include "util.h"
-#include "string.h"
-#include "BigBuf.h"
-#include "zlib.h"
 
 extern void Dbprintf(const char *fmt, ...);
 
diff --git a/armsrc/fpgaloader.h b/armsrc/fpgaloader.h
index 49290dc07..f9fddb11a 100644
--- a/armsrc/fpgaloader.h
+++ b/armsrc/fpgaloader.h
@@ -9,6 +9,15 @@
 // Routines to load the FPGA image, and then to configure the FPGA's major
 // mode once it is configured.
 //-----------------------------------------------------------------------------
+#ifndef __FPGALOADER_H
+#define __FPGALOADER_H
+
+#include "common.h"		// standard definitions
+#include "proxmark3.h"	// common area
+//#include "util.h"
+#include "string.h"
+#include "BigBuf.h"		// bigbuf mem
+#include "zlib.h"		// uncompress
 
 void FpgaSendCommand(uint16_t cmd, uint16_t v);
 void FpgaWriteConfWord(uint8_t v);
@@ -72,3 +81,5 @@ void SetAdcMuxFor(uint32_t whichGpio);
 #define FPGA_HF_ISO14443A_TAGSIM_MOD				(2<<0)
 #define FPGA_HF_ISO14443A_READER_LISTEN				(3<<0)
 #define FPGA_HF_ISO14443A_READER_MOD				(4<<0)
+
+#endif
\ No newline at end of file