diff --git a/examples/ArduinoLoRa/LoRaReceiver/LoRaBoards.h b/examples/ArduinoLoRa/LoRaReceiver/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/ArduinoLoRa/LoRaReceiver/LoRaBoards.h
+++ b/examples/ArduinoLoRa/LoRaReceiver/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/ArduinoLoRa/LoRaSender/LoRaBoards.h b/examples/ArduinoLoRa/LoRaSender/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/ArduinoLoRa/LoRaSender/LoRaBoards.h
+++ b/examples/ArduinoLoRa/LoRaSender/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/Display/Free_Font_Demo/LoRaBoards.h b/examples/Display/Free_Font_Demo/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/Display/Free_Font_Demo/LoRaBoards.h
+++ b/examples/Display/Free_Font_Demo/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/Display/TBeam_TFT_Shield/LoRaBoards.h b/examples/Display/TBeam_TFT_Shield/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/Display/TBeam_TFT_Shield/LoRaBoards.h
+++ b/examples/Display/TBeam_TFT_Shield/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/Display/TFT_Char_times/LoRaBoards.h b/examples/Display/TFT_Char_times/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/Display/TFT_Char_times/LoRaBoards.h
+++ b/examples/Display/TFT_Char_times/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/Display/UTFT_demo/LoRaBoards.h b/examples/Display/UTFT_demo/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/Display/UTFT_demo/LoRaBoards.h
+++ b/examples/Display/UTFT_demo/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/GPS/TinyGPS_Example/LoRaBoards.h b/examples/GPS/TinyGPS_Example/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/GPS/TinyGPS_Example/LoRaBoards.h
+++ b/examples/GPS/TinyGPS_Example/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/GPS/TinyGPS_FullExample/LoRaBoards.h b/examples/GPS/TinyGPS_FullExample/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/GPS/TinyGPS_FullExample/LoRaBoards.h
+++ b/examples/GPS/TinyGPS_FullExample/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/GPS/TinyGPS_KitchenSink/LoRaBoards.h b/examples/GPS/TinyGPS_KitchenSink/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/GPS/TinyGPS_KitchenSink/LoRaBoards.h
+++ b/examples/GPS/TinyGPS_KitchenSink/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/GPS/UBlox_BasicNMEARead/LoRaBoards.h b/examples/GPS/UBlox_BasicNMEARead/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/GPS/UBlox_BasicNMEARead/LoRaBoards.h
+++ b/examples/GPS/UBlox_BasicNMEARead/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/GPS/UBlox_NMEAParsing/LoRaBoards.h b/examples/GPS/UBlox_NMEAParsing/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/GPS/UBlox_NMEAParsing/LoRaBoards.h
+++ b/examples/GPS/UBlox_NMEAParsing/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/GPS/UBlox_OutputRate/LoRaBoards.h b/examples/GPS/UBlox_OutputRate/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/GPS/UBlox_OutputRate/LoRaBoards.h
+++ b/examples/GPS/UBlox_OutputRate/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/GPS/UBlox_Recovery/LoRaBoards.h b/examples/GPS/UBlox_Recovery/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/GPS/UBlox_Recovery/LoRaBoards.h
+++ b/examples/GPS/UBlox_Recovery/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/LoRaWAN/LMIC_Library_OTTA/LoRaBoards.h b/examples/LoRaWAN/LMIC_Library_OTTA/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/LoRaWAN/LMIC_Library_OTTA/LoRaBoards.h
+++ b/examples/LoRaWAN/LMIC_Library_OTTA/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/LoRaWAN/RadioLib_ABP/LoRaBoards.h b/examples/LoRaWAN/RadioLib_ABP/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/LoRaWAN/RadioLib_ABP/LoRaBoards.h
+++ b/examples/LoRaWAN/RadioLib_ABP/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/OLED/SH1106FontUsage/LoRaBoards.h b/examples/OLED/SH1106FontUsage/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/OLED/SH1106FontUsage/LoRaBoards.h
+++ b/examples/OLED/SH1106FontUsage/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/OLED/SH1106GraphicsTest/LoRaBoards.h b/examples/OLED/SH1106GraphicsTest/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/OLED/SH1106GraphicsTest/LoRaBoards.h
+++ b/examples/OLED/SH1106GraphicsTest/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/OLED/SH1106IconMenu/LoRaBoards.h b/examples/OLED/SH1106IconMenu/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/OLED/SH1106IconMenu/LoRaBoards.h
+++ b/examples/OLED/SH1106IconMenu/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/OLED/SH1106PrintUTF8/LoRaBoards.h b/examples/OLED/SH1106PrintUTF8/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/OLED/SH1106PrintUTF8/LoRaBoards.h
+++ b/examples/OLED/SH1106PrintUTF8/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/OLED/SSD1306SimpleDemo/LoRaBoards.h b/examples/OLED/SSD1306SimpleDemo/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/OLED/SSD1306SimpleDemo/LoRaBoards.h
+++ b/examples/OLED/SSD1306SimpleDemo/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/OLED/SSD1306UiDemo/LoRaBoards.h b/examples/OLED/SSD1306UiDemo/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/OLED/SSD1306UiDemo/LoRaBoards.h
+++ b/examples/OLED/SSD1306UiDemo/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/PMU/LoRaBoards.h b/examples/PMU/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/PMU/LoRaBoards.h
+++ b/examples/PMU/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/RadioLibExamples/Receive_Interrupt/LoRaBoards.h b/examples/RadioLibExamples/Receive_Interrupt/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/RadioLibExamples/Receive_Interrupt/LoRaBoards.h
+++ b/examples/RadioLibExamples/Receive_Interrupt/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/RadioLibExamples/Transmit_Interrupt/LoRaBoards.h b/examples/RadioLibExamples/Transmit_Interrupt/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/RadioLibExamples/Transmit_Interrupt/LoRaBoards.h
+++ b/examples/RadioLibExamples/Transmit_Interrupt/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/Sensor/BME280_AdvancedsettingsExample/LoRaBoards.h b/examples/Sensor/BME280_AdvancedsettingsExample/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/Sensor/BME280_AdvancedsettingsExample/LoRaBoards.h
+++ b/examples/Sensor/BME280_AdvancedsettingsExample/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/Sensor/BME280_TestExample/LoRaBoards.h b/examples/Sensor/BME280_TestExample/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/Sensor/BME280_TestExample/LoRaBoards.h
+++ b/examples/Sensor/BME280_TestExample/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/Sensor/BME280_UnifiedExample/LoRaBoards.h b/examples/Sensor/BME280_UnifiedExample/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/Sensor/BME280_UnifiedExample/LoRaBoards.h
+++ b/examples/Sensor/BME280_UnifiedExample/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/Sensor/PCF8563_AlarmByUnits/LoRaBoards.h b/examples/Sensor/PCF8563_AlarmByUnits/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/Sensor/PCF8563_AlarmByUnits/LoRaBoards.h
+++ b/examples/Sensor/PCF8563_AlarmByUnits/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/Sensor/PCF8563_SimpleTime/LoRaBoards.h b/examples/Sensor/PCF8563_SimpleTime/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/Sensor/PCF8563_SimpleTime/LoRaBoards.h
+++ b/examples/Sensor/PCF8563_SimpleTime/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/Sensor/PCF8563_TimeLib/LoRaBoards.h b/examples/Sensor/PCF8563_TimeLib/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/Sensor/PCF8563_TimeLib/LoRaBoards.h
+++ b/examples/Sensor/PCF8563_TimeLib/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/Sensor/PCF8563_TimeSynchronization/LoRaBoards.h b/examples/Sensor/PCF8563_TimeSynchronization/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/Sensor/PCF8563_TimeSynchronization/LoRaBoards.h
+++ b/examples/Sensor/PCF8563_TimeSynchronization/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/Sensor/QMC6310_CalibrateExample/LoRaBoards.h b/examples/Sensor/QMC6310_CalibrateExample/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/Sensor/QMC6310_CalibrateExample/LoRaBoards.h
+++ b/examples/Sensor/QMC6310_CalibrateExample/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/Sensor/QMC6310_CompassExample/LoRaBoards.h b/examples/Sensor/QMC6310_CompassExample/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/Sensor/QMC6310_CompassExample/LoRaBoards.h
+++ b/examples/Sensor/QMC6310_CompassExample/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/Sensor/QMC6310_GetDataExample/LoRaBoards.h b/examples/Sensor/QMC6310_GetDataExample/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/Sensor/QMC6310_GetDataExample/LoRaBoards.h
+++ b/examples/Sensor/QMC6310_GetDataExample/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/Sensor/QMC6310_GetPolarExample/LoRaBoards.h b/examples/Sensor/QMC6310_GetPolarExample/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/Sensor/QMC6310_GetPolarExample/LoRaBoards.h
+++ b/examples/Sensor/QMC6310_GetPolarExample/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/Sensor/QMI8658_BlockExample/LoRaBoards.h b/examples/Sensor/QMI8658_BlockExample/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/Sensor/QMI8658_BlockExample/LoRaBoards.h
+++ b/examples/Sensor/QMI8658_BlockExample/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/Sensor/QMI8658_GetDataExample/LoRaBoards.h b/examples/Sensor/QMI8658_GetDataExample/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/Sensor/QMI8658_GetDataExample/LoRaBoards.h
+++ b/examples/Sensor/QMI8658_GetDataExample/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/Sensor/QMI8658_InterruptBlockExample/LoRaBoards.h b/examples/Sensor/QMI8658_InterruptBlockExample/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/Sensor/QMI8658_InterruptBlockExample/LoRaBoards.h
+++ b/examples/Sensor/QMI8658_InterruptBlockExample/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/Sensor/QMI8658_InterruptExample/LoRaBoards.h b/examples/Sensor/QMI8658_InterruptExample/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/Sensor/QMI8658_InterruptExample/LoRaBoards.h
+++ b/examples/Sensor/QMI8658_InterruptExample/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/Sensor/QMI8658_LockingMechanismExample/LoRaBoards.h b/examples/Sensor/QMI8658_LockingMechanismExample/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/Sensor/QMI8658_LockingMechanismExample/LoRaBoards.h
+++ b/examples/Sensor/QMI8658_LockingMechanismExample/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/Sensor/QMI8658_MadgwickAHRS/LoRaBoards.h b/examples/Sensor/QMI8658_MadgwickAHRS/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/Sensor/QMI8658_MadgwickAHRS/LoRaBoards.h
+++ b/examples/Sensor/QMI8658_MadgwickAHRS/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/Sensor/QMI8658_PedometerExample/LoRaBoards.h b/examples/Sensor/QMI8658_PedometerExample/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/Sensor/QMI8658_PedometerExample/LoRaBoards.h
+++ b/examples/Sensor/QMI8658_PedometerExample/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/Sensor/QMI8658_ReadFromFifoExample/LoRaBoards.h b/examples/Sensor/QMI8658_ReadFromFifoExample/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/Sensor/QMI8658_ReadFromFifoExample/LoRaBoards.h
+++ b/examples/Sensor/QMI8658_ReadFromFifoExample/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/Sensor/QMI8658_WakeOnMotion/LoRaBoards.h b/examples/Sensor/QMI8658_WakeOnMotion/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/Sensor/QMI8658_WakeOnMotion/LoRaBoards.h
+++ b/examples/Sensor/QMI8658_WakeOnMotion/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))
diff --git a/examples/T3S3Factory/LoRaBoards.h b/examples/T3S3Factory/LoRaBoards.h
index df7db6e1..c2b43707 100644
--- a/examples/T3S3Factory/LoRaBoards.h
+++ b/examples/T3S3Factory/LoRaBoards.h
@@ -74,9 +74,11 @@ void printResult(bool radio_online);
 
 void flashLed();
 
+#ifdef HAS_PMU
 extern XPowersLibInterface *PMU;
-extern DISPLAY_MODEL *u8g2;
 extern bool pmuInterrupt;
+#endif
+extern DISPLAY_MODEL *u8g2;
 
 #define U8G2_HOR_ALIGN_CENTER(t)    ((u8g2->getDisplayWidth() -  (u8g2->getUTF8Width(t))) / 2)
 #define U8G2_HOR_ALIGN_RIGHT(t)     ( u8g2->getDisplayWidth()  -  u8g2->getUTF8Width(t))