diff --git a/wpilibc/wpilibC++Devices/src/RobotBase.cpp b/wpilibc/wpilibC++Devices/src/RobotBase.cpp
index 9ec9ad4c0c..57022bd722 100644
--- a/wpilibc/wpilibC++Devices/src/RobotBase.cpp
+++ b/wpilibc/wpilibC++Devices/src/RobotBase.cpp
@@ -50,6 +50,8 @@ RobotBase::RobotBase()
 	, m_ds (NULL)
 {
 	m_ds = DriverStation::GetInstance();
+	RobotState::SetImplementation(DriverStation::GetInstance()); \
+	HLUsageReporting::SetImplementation(new HardwareHLReporting()); \
 }
 
 /**
@@ -152,9 +154,6 @@ void RobotBase::startRobotTask(FUNCPTR factory)
 	printf("WPILib was compiled without -D'SVN_REV=nnnn'\n");
 #endif
 
-    RobotState::SetImplementation(DriverStation::GetInstance());
-    HLUsageReporting::SetImplementation(new HardwareHLReporting());
-
 #ifdef __vxworks
 	// Check for startup code already running
 	int32_t oldId = taskNameToId(const_cast<char*>("FRC_RobotTask"));