diff --git a/client/cmddata.c b/client/cmddata.c
index 5962d6ca6..499db7128 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -508,7 +508,7 @@ int CmdGetBitStream(const char *Cmd) {
     RepaintGraphWindow();
     return PM3_SUCCESS;
 }
-int CmdConvertBitStream(const char *Cmd) {
+static int CmdConvertBitStream(const char *Cmd) {
 
     if (isGraphBitstream()) {
         convertGraphFromBitstream();
diff --git a/client/cmdhf.c b/client/cmdhf.c
index 9166b01ca..1960de2ee 100644
--- a/client/cmdhf.c
+++ b/client/cmdhf.c
@@ -8,7 +8,7 @@
 //-----------------------------------------------------------------------------
 // High frequency commands
 //-----------------------------------------------------------------------------
-//#include "cmdhf.h"
+#include "cmdhf.h"
 
 #include <ctype.h>        // tolower
 
diff --git a/client/cmdhw.c b/client/cmdhw.c
index ec53ad2cf..619e73abe 100644
--- a/client/cmdhw.c
+++ b/client/cmdhw.c
@@ -366,7 +366,7 @@ static void lookupChipID(uint32_t iChipID, uint32_t mem_used) {
     PrintAndLogEx(NORMAL, "  --= Nonvolatile Program Memory Type: %s", asBuff);
 }
 
-int CmdDbg(const char *Cmd) {
+static int CmdDbg(const char *Cmd) {
 
     char ctmp = tolower(param_getchar(Cmd, 0));
     if (strlen(Cmd) < 1 || ctmp == 'h') return usage_dbg();
diff --git a/client/cmdlf.c b/client/cmdlf.c
index 328af5e29..e0238b0d6 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -213,7 +213,7 @@ static int usage_lf_tune(void) {
     return PM3_SUCCESS;
 }
 
-int CmdLFTune(const char *Cmd) {
+static int CmdLFTune(const char *Cmd) {
     int iter = 0;
     uint8_t divisor =  LF_DIVISOR_125;//Frequency divisor
     bool errors = false;
diff --git a/client/cmdlfhitag.c b/client/cmdlfhitag.c
index a54b96a68..40e909024 100644
--- a/client/cmdlfhitag.c
+++ b/client/cmdlfhitag.c
@@ -8,6 +8,8 @@
 // Low frequency Hitag support
 //-----------------------------------------------------------------------------
 
+#include "cmdlfhitag.h"
+
 #include <ctype.h>
 
 #include "cmdparser.h"    // command_t
diff --git a/client/cmdlfnedap.c b/client/cmdlfnedap.c
index 66d093800..84b433a0c 100644
--- a/client/cmdlfnedap.c
+++ b/client/cmdlfnedap.c
@@ -426,7 +426,7 @@ static int CmdLfNedapGen(const char *Cmd) {
     return PM3_SUCCESS;
 }
 
-int CmdLFNedapClone(const char *Cmd) {
+static int CmdLFNedapClone(const char *Cmd) {
     uint8_t max;
     uint32_t blocks[5] = {0};
 
diff --git a/client/fileutils.c b/client/fileutils.c
index 8b537d423..ebdb662ca 100644
--- a/client/fileutils.c
+++ b/client/fileutils.c
@@ -74,7 +74,8 @@ int fileExists(const char *filename) {
  * @param filename
  * @return
  */
-bool is_regular_file(const char *filename) {
+/*
+static bool is_regular_file(const char *filename) {
 #ifdef _WIN32
     struct _stat st;
     if (_stat(filename, &st) == -1)
@@ -87,12 +88,14 @@ bool is_regular_file(const char *filename) {
 #endif
     return S_ISREG(st.st_mode) != 0;
 }
+*/
+
 /**
  * @brief checks if path is directory.
  * @param filename
  * @return
  */
-bool is_directory(const char *filename) {
+static bool is_directory(const char *filename) {
 #ifdef _WIN32
     struct _stat st;
     if (_stat(filename, &st) == -1)
diff --git a/client/loclass/ikeys.c b/client/loclass/ikeys.c
index 1bff33f37..2f3a6c067 100644
--- a/client/loclass/ikeys.c
+++ b/client/loclass/ikeys.c
@@ -58,6 +58,8 @@ From "Dismantling iclass":
     output of hash0 is the diversified card key k = k [0] , . . . , k [7] ∈ (F 82 ) 8 .
 
 **/
+#include "ikeys.h"
+
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
diff --git a/client/loclass/ikeys.h b/client/loclass/ikeys.h
index 29d285639..ccbc5539b 100644
--- a/client/loclass/ikeys.h
+++ b/client/loclass/ikeys.h
@@ -38,6 +38,7 @@
 #ifndef IKEYS_H
 #define IKEYS_H
 
+#include <inttypes.h>
 
 /**
  * @brief
diff --git a/client/proxmark3.c b/client/proxmark3.c
index fb02396bd..fde2af91e 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -56,7 +56,7 @@ static void showBanner(void) {
     g_printAndLog = PRINTANDLOG_PRINT | PRINTANDLOG_LOG;
 }
 
-int check_comm(void) {
+static int check_comm(void) {
     // If communications thread goes down. Device disconnected then this should hook up PM3 again.
     if (IsCommunicationThreadDead() && session.pm3_present) {
         rl_set_prompt(PROXPROMPT_OFFLINE);
@@ -86,7 +86,7 @@ int push_cmdscriptfile(char *path, bool stayafter) {
     return PM3_SUCCESS;
 }
 
-FILE *current_cmdscriptfile() {
+static FILE *current_cmdscriptfile() {
     return cmdscriptfile[cmdscriptfile_idx];
 }
 
diff --git a/client/wiegand_formats.c b/client/wiegand_formats.c
index 983e0f432..613f68e20 100644
--- a/client/wiegand_formats.c
+++ b/client/wiegand_formats.c
@@ -650,7 +650,7 @@ bool HIDPack(int format_idx, wiegand_card_t *card, wiegand_message_t *packed) {
     return FormatTable[format_idx].Pack(card, packed);
 }
 
-void HIDDisplayUnpackedCard(wiegand_card_t *card, const cardformat_t format) {
+static void HIDDisplayUnpackedCard(wiegand_card_t *card, const cardformat_t format) {
 
     /*
         PrintAndLogEx(SUCCESS, "       Format: %s (%s)", format.Name, format.Descrp);
diff --git a/client/wiegand_formatutils.c b/client/wiegand_formatutils.c
index 80a9c9268..ba446957a 100644
--- a/client/wiegand_formatutils.c
+++ b/client/wiegand_formatutils.c
@@ -120,7 +120,7 @@ bool set_nonlinear_field(wiegand_message_t *data, uint64_t value, uint8_t numBit
     return result;
 }
 
-uint8_t get_length_from_header(wiegand_message_t *data) {
+static uint8_t get_length_from_header(wiegand_message_t *data) {
     uint8_t len = 0;
     uint32_t hfmt = 0; // for calculating card length