diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
index 8b9653bd4..ee456d9b2 100644
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -944,7 +944,6 @@ void Screen::setup()
     dispdev.setSubtype(7);
 #endif
 
-
     // Initialising the UI will init the display too.
     ui.init();
 
diff --git a/src/graphics/Screen.h b/src/graphics/Screen.h
index 589eb01da..ebffc305a 100644
--- a/src/graphics/Screen.h
+++ b/src/graphics/Screen.h
@@ -4,6 +4,7 @@
 
 #if !HAS_SCREEN
 #include "power.h"
+#include <OLEDDisplay.h>
 namespace graphics
 {
 // Noop class for boards without screen.
@@ -24,7 +25,6 @@ class Screen
     void startFirmwareUpdateScreen() {}
 };
 } // namespace graphics
-
 #else
 #include <cstring>
 
diff --git a/src/modules/CannedMessageModule.cpp b/src/modules/CannedMessageModule.cpp
index ee59364cc..9ece0058a 100644
--- a/src/modules/CannedMessageModule.cpp
+++ b/src/modules/CannedMessageModule.cpp
@@ -8,11 +8,11 @@
 #include "mesh/generated/meshtastic/cannedmessages.pb.h"
 
 #ifdef OLED_RU
-#include "grahics/pfonts/OLEDDisplayFontsRU.h"
+#include "graphics/fonts/OLEDDisplayFontsRU.h"
 #endif
 
 #ifdef OLED_UA
-#include "grahics/fonts/OLEDDisplayFontsUA.h"
+#include "graphics/fonts/OLEDDisplayFontsUA.h"
 #endif
 
 #if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS)
diff --git a/src/modules/esp32/AudioModule.cpp b/src/modules/esp32/AudioModule.cpp
index 662591b88..9db7fbbc2 100644
--- a/src/modules/esp32/AudioModule.cpp
+++ b/src/modules/esp32/AudioModule.cpp
@@ -13,7 +13,7 @@
 #endif
 
 #ifdef OLED_UA
-#include "grahics/fonts/OLEDDisplayFontsUA.h"
+#include "graphics/fonts/OLEDDisplayFontsUA.h"
 #endif
 
 /*