7 files changed, 7 insertions, 9 deletions
diff --git a/bootloader/imx233.c b/bootloader/imx233.c
index 6c68ab04f7..d115389985 100644
--- a/bootloader/imx233.c
+++ b/bootloader/imx233.c
@@ -41,7 +41,7 @@
 #include "system-target.h"
 #include "fmradio_i2c.h"
 #include "version.h"
-#include "powermgmt.h"
+#include "powermgmt-imx233.h"
 #include "partitions-imx233.h"
 #include "adc.h"
 
diff --git a/firmware/target/arm/imx233/adc-imx233.c b/firmware/target/arm/imx233/adc-imx233.c
index a0bda9ab02..36ac0f4eae 100644
--- a/firmware/target/arm/imx233/adc-imx233.c
+++ b/firmware/target/arm/imx233/adc-imx233.c
@@ -20,6 +20,9 @@
  ****************************************************************************/
 
 #include "adc-target.h"
+#include "system.h"
+#include "powermgmt-target.h"
+#include "lradc-imx233.h"
 #include "power-imx233.h"
 
 /* Virtual channels */
diff --git a/firmware/target/arm/imx233/adc-target.h b/firmware/target/arm/imx233/adc-target.h
index ed6e3eca77..1694b4c5f6 100644
--- a/firmware/target/arm/imx233/adc-target.h
+++ b/firmware/target/arm/imx233/adc-target.h
@@ -21,11 +21,8 @@
 #ifndef _ADC_IMX233_H_
 #define _ADC_IMX233_H_
 
-#include "system.h"
 #include "adc.h"
-#include "adc-target.h"
 #include "powermgmt-target.h"
-#include "lradc-imx233.h"
 
 enum imx233_adc_channel_t
 {
diff --git a/firmware/target/arm/imx233/powermgmt-imx233.c b/firmware/target/arm/imx233/powermgmt-imx233.c
index 895c91dda2..f2d1981f24 100644
--- a/firmware/target/arm/imx233/powermgmt-imx233.c
+++ b/firmware/target/arm/imx233/powermgmt-imx233.c
@@ -19,12 +19,14 @@
  *
  ****************************************************************************/
 
+#include "system.h"
 #include "powermgmt.h"
 #include "power-imx233.h"
 #include "usb.h"
 #include "string.h"
 //#define LOGF_ENABLE
 #include "logf.h"
+#include "powermgmt-imx233.h"
 
 #if !defined(IMX233_CHARGE_CURRENT) || !defined(IMX233_STOP_CURRENT) \
     || !defined(IMX233_CHARGING_TIMEOUT) || !defined(IMX233_TOPOFF_TIMEOUT)
diff --git a/firmware/target/arm/imx233/powermgmt-imx233.h b/firmware/target/arm/imx233/powermgmt-imx233.h
index 07634ec12e..4cbe0072e7 100644
--- a/firmware/target/arm/imx233/powermgmt-imx233.h
+++ b/firmware/target/arm/imx233/powermgmt-imx233.h
@@ -25,9 +25,6 @@
 #include "powermgmt.h"
 
 void imx233_powermgmt_init(void);
-void powermgmt_init_target(void);
-void charging_algorithm_step(void);
-void charging_algorithm_close(void);
 
 struct imx233_powermgmt_info_t
 {
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/powermgmt-target.h b/firmware/target/arm/imx233/sansa-fuzeplus/powermgmt-target.h
index 2fd5559baf..4a11afc379 100644
--- a/firmware/target/arm/imx233/sansa-fuzeplus/powermgmt-target.h
+++ b/firmware/target/arm/imx233/sansa-fuzeplus/powermgmt-target.h
@@ -22,7 +22,6 @@
 #define POWERMGMT_TARGET_H
 
 #include "config.h"
-#include "powermgmt-imx233.h"
 
 /* Fuze+ OF settings:
  * - current ramp slope: 50 mA/s
diff --git a/firmware/target/arm/imx233/system-imx233.c b/firmware/target/arm/imx233/system-imx233.c
index 3293bd71d1..4223af26c4 100644
--- a/firmware/target/arm/imx233/system-imx233.c
+++ b/firmware/target/arm/imx233/system-imx233.c
@@ -43,7 +43,7 @@
 #include "backlight-target.h"
 #include "button.h"
 #include "fmradio_i2c.h"
-#include "powermgmt.h"
+#include "powermgmt-imx233.h"
 
 void imx233_chip_reset(void)
 {