diff --git a/.mbedignore b/.mbedignore
index cee0a2eb5..9d980ea3a 100644
--- a/.mbedignore
+++ b/.mbedignore
@@ -2,8 +2,7 @@ cores/arduino/mbed/*
 cores/arduino/api/Stream.h
 cores/arduino/api/deprecated/Stream.h
 cores/arduino/main.cpp
-variants/*mbed_config.h
-variants/E*
-variants/M*
-libraries/micro*
-libraries/WiFi*
+libraries/openamp*
+cores/arduino/USB/*
+variants/*
+libraries/*
diff --git a/cores/arduino/Arduino.h b/cores/arduino/Arduino.h
index debbcf459..38cc70664 100644
--- a/cores/arduino/Arduino.h
+++ b/cores/arduino/Arduino.h
@@ -23,10 +23,7 @@
 #if !defined(Arduino_h) && !defined(ARDUINO_LIB_DISCOVERY_PHASE)
 #define Arduino_h
 
-#if !defined(ARDUINO_AS_MBED_LIBRARY)
 #include "pinmode_arduino.h"
-#endif
-
 #include "api/ArduinoAPI.h"
 
 #if defined(__cplusplus)
diff --git a/cores/arduino/as_mbed_library/pinmode_arduino.h b/cores/arduino/as_mbed_library/pinmode_arduino.h
new file mode 100644
index 000000000..19bcec803
--- /dev/null
+++ b/cores/arduino/as_mbed_library/pinmode_arduino.h
@@ -0,0 +1,71 @@
+#pragma once 
+
+/* Define mock symbols to nullify PinMode definitions */
+#define PullNone            TempPullNone 
+#define PullUp              TempPullUp 
+#define PullDown            TempPullDown 
+#define OpenDrainPullUp     TempOpenDrainPullUp 
+#define OpenDrainNoPull     TempOpenDrainNoPull 
+#define OpenDrainPullDown   TempOpenDrainPullDown 
+#define PushPullNoPull      TempPushPullNoPull     
+#define PushPullPullUp      TempPushPullPullUp    
+#define PushPullPullDown    TempPushPullPullDown  
+#define OpenDrain           TempOpenDrain         
+#define PullDefault         TempPullDefault       
+
+#define INPUT           TempINPUT
+#define OUTPUT          TempOUTPUT
+#define INPUT_PULLUP    TempINPUT_PULLUP
+#define INPUT_PULLDOWN  TempINPUT_PULLDOWN
+
+/* Rename symbol PinMode into MbedPinMode for all the file PinNamesTypes.h
+ * Functions using PinMode should be redeclared with the correct PinMode symbol */
+#define PinMode MbedPinMode
+#include "PeripheralNames.h"
+#include "PinNamesTypes.h"
+#undef PinMode
+
+/* Rename symbol PinMode into ArduinoPinMode for all the file Common.h
+ * Functions using PinMode should be redeclared with the correct PinMode symbol */
+#define PinMode ArduinoPinMode
+#include "api/Common.h"
+#undef PinMode
+
+#undef PullNone         
+#undef PullUp           
+#undef PullDown         
+#undef OpenDrainPullUp  
+#undef OpenDrainNoPull  
+#undef OpenDrainPullDown 
+#undef PushPullNoPull   
+#undef PushPullPullUp    
+#undef PushPullPullDown  
+#undef OpenDrain         
+#undef PullDefault       
+
+#undef INPUT
+#undef OUTPUT
+#undef INPUT_PULLUP
+#undef INPUT_PULLDOWN
+
+/* Define the PinName symbol to be used in all the contexts */
+typedef enum {
+    PullNone          = TempPullNone,
+    PullUp            = TempPullUp,
+    PullDown          = TempPullDown,
+    OpenDrainPullUp   = TempOpenDrainPullUp,
+    OpenDrainNoPull   = TempOpenDrainNoPull,
+    OpenDrainPullDown = TempOpenDrainPullDown,
+    PushPullNoPull    = TempPushPullNoPull,
+    PushPullPullUp    = TempPushPullPullUp,
+    PushPullPullDown  = TempPushPullPullDown,
+    OpenDrain         = TempOpenDrain,
+    PullDefault       = TempPullDefault,
+    INPUT = TempINPUT,
+    OUTPUT = TempOUTPUT,
+    INPUT_PULLUP = TempINPUT_PULLUP,
+    INPUT_PULLDOWN = TempINPUT_PULLDOWN
+} PinMode;
+
+/* Redeclare Common.h functions with the updated PinMode */
+void pinMode(pin_size_t pinNumber, PinMode pinMode);
\ No newline at end of file
diff --git a/cores/arduino/as_mbed_library/pins_arduino.h b/cores/arduino/as_mbed_library/pins_arduino.h
new file mode 100644
index 000000000..e53349050
--- /dev/null
+++ b/cores/arduino/as_mbed_library/pins_arduino.h
@@ -0,0 +1,2 @@
+#define PINS_COUNT 255
+#define NUM_ANALOG_INPUTS	4
\ No newline at end of file
diff --git a/cores/arduino/as_mbed_library/variant.cpp b/cores/arduino/as_mbed_library/variant.cpp
new file mode 100644
index 000000000..b771fc1ca
--- /dev/null
+++ b/cores/arduino/as_mbed_library/variant.cpp
@@ -0,0 +1,16 @@
+#ifdef ARDUINO_AS_MBED_LIBRARY
+
+#include "Arduino.h"
+#include "pinDefinitions.h"
+
+// generic variant
+
+PinDescription g_APinDescription[PINS_COUNT];
+
+void initVariant() {
+	for (int i = 0; i<PINS_COUNT; i++) {
+		g_APinDescription[i].name = (PinName)i;
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/cores/arduino/mbed.h b/cores/arduino/mbed.h
index bd6591f1e..4e321fc48 100644
--- a/cores/arduino/mbed.h
+++ b/cores/arduino/mbed.h
@@ -5,14 +5,10 @@
 
 #if defined(__cplusplus)
 #if !defined(ARDUINO_AS_MBED_LIBRARY)
-#ifdef F
-#define Arduino_F F
-#undef F
-#endif // F (mbed included after arduino.h)
-#define F Mbed_F
-#endif // !ARDUINO_AS_MBED_LIBRARY
 #include "mbed/mbed.h"
-#undef F
+#else
+#include_next "mbed.h"
+#endif // !ARDUINO_AS_MBED_LIBRARY
 #endif //__cplusplus
 
 #endif //_MBED_WRAP_H_
diff --git a/cores/arduino/pinDefinitions.h b/cores/arduino/pinDefinitions.h
index a09a467be..4ba117f34 100644
--- a/cores/arduino/pinDefinitions.h
+++ b/cores/arduino/pinDefinitions.h
@@ -1,3 +1,5 @@
+#ifdef USE_ARDUINO_PINOUT
+
 #include "drivers/InterruptIn.h"
 #include "drivers/PwmOut.h"
 #include "drivers/AnalogIn.h"
@@ -35,3 +37,5 @@ inline PinName digitalPinToPinName(pin_size_t P) {
 #endif
 
 int PinNameToIndex(PinName P);
+
+#endif
\ No newline at end of file
diff --git a/libraries/KernelDebug/src/KernelDebug.cpp b/libraries/KernelDebug/src/KernelDebug.cpp
index 49338ae0f..1af320fa7 100644
--- a/libraries/KernelDebug/src/KernelDebug.cpp
+++ b/libraries/KernelDebug/src/KernelDebug.cpp
@@ -17,6 +17,7 @@
 #include <MRI.h>
 #include <cmsis_os2.h>
 #include <rtx_os.h>
+#include "Arduino.h"
 #include "KernelDebug.h"
 
 // Put armv7-m module into handler mode before including its header and source code.
diff --git a/libraries/KernelDebug/src/KernelDebug.h b/libraries/KernelDebug/src/KernelDebug.h
index 014ae1df8..1e27dde5d 100644
--- a/libraries/KernelDebug/src/KernelDebug.h
+++ b/libraries/KernelDebug/src/KernelDebug.h
@@ -30,9 +30,8 @@
 */
 #pragma once
 
-#include <mbed.h>
 #include <pinDefinitions.h>
-
+#include <mbed.h>
 
 namespace arduino {