From 7588a956df2e12d17ecbb79a623de78551eecde4 Mon Sep 17 00:00:00 2001
From: Daniel Mohns <dmohns@users.noreply.github.com>
Date: Wed, 20 Dec 2023 12:29:12 +0100
Subject: [PATCH] Revert "Revert "Reorder imports (#117)" (#150)"

This reverts commit a8950b83d65669d33a8680edd053f09aec625cc8.
---
 firmware/src/credit.hpp           |  1 +
 firmware/src/main.cpp             |  4 +---
 firmware/src/opaygo_functions.hpp | 13 +++++++------
 firmware/src/remote.hpp           |  1 +
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/firmware/src/credit.hpp b/firmware/src/credit.hpp
index a7eaa452..921843f5 100644
--- a/firmware/src/credit.hpp
+++ b/firmware/src/credit.hpp
@@ -1,4 +1,5 @@
 #pragma once
+
 // defines
 
 // Arduino base libraries
diff --git a/firmware/src/main.cpp b/firmware/src/main.cpp
index 24b57a5d..a037266f 100644
--- a/firmware/src/main.cpp
+++ b/firmware/src/main.cpp
@@ -1,11 +1,9 @@
 // defines
 
 // Arduino base libraries
-// #include <Arduino.h>
+#include <Arduino.h>
 
 // third party libraries
-// #include <ArduinoHttpClient.h>
-// #include <Wire.h>
 
 // OpenSmartMeter libraries
 #include "credit.hpp"
diff --git a/firmware/src/opaygo_functions.hpp b/firmware/src/opaygo_functions.hpp
index 92caf57f..c9983133 100644
--- a/firmware/src/opaygo_functions.hpp
+++ b/firmware/src/opaygo_functions.hpp
@@ -1,16 +1,17 @@
 #pragma once
 
+// defines
+
+// Arduino base libraries
+#include "Arduino.h"
+
+// third party libraries
+
 // OpenSmartMeter libraries
 #include "global_defines.hpp"
 #include "helpers.hpp"
 #include "mem_init.hpp"
 #include "time_management.hpp"
-
-// Arduino base libraries
-#include <inttypes.h>
-#include "Arduino.h"
-// #include <time.h>
-
 extern "C" {
 #include "opaygo_decoder.h"
 }
diff --git a/firmware/src/remote.hpp b/firmware/src/remote.hpp
index 6bc947ae..bd69a69c 100644
--- a/firmware/src/remote.hpp
+++ b/firmware/src/remote.hpp
@@ -8,6 +8,7 @@
 #include "Arduino.h"
 
 // third party libraries
+#include <ArduinoHttpClient.h>
 #include <TinyGsmClient.h>
 
 // OpenSmartMeter libraries