diff --git a/CMakeLists.txt b/CMakeLists.txt
index 609c575e8..581939c6a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -268,7 +268,7 @@ set(FW_SOURCES
     tmc2130.cpp
     tone04.c
     twi.cpp
-    uart2.c
+    uart2.cpp
     ultralcd.cpp
     util.cpp
     xflash.c
diff --git a/Firmware/uart2.c b/Firmware/uart2.cpp
similarity index 98%
rename from Firmware/uart2.c
rename to Firmware/uart2.cpp
index 994d11d81..bdc5b1192 100644
--- a/Firmware/uart2.c
+++ b/Firmware/uart2.cpp
@@ -10,7 +10,7 @@
 #define uart2_txready    (UCSR2A & (1 << UDRE2))
 
 uint8_t uart2_ibuf[20] = {0, 0};
-FILE _uart2io = {0};
+FILE _uart2io;
 
 static int uart2_putchar(char c, _UNUSED FILE *stream)
 {
diff --git a/Firmware/uart2.h b/Firmware/uart2.h
index fdb444aa2..f02326892 100644
--- a/Firmware/uart2.h
+++ b/Firmware/uart2.h
@@ -5,19 +5,9 @@
 #include <inttypes.h>
 #include <stdio.h>
 
-
-#if defined(__cplusplus)
-extern "C" {
-#endif //defined(__cplusplus)
-
-
 extern FILE _uart2io;
 #define uart2io (&_uart2io)
 
+void uart2_init(uint32_t baudRate);
 
-extern void uart2_init(uint32_t baudRate);
-
-#if defined(__cplusplus)
-}
-#endif //defined(__cplusplus)
 #endif //_UART2_H