7 files changed, 3 insertions, 39 deletions

diff --git a/firmware/target/coldfire/iaudio/button-target.h b/firmware/target/coldfire/iaudio/button-target.h
index 0259ea2134..655a172404 100644
--- a/firmware/target/coldfire/iaudio/button-target.h
+++ b/firmware/target/coldfire/iaudio/button-target.h
@@ -21,16 +21,9 @@
 #ifndef _BUTTON_TARGET_H_
 #define _BUTTON_TARGET_H_
 
-#include <stdbool.h>
-#include "config.h"
-
 #define HAS_BUTTON_HOLD
 #define HAS_REMOTE_BUTTON_HOLD
 
-bool button_hold(void);
-bool remote_button_hold(void);
-void button_init_device(void);
-int button_read_device(void);
 void button_enable_scan(bool enable);
 bool button_scan_enabled(void);
 
diff --git a/firmware/target/coldfire/iaudio/m3/button-target.h b/firmware/target/coldfire/iaudio/m3/button-target.h
index 66457fe07c..8409cf6075 100644
--- a/firmware/target/coldfire/iaudio/m3/button-target.h
+++ b/firmware/target/coldfire/iaudio/m3/button-target.h
@@ -22,17 +22,9 @@
 #ifndef _BUTTON_TARGET_H_
 #define _BUTTON_TARGET_H_
 
-#include <stdbool.h>
-#include "config.h"
-
 #define HAS_BUTTON_HOLD
 #define HAS_REMOTE_BUTTON_HOLD
 
-bool button_hold(void);
-bool remote_button_hold(void);
-void button_init_device(void);
-int button_read_device(void);
-
 /* iaudio M3 specific button codes */
 
     /* Main unit's buttons */
diff --git a/firmware/target/coldfire/iriver/button-target.h b/firmware/target/coldfire/iriver/button-target.h
index 4c15630e34..a677d042b3 100644
--- a/firmware/target/coldfire/iriver/button-target.h
+++ b/firmware/target/coldfire/iriver/button-target.h
@@ -24,17 +24,12 @@
 #ifndef _BUTTON_TARGET_H_
 #define _BUTTON_TARGET_H_
 
-#include <stdbool.h>
 #include "config.h"
+#include <stdbool.h>
 
 #define HAS_BUTTON_HOLD
 #define HAS_REMOTE_BUTTON_HOLD
 
-bool button_hold(void);
-bool remote_button_hold(void);
-bool remote_button_hold_only(void);
-void button_init_device(void);
-int button_read_device(void);
 #ifdef IRIVER_H300_SERIES
 void button_enable_scan(bool enable);
 bool button_scan_enabled(void);
diff --git a/firmware/target/coldfire/iriver/h100/button-h100.c b/firmware/target/coldfire/iriver/h100/button-h100.c
index c32b979a00..dbaefdcf2a 100644
--- a/firmware/target/coldfire/iriver/h100/button-h100.c
+++ b/firmware/target/coldfire/iriver/h100/button-h100.c
@@ -39,7 +39,7 @@ bool button_hold(void)
     return (GPIO1_READ & 0x00000002)?true:false;
 }
 
-bool remote_button_hold_only(void)
+static bool remote_button_hold_only(void)
 {        
     if(remote_type() == REMOTETYPE_H300_NONLCD)
         return adc_scan(ADC_REMOTE)<0x0d; /* hold should be 0x00 */
diff --git a/firmware/target/coldfire/iriver/h300/button-h300.c b/firmware/target/coldfire/iriver/h300/button-h300.c
index 43f5250191..74c14fb144 100644
--- a/firmware/target/coldfire/iriver/h300/button-h300.c
+++ b/firmware/target/coldfire/iriver/h300/button-h300.c
@@ -55,7 +55,7 @@ bool button_hold(void)
     return (GPIO1_READ & 0x00000002)?true:false;
 }
 
-bool remote_button_hold_only(void)
+static bool remote_button_hold_only(void)
 {
     if(remote_type() == REMOTETYPE_H300_NONLCD)
         return adc_scan(ADC_REMOTE)<0x0d; /* hold should be 0x00 */
diff --git a/firmware/target/coldfire/mpio/hd200/button-target.h b/firmware/target/coldfire/mpio/hd200/button-target.h
index b7c31f8c59..3370935a45 100644
--- a/firmware/target/coldfire/mpio/hd200/button-target.h
+++ b/firmware/target/coldfire/mpio/hd200/button-target.h
@@ -21,17 +21,9 @@
 #ifndef _BUTTON_TARGET_H_
 #define _BUTTON_TARGET_H_
 
-#include <stdbool.h>
-#include "config.h"
-
 #define HAS_BUTTON_HOLD
 #define HAS_REMOTE_BUTTON_HOLD
 
-bool button_hold(void);
-bool remote_button_hold(void);
-void button_init_device(void);
-int button_read_device(void);
-
 /* HD200 specific button codes */
 /* Main unit's buttons  - flags as in original firmware*/
 #define BUTTON_PLAY         0x00000001
diff --git a/firmware/target/coldfire/mpio/hd300/button-target.h b/firmware/target/coldfire/mpio/hd300/button-target.h
index 5cb2ae8bf2..7f902b0ecf 100644
--- a/firmware/target/coldfire/mpio/hd300/button-target.h
+++ b/firmware/target/coldfire/mpio/hd300/button-target.h
@@ -21,15 +21,7 @@
 #ifndef _BUTTON_TARGET_H_
 #define _BUTTON_TARGET_H_
 
-#include <stdbool.h>
-#include "config.h"
-
 #define HAS_BUTTON_HOLD
-#define BUTTON_REMOTE 0
-
-bool button_hold(void);
-void button_init_device(void);
-int button_read_device(void);
 
 /* HD300 specific button codes */
 #define BUTTON_PLAY         0x00000001