diff --git a/common/lfdemod.c b/common/lfdemod.c
index 910b2af4e..6b6743574 100644
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -7,22 +7,20 @@
 //-----------------------------------------------------------------------------
 // Low frequency demod/decode commands
 //-----------------------------------------------------------------------------
-
-#include <stdlib.h>
 #include "lfdemod.h"
-#include <string.h>
 
 //un_comment to allow debug print calls when used not on device
 void dummy(char *fmt, ...){}
 
+
 #ifndef ON_DEVICE
-#include "ui.h"
-#include "cmdparser.h"
-#include "cmddata.h"
-#define prnt PrintAndLog
+# include "ui.h"
+# include "cmdparser.h"
+# include "cmddata.h"
+# define prnt PrintAndLog
 #else 
 	uint8_t g_debugMode=0;
-#define prnt dummy
+# define prnt dummy
 #endif
 
 //test samples are not just noise
diff --git a/common/lfdemod.h b/common/lfdemod.h
index 7b25a02a0..86ae7bc21 100644
--- a/common/lfdemod.h
+++ b/common/lfdemod.h
@@ -15,6 +15,8 @@
 #define LFDEMOD_H__
 #include <stdint.h>  // for uint_32+
 #include <stdbool.h> // for bool
+#include <string.h>  // for strcmp 
+#include <stdlib.h>  // for
 
 //generic
 uint8_t  justNoise(uint8_t *bits, size_t size);