From ae0b764e21051a6882152bbda8bb0811da19bb58 Mon Sep 17 00:00:00 2001
From: fauxpark <fauxpark@gmail.com>
Date: Mon, 28 Feb 2022 23:22:51 +1100
Subject: [PATCH 1/2] analog.[ch]: remove unnecessary includes

---
 platforms/avr/drivers/analog.c     | 3 ---
 platforms/avr/drivers/analog.h     | 2 +-
 platforms/chibios/drivers/analog.c | 1 -
 platforms/chibios/drivers/analog.h | 2 +-
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/platforms/avr/drivers/analog.c b/platforms/avr/drivers/analog.c
index ed4d56360908..a68c6a371d7b 100644
--- a/platforms/avr/drivers/analog.c
+++ b/platforms/avr/drivers/analog.c
@@ -14,9 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <avr/io.h>
-#include <avr/pgmspace.h>
-#include <stdint.h>
 #include "analog.h"
 
 static uint8_t aref = ADC_REF_POWER;
diff --git a/platforms/avr/drivers/analog.h b/platforms/avr/drivers/analog.h
index fb13e106ff1c..214f1f01fb06 100644
--- a/platforms/avr/drivers/analog.h
+++ b/platforms/avr/drivers/analog.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include <stdint.h>
-#include "quantum.h"
+#include "gpio.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/platforms/chibios/drivers/analog.c b/platforms/chibios/drivers/analog.c
index 48a59fd29087..a7b7ec76d749 100644
--- a/platforms/chibios/drivers/analog.c
+++ b/platforms/chibios/drivers/analog.c
@@ -14,7 +14,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "quantum.h"
 #include "analog.h"
 #include <ch.h>
 #include <hal.h>
diff --git a/platforms/chibios/drivers/analog.h b/platforms/chibios/drivers/analog.h
index 8a821719e327..67a7b466a5a7 100644
--- a/platforms/chibios/drivers/analog.h
+++ b/platforms/chibios/drivers/analog.h
@@ -17,7 +17,7 @@
 #pragma once
 
 #include <stdint.h>
-#include "quantum.h"
+#include "gpio.h"
 
 #ifdef __cplusplus
 extern "C" {

From 83403b72a046d75abc33a37f09f75bb08b47a3b3 Mon Sep 17 00:00:00 2001
From: fauxpark <fauxpark@gmail.com>
Date: Tue, 1 Mar 2022 07:04:58 +1100
Subject: [PATCH 2/2] Fix analog_joystick

---
 drivers/sensors/analog_joystick.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/sensors/analog_joystick.c b/drivers/sensors/analog_joystick.c
index 95f8cff23ab2..12256a8e7ab2 100644
--- a/drivers/sensors/analog_joystick.c
+++ b/drivers/sensors/analog_joystick.c
@@ -18,6 +18,8 @@
 #include "analog.h"
 #include "gpio.h"
 #include "wait.h"
+#include "timer.h"
+#include <stdlib.h>
 
 // Set Parameters
 uint16_t minAxisValue = ANALOG_JOYSTICK_AXIS_MIN;