diff --git a/src/graphics/draw/DebugRenderer.cpp b/src/graphics/draw/DebugRenderer.cpp
index 8ee31d6e4..36f8a9186 100644
--- a/src/graphics/draw/DebugRenderer.cpp
+++ b/src/graphics/draw/DebugRenderer.cpp
@@ -1,11 +1,12 @@
-#include "DebugRenderer.h"
+#include "configuration.h"
+#if HAS_SCREEN
 #include "../Screen.h"
+#include "DebugRenderer.h"
 #include "FSCommon.h"
 #include "NodeDB.h"
 #include "Throttle.h"
 #include "UIRenderer.h"
 #include "airtime.h"
-#include "configuration.h"
 #include "gps/RTC.h"
 #include "graphics/ScreenFonts.h"
 #include "graphics/SharedUIDisplay.h"
@@ -675,3 +676,4 @@ void drawMemoryUsage(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
 }
 } // namespace DebugRenderer
 } // namespace graphics
+#endif
\ No newline at end of file
diff --git a/src/graphics/draw/NotificationRenderer.cpp b/src/graphics/draw/NotificationRenderer.cpp
index 33d4efc3e..1c5157abe 100644
--- a/src/graphics/draw/NotificationRenderer.cpp
+++ b/src/graphics/draw/NotificationRenderer.cpp
@@ -1,7 +1,9 @@
-#include "NotificationRenderer.h"
+#include "configuration.h"
+#if HAS_SCREEN
+
 #include "DisplayFormatters.h"
 #include "NodeDB.h"
-#include "configuration.h"
+#include "NotificationRenderer.h"
 #include "graphics/Screen.h"
 #include "graphics/ScreenFonts.h"
 #include "graphics/SharedUIDisplay.h"
@@ -189,3 +191,4 @@ void NotificationRenderer::drawFrameFirmware(OLEDDisplay *display, OLEDDisplayUi
 } // namespace NotificationRenderer
 
 } // namespace graphics
+#endif
\ No newline at end of file