diff --git a/src/Power.cpp b/src/Power.cpp
index 1f9aacd08..5c5c7bca9 100644
--- a/src/Power.cpp
+++ b/src/Power.cpp
@@ -14,7 +14,7 @@
 #endif
 
 #ifndef DELAY_FOREVER
-#define DELAY_FOREVER   portMAX_DELAY
+#define DELAY_FOREVER portMAX_DELAY
 #endif
 
 #ifdef HAS_PMU
diff --git a/src/input/RotaryEncoderInterruptBase.h b/src/input/RotaryEncoderInterruptBase.h
index bb77297a8..9bcf25a69 100644
--- a/src/input/RotaryEncoderInterruptBase.h
+++ b/src/input/RotaryEncoderInterruptBase.h
@@ -2,7 +2,7 @@
 
 #include "InputBroker.h"
 #include "concurrency/OSThread.h"
-#include "mesh/generated/meshtastic/module_config.pb.h"
+#include "mesh/NodeDB.h"
 
 enum RotaryEncoderInterruptBaseStateType { ROTARY_EVENT_OCCURRED, ROTARY_EVENT_CLEARED };
 
diff --git a/src/input/UpDownInterruptBase.h b/src/input/UpDownInterruptBase.h
index 372478c22..afa64d28d 100644
--- a/src/input/UpDownInterruptBase.h
+++ b/src/input/UpDownInterruptBase.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "InputBroker.h"
-#include "mesh/nodeDB.h"
+#include "mesh/NodeDB.h"
 
 class UpDownInterruptBase : public Observable<const InputEvent *>
 {
diff --git a/src/input/kbI2cBase.h b/src/input/kbI2cBase.h
index e40fd5b33..a0a4dd608 100644
--- a/src/input/kbI2cBase.h
+++ b/src/input/kbI2cBase.h
@@ -1,8 +1,8 @@
 #pragma once
 
 #include "InputBroker.h"
-#include "concurrency/OSThread.h"
 #include "Wire.h"
+#include "concurrency/OSThread.h"
 
 class KbI2cBase : public Observable<const InputEvent *>, public concurrency::OSThread
 {