diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EP_ATLAS/ONBOARD_TELIT_ME310.cpp b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EP_ATLAS/ONBOARD_TELIT_ME310.cpp
index 0fd55721df..1344ca2365 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EP_ATLAS/ONBOARD_TELIT_ME310.cpp
+++ b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EP_ATLAS/ONBOARD_TELIT_ME310.cpp
@@ -15,6 +15,8 @@
  * limitations under the License.
  */
 
+#if MBED_CONF_CELLULAR_PRESENT
+
 #include "gpio_api.h"
 #include "platform/mbed_thread.h"
 #include "PinNames.h"
@@ -167,3 +169,5 @@ CellularDevice *CellularDevice::get_target_default_instance()
     static ONBOARD_TELIT_ME310 device(&serial);
     return &device;
 }
+
+#endif // MBED_CONF_CELLULAR_PRESENT
diff --git a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EP_ATLAS/usb_stdio.cpp b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EP_ATLAS/usb_stdio.cpp
index fa0401ea1c..10a451f37b 100644
--- a/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EP_ATLAS/usb_stdio.cpp
+++ b/targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_EP_ATLAS/usb_stdio.cpp
@@ -16,15 +16,15 @@
  * limitations under the License.
  */
 
-#include "USBSerial.h"
-#include "platform/mbed_retarget.h"
-
 #ifndef MBED_CONF_EP_ATLAS_ENABLE_USB_STDIO_CONSOLE
 #define MBED_CONF_EP_ATLAS_ENABLE_USB_STDIO_CONSOLE 0
 #endif
 
 #if MBED_CONF_EP_ATLAS_ENABLE_USB_STDIO_CONSOLE
 
+#include "USBSerial.h"
+#include "platform/mbed_retarget.h"
+
 /* Retarget stdio to USBSerial */
 mbed::FileHandle *mbed::mbed_target_override_console(int fd)
 {