diff --git a/firmware/controllers/engine_controller_misc.cpp b/firmware/controllers/engine_controller_misc.cpp
index 5747b6936c..5dbd5d110c 100644
--- a/firmware/controllers/engine_controller_misc.cpp
+++ b/firmware/controllers/engine_controller_misc.cpp
@@ -63,7 +63,7 @@ void setMockMapVoltage(float voltage) {
 /**
  * 64-bit result would not overflow, but that's complex stuff for our 32-bit MCU
  */
-efitimeus_t getTimeNowUs(void) {
+efitimeus_t getTimeNowUs() {
 	ScopePerf perf(PE::GetTimeNowUs);
 	return NT2US(getTimeNowNt());
 }
diff --git a/firmware/util/efitime.h b/firmware/util/efitime.h
index 20a13b0dee..a183d21a61 100644
--- a/firmware/util/efitime.h
+++ b/firmware/util/efitime.h
@@ -50,9 +50,6 @@
 #define overflowDiff(now, time) ((now) - (time))
 
 #ifdef __cplusplus
-extern "C"
-{
-
 /**
  * Provide a 62-bit counter from a 32-bit counter source that wraps around.
  *
@@ -83,8 +80,6 @@ private:
 	volatile uint32_t m_upper = 0;
 };
 
-#endif /* __cplusplus */
-
 
 /**
  * 64-bit counter of microseconds (1/1 000 000 of a second) since MCU reset
@@ -95,7 +90,7 @@ private:
  * WARNING: you should use getTimeNowNt where possible for performance reasons.
  * The heaviest part is '__aeabi_ildivmod' - non-native 64 bit division
  */
-efitimeus_t getTimeNowUs(void);
+efitimeus_t getTimeNowUs();
 
 /**
  * 64-bit counter CPU cycles since MCU reset
@@ -104,22 +99,20 @@ efitimeus_t getTimeNowUs(void);
  * Lower 32 bits are enough if all we need is to measure relatively short time durations
  * (BTW 2^32 cpu cycles at 168MHz is 25.59 seconds)
  */
-efitick_t getTimeNowNt(void);
+efitick_t getTimeNowNt();
 
 /**
  * @brief   Returns the number of milliseconds since the board initialization.
  */
-efitimems_t currentTimeMillis(void);
+efitimems_t currentTimeMillis();
 
 /**
  * @brief   Current system time in seconds.
  */
-efitimesec_t getTimeNowSeconds(void);
+efitimesec_t getTimeNowSeconds();
 
 // Get a monotonically increasing (but wrapping) 32-bit timer value
-uint32_t getTimeNowLowerNt(void);
+uint32_t getTimeNowLowerNt();
 
-#ifdef __cplusplus
-}
 #endif /* __cplusplus */
 
diff --git a/unit_tests/engine_test_helper.cpp b/unit_tests/engine_test_helper.cpp
index 5758137408..b0bae5a851 100644
--- a/unit_tests/engine_test_helper.cpp
+++ b/unit_tests/engine_test_helper.cpp
@@ -277,7 +277,7 @@ void EngineTestHelper::setTimeAndInvokeEventsUs(int targetTime) {
 	timeNowUs = targetTime;
 }
 
-efitimeus_t EngineTestHelper::getTimeNowUs(void) {
+efitimeus_t EngineTestHelper::getTimeNowUs() {
 	return timeNowUs;
 }
 
diff --git a/unit_tests/engine_test_helper.h b/unit_tests/engine_test_helper.h
index 5a9d2f4e82..6184f063d4 100644
--- a/unit_tests/engine_test_helper.h
+++ b/unit_tests/engine_test_helper.h
@@ -95,7 +95,7 @@ public:
 	int executeActions();
 	void moveTimeForwardMs(float deltaTimeMs);
 	void moveTimeForwardSec(float deltaTimeSec);
-	efitimeus_t getTimeNowUs(void);
+	efitimeus_t getTimeNowUs();
 
 	Engine engine;
 	persistent_config_s persistentConfig;
diff --git a/unit_tests/global_mocks.cpp b/unit_tests/global_mocks.cpp
index b4ffc89d7e..0cca11d086 100644
--- a/unit_tests/global_mocks.cpp
+++ b/unit_tests/global_mocks.cpp
@@ -11,15 +11,15 @@ bool verboseMode = false;
 
 int timeNowUs = 0;
 
-efitimeus_t getTimeNowUs(void) {
+efitimeus_t getTimeNowUs() {
 	return timeNowUs;
 }
 
-efitimesec_t getTimeNowSeconds(void) {
+efitimesec_t getTimeNowSeconds() {
 	return getTimeNowUs() / 1000 / 1000;
 }
 
-efitick_t getTimeNowNt(void) {
+efitick_t getTimeNowNt() {
 	return getTimeNowUs() * US_TO_NT_MULTIPLIER;
 }