diff --git a/BatteryMeter.c b/BatteryMeter.c
index cd8439c4..bf2b6122 100644
--- a/BatteryMeter.c
+++ b/BatteryMeter.c
@@ -11,9 +11,9 @@ This meter written by Ian P. Hands (iphands@gmail.com, ihands@redhat.com).
 
 #include <math.h>
 
-#include "Platform.h"
 #include "CRT.h"
 #include "Object.h"
+#include "Platform.h"
 #include "XUtils.h"
 
 
diff --git a/linux/Platform.c b/linux/Platform.c
index f5baa24c..7c58d3a8 100644
--- a/linux/Platform.c
+++ b/linux/Platform.c
@@ -102,6 +102,11 @@ const SignalItem Platform_signals[] = {
 
 const unsigned int Platform_numberOfSignals = ARRAYSIZE(Platform_signals);
 
+static enum { BAT_PROC, BAT_SYS, BAT_ERR } Platform_Battery_method = BAT_PROC;
+static time_t Platform_Battery_cacheTime;
+static double Platform_Battery_cacheLevel = NAN;
+static ACPresence Platform_Battery_cacheIsOnAC;
+
 static Htop_Reaction Platform_actionSetIOPriority(State* st) {
    Panel* panel = st->panel;
 
@@ -832,12 +837,6 @@ static void Platform_Battery_getSysData(double* level, ACPresence* isOnAC) {
    *level = totalFull > 0 ? ((double) totalRemain * 100.0) / (double) totalFull : NAN;
 }
 
-static enum { BAT_PROC, BAT_SYS, BAT_ERR } Platform_Battery_method = BAT_PROC;
-
-static time_t Platform_Battery_cacheTime;
-static double Platform_Battery_cacheLevel = NAN;
-static ACPresence Platform_Battery_cacheIsOnAC;
-
 void Platform_getBattery(double* level, ACPresence* isOnAC) {
    time_t now = time(NULL);
    // update battery reading is slow. Update it each 10 seconds only.