diff --git a/ion/src/shared/dummy/backlight.cpp b/ion/src/shared/dummy/backlight.cpp
index 657122482..651f3bf23 100644
--- a/ion/src/shared/dummy/backlight.cpp
+++ b/ion/src/shared/dummy/backlight.cpp
@@ -1,13 +1,24 @@
 #include <ion/backlight.h>
 
-uint8_t Ion::Backlight::brightness() {
+namespace Ion {
+namespace Backlight {
+
+uint8_t brightness() {
   return 0;
 }
 
-void Ion::Backlight::setBrightness(uint8_t b) {}
+void setBrightness(uint8_t b) {
+}
 
-void Ion::Backlight::init() {}
+void init() {
+}
 
-bool Ion::Backlight::isInitialized() { return true; }
+bool isInitialized() {
+  return true;
+}
 
-void Ion::Backlight::shutdown() {}
+void shutdown() {
+}
+
+}
+}
diff --git a/ion/src/shared/dummy/display.cpp b/ion/src/shared/dummy/display.cpp
index de76e0d91..a5b075ceb 100644
--- a/ion/src/shared/dummy/display.cpp
+++ b/ion/src/shared/dummy/display.cpp
@@ -1,16 +1,22 @@
 #include <ion/display.h>
 
-void Ion::Display::POSTPushMulticolor(int rootNumberTiles, int tileSize) {
+namespace Ion {
+namespace Display {
+
+void POSTPushMulticolor(int rootNumberTiles, int tileSize) {
 }
 
-int Ion::Display::displayUniformTilingSize10(KDColor c) {
+int displayUniformTilingSize10(KDColor c) {
   return 0;
 }
 
-int Ion::Display::displayColoredTilingSize10() {
+int displayColoredTilingSize10() {
   return 0;
 }
 
-bool Ion::Display::waitForVBlank() {
+bool waitForVBlank() {
   return true;
 }
+
+}
+}
diff --git a/ion/src/shared/dummy/fcc_id.cpp b/ion/src/shared/dummy/fcc_id.cpp
index 4635993d0..daf908c81 100644
--- a/ion/src/shared/dummy/fcc_id.cpp
+++ b/ion/src/shared/dummy/fcc_id.cpp
@@ -1,5 +1,4 @@
 #include <ion.h>
-#include <assert.h>
 
 const char * Ion::fccId() {
   return "NA";
diff --git a/ion/src/shared/dummy/led.cpp b/ion/src/shared/dummy/led.cpp
index 91e0cb0b4..034d048a0 100644
--- a/ion/src/shared/dummy/led.cpp
+++ b/ion/src/shared/dummy/led.cpp
@@ -7,9 +7,11 @@ KDColor getColor() {
   return KDColorBlack;
 }
 
-void setColor(KDColor c) {}
+void setColor(KDColor c) {
+}
 
-void setBlinking(uint16_t period, float dutyCycle) {}
+void setBlinking(uint16_t period, float dutyCycle) {
+}
 
 KDColor updateColorWithPlugAndCharge() {
   return KDColorBlack;
diff --git a/ion/src/shared/dummy/power.cpp b/ion/src/shared/dummy/power.cpp
new file mode 100644
index 000000000..f95af846f
--- /dev/null
+++ b/ion/src/shared/dummy/power.cpp
@@ -0,0 +1,13 @@
+#include <ion/power.h>
+
+namespace Ion {
+namespace Power {
+
+void suspend(bool checkIfOnOffKeyReleased) {
+}
+
+void standby() {
+}
+
+}
+}
diff --git a/ion/src/shared/dummy/usb.cpp b/ion/src/shared/dummy/usb.cpp
index b118ae964..ce3c0fd2c 100644
--- a/ion/src/shared/dummy/usb.cpp
+++ b/ion/src/shared/dummy/usb.cpp
@@ -1,21 +1,27 @@
 #include <ion/usb.h>
 
-bool Ion::USB::isPlugged() {
+namespace Ion {
+namespace USB {
+
+bool isPlugged() {
   return false;
 }
 
-bool Ion::USB::isEnumerated() {
+bool isEnumerated() {
   return false;
 }
 
-void Ion::USB::clearEnumerationInterrupt() {
+void clearEnumerationInterrupt() {
 }
 
-void Ion::USB::DFU(bool) {
+void DFU(bool) {
 }
 
-void Ion::USB::enable() {
+void enable() {
 }
 
-void Ion::USB::disable() {
+void disable() {
+}
+
+}
 }
diff --git a/ion/src/simulator/shared/power.cpp b/ion/src/simulator/shared/power.cpp
deleted file mode 100644
index be918d1df..000000000
--- a/ion/src/simulator/shared/power.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <ion.h>
-
-void Ion::Power::suspend(bool checkIfOnOffKeyReleased) {
-}
-
-void Ion::Power::standby() {
-}