diff --git a/wpilibc/Athena/include/AnalogAccelerometer.h b/wpilibc/Athena/include/AnalogAccelerometer.h
index deec3fa9d2..4dc5cb77aa 100644
--- a/wpilibc/Athena/include/AnalogAccelerometer.h
+++ b/wpilibc/Athena/include/AnalogAccelerometer.h
@@ -55,5 +55,5 @@ class AnalogAccelerometer : public SensorBase,
   float m_zeroGVoltage = 2.5;
   bool m_allocatedChannel;
 
-  std::shared_ptr<ITable> m_table = nullptr;
+  std::shared_ptr<ITable> m_table;
 };
diff --git a/wpilibc/Athena/include/AnalogInput.h b/wpilibc/Athena/include/AnalogInput.h
index 24870dc938..d47d1f2b53 100644
--- a/wpilibc/Athena/include/AnalogInput.h
+++ b/wpilibc/Athena/include/AnalogInput.h
@@ -82,5 +82,5 @@ class AnalogInput : public SensorBase,
   void *m_port;
   int64_t m_accumulatorOffset;
 
-  std::shared_ptr<ITable> m_table = nullptr;
+  std::shared_ptr<ITable> m_table;
 };
diff --git a/wpilibc/Athena/include/AnalogOutput.h b/wpilibc/Athena/include/AnalogOutput.h
index 9db5333777..db02d838fe 100644
--- a/wpilibc/Athena/include/AnalogOutput.h
+++ b/wpilibc/Athena/include/AnalogOutput.h
@@ -34,5 +34,5 @@ class AnalogOutput : public SensorBase, public LiveWindowSendable {
   uint32_t m_channel;
   void *m_port;
 
-  std::shared_ptr<ITable> m_table = nullptr;
+  std::shared_ptr<ITable> m_table;
 };
diff --git a/wpilibc/Athena/include/BuiltInAccelerometer.h b/wpilibc/Athena/include/BuiltInAccelerometer.h
index 82ba029ce7..b6b5f8e80f 100644
--- a/wpilibc/Athena/include/BuiltInAccelerometer.h
+++ b/wpilibc/Athena/include/BuiltInAccelerometer.h
@@ -37,5 +37,5 @@ class BuiltInAccelerometer : public Accelerometer,
   virtual void StopLiveWindowMode() override {}
 
  private:
-  std::shared_ptr<ITable> m_table = nullptr;
+  std::shared_ptr<ITable> m_table;
 };
diff --git a/wpilibc/Athena/include/CANJaguar.h b/wpilibc/Athena/include/CANJaguar.h
index 2c451bd303..b6eebf623c 100644
--- a/wpilibc/Athena/include/CANJaguar.h
+++ b/wpilibc/Athena/include/CANJaguar.h
@@ -242,7 +242,7 @@ class CANJaguar : public MotorSafety,
   void InitTable(std::shared_ptr<ITable> subTable) override;
   std::shared_ptr<ITable> GetTable() const override;
 
-  std::shared_ptr<ITable> m_table = nullptr;
+  std::shared_ptr<ITable> m_table;
 
  private:
   void InitCANJaguar();
diff --git a/wpilibc/Athena/include/Compressor.h b/wpilibc/Athena/include/Compressor.h
index 7c3d73723e..d5962c370d 100644
--- a/wpilibc/Athena/include/Compressor.h
+++ b/wpilibc/Athena/include/Compressor.h
@@ -59,7 +59,7 @@ class Compressor : public SensorBase,
  private:
   void SetCompressor(bool on);
 
-  std::shared_ptr<ITable> m_table = nullptr;
+  std::shared_ptr<ITable> m_table;
 };
 
 #endif /* Compressor_H_ */
diff --git a/wpilibc/Athena/include/Counter.h b/wpilibc/Athena/include/Counter.h
index a93eb3c604..c5c40a91bf 100644
--- a/wpilibc/Athena/include/Counter.h
+++ b/wpilibc/Athena/include/Counter.h
@@ -118,5 +118,5 @@ class Counter : public SensorBase,
  private:
   uint32_t m_index = 0;            ///< The index of this counter.
 
-  std::shared_ptr<ITable> m_table = nullptr;
+  std::shared_ptr<ITable> m_table;
 };
diff --git a/wpilibc/Athena/include/DigitalInput.h b/wpilibc/Athena/include/DigitalInput.h
index cf6e927c44..d47693c863 100644
--- a/wpilibc/Athena/include/DigitalInput.h
+++ b/wpilibc/Athena/include/DigitalInput.h
@@ -43,5 +43,5 @@ class DigitalInput : public DigitalSource, public LiveWindowSendable {
  private:
   uint32_t m_channel;
 
-  std::shared_ptr<ITable> m_table = nullptr;
+  std::shared_ptr<ITable> m_table;
 };
diff --git a/wpilibc/Athena/include/DigitalOutput.h b/wpilibc/Athena/include/DigitalOutput.h
index 1c0790caee..367fb8073b 100644
--- a/wpilibc/Athena/include/DigitalOutput.h
+++ b/wpilibc/Athena/include/DigitalOutput.h
@@ -51,5 +51,5 @@ class DigitalOutput : public DigitalSource,
   uint32_t m_channel;
   void *m_pwmGenerator;
 
-  std::shared_ptr<ITable> m_table = nullptr;
+  std::shared_ptr<ITable> m_table;
 };
diff --git a/wpilibc/Athena/include/DoubleSolenoid.h b/wpilibc/Athena/include/DoubleSolenoid.h
index 949c1b40a5..fd2039705a 100644
--- a/wpilibc/Athena/include/DoubleSolenoid.h
+++ b/wpilibc/Athena/include/DoubleSolenoid.h
@@ -49,5 +49,5 @@ class DoubleSolenoid : public SolenoidBase,
   uint8_t m_forwardMask;      ///< The mask for the forward channel.
   uint8_t m_reverseMask;      ///< The mask for the reverse channel.
 
-  std::shared_ptr<ITable> m_table = nullptr;
+  std::shared_ptr<ITable> m_table;
 };
diff --git a/wpilibc/Athena/include/Encoder.h b/wpilibc/Athena/include/Encoder.h
index c8ee1dd102..9909cf001b 100644
--- a/wpilibc/Athena/include/Encoder.h
+++ b/wpilibc/Athena/include/Encoder.h
@@ -115,5 +115,5 @@ class Encoder : public SensorBase,
   EncodingType m_encodingType;     // Encoding type
   int32_t m_encodingScale;         // 1x, 2x, or 4x, per the encodingType
 
-  std::shared_ptr<ITable> m_table = nullptr;
+  std::shared_ptr<ITable> m_table;
 };
diff --git a/wpilibc/Athena/include/PWM.h b/wpilibc/Athena/include/PWM.h
index b99c61acfb..b7120c081a 100644
--- a/wpilibc/Athena/include/PWM.h
+++ b/wpilibc/Athena/include/PWM.h
@@ -108,7 +108,7 @@ class PWM : public SensorBase,
   void InitTable(std::shared_ptr<ITable> subTable) override;
   std::shared_ptr<ITable> GetTable() const override;
 
-  std::shared_ptr<ITable> m_table = nullptr;
+  std::shared_ptr<ITable> m_table;
 
  private:
   uint32_t m_channel;
diff --git a/wpilibc/Athena/include/PowerDistributionPanel.h b/wpilibc/Athena/include/PowerDistributionPanel.h
index 112fb58650..9a1bd7c583 100644
--- a/wpilibc/Athena/include/PowerDistributionPanel.h
+++ b/wpilibc/Athena/include/PowerDistributionPanel.h
@@ -41,7 +41,7 @@ class PowerDistributionPanel : public SensorBase, public LiveWindowSendable {
   std::shared_ptr<ITable> GetTable() const override;
 
  private:
-  std::shared_ptr<ITable> m_table = nullptr;
+  std::shared_ptr<ITable> m_table;
   uint8_t m_module;
 };
 
diff --git a/wpilibc/Athena/include/Relay.h b/wpilibc/Athena/include/Relay.h
index bd1b91c0c4..f582221b98 100644
--- a/wpilibc/Athena/include/Relay.h
+++ b/wpilibc/Athena/include/Relay.h
@@ -62,7 +62,7 @@ class Relay : public MotorSafety,
   void InitTable(std::shared_ptr<ITable> subTable) override;
   std::shared_ptr<ITable> GetTable() const override;
 
-  std::shared_ptr<ITable> m_table = nullptr;
+  std::shared_ptr<ITable> m_table;
 
  private:
   uint32_t m_channel;
diff --git a/wpilibc/Athena/include/RobotDrive.h b/wpilibc/Athena/include/RobotDrive.h
index eb42f42f63..ff03e1d198 100644
--- a/wpilibc/Athena/include/RobotDrive.h
+++ b/wpilibc/Athena/include/RobotDrive.h
@@ -114,10 +114,10 @@ class RobotDrive : public MotorSafety, public ErrorBase {
   static const int32_t kMaxNumberOfMotors = 4;
   float m_sensitivity = 0.5;
   double m_maxOutput = 1.0;
-  std::shared_ptr<SpeedController> m_frontLeftMotor = nullptr;
-  std::shared_ptr<SpeedController> m_frontRightMotor = nullptr;
-  std::shared_ptr<SpeedController> m_rearLeftMotor = nullptr;
-  std::shared_ptr<SpeedController> m_rearRightMotor = nullptr;
+  std::shared_ptr<SpeedController> m_frontLeftMotor;
+  std::shared_ptr<SpeedController> m_frontRightMotor;
+  std::shared_ptr<SpeedController> m_rearLeftMotor;
+  std::shared_ptr<SpeedController> m_rearRightMotor;
   std::unique_ptr<MotorSafetyHelper> m_safetyHelper;
   uint8_t m_syncGroup = 0;
 
diff --git a/wpilibc/Athena/include/Servo.h b/wpilibc/Athena/include/Servo.h
index 4669835932..040d9d172f 100644
--- a/wpilibc/Athena/include/Servo.h
+++ b/wpilibc/Athena/include/Servo.h
@@ -39,7 +39,7 @@ class Servo : public SafePWM {
   void InitTable(std::shared_ptr<ITable> subTable) override;
   std::shared_ptr<ITable> GetTable() const override;
 
-  std::shared_ptr<ITable> m_table = nullptr;
+  std::shared_ptr<ITable> m_table;
 
  private:
   float GetServoAngleRange() const { return kMaxServoAngle - kMinServoAngle; }
diff --git a/wpilibc/Athena/include/Solenoid.h b/wpilibc/Athena/include/Solenoid.h
index fd550037a1..dc3d53afbe 100644
--- a/wpilibc/Athena/include/Solenoid.h
+++ b/wpilibc/Athena/include/Solenoid.h
@@ -41,5 +41,5 @@ class Solenoid : public SolenoidBase,
 
  private:
   uint32_t m_channel;  ///< The channel on the module to control.
-  std::shared_ptr<ITable> m_table = nullptr;
+  std::shared_ptr<ITable> m_table;
 };
diff --git a/wpilibc/Athena/include/Ultrasonic.h b/wpilibc/Athena/include/Ultrasonic.h
index 5f9df650ff..e4ba573657 100644
--- a/wpilibc/Athena/include/Ultrasonic.h
+++ b/wpilibc/Athena/include/Ultrasonic.h
@@ -107,5 +107,5 @@ class Ultrasonic : public SensorBase,
   Ultrasonic *m_nextSensor;
   DistanceUnit m_units;
 
-  std::shared_ptr<ITable> m_table = nullptr;
+  std::shared_ptr<ITable> m_table;
 };
diff --git a/wpilibc/shared/include/Buttons/Trigger.h b/wpilibc/shared/include/Buttons/Trigger.h
index 34aa6334e9..3a05995ca6 100644
--- a/wpilibc/shared/include/Buttons/Trigger.h
+++ b/wpilibc/shared/include/Buttons/Trigger.h
@@ -47,7 +47,7 @@ class Trigger : public Sendable {
   virtual std::string GetSmartDashboardType() const;
 
  protected:
-  std::shared_ptr<ITable> m_table = nullptr;
+  std::shared_ptr<ITable> m_table;
 };
 
 #endif
diff --git a/wpilibc/shared/include/Commands/Command.h b/wpilibc/shared/include/Commands/Command.h
index 5497701109..6ec55121de 100644
--- a/wpilibc/shared/include/Commands/Command.h
+++ b/wpilibc/shared/include/Commands/Command.h
@@ -184,7 +184,7 @@ class Command : public ErrorBase, public NamedSendable, public ITableListener {
                             std::shared_ptr<nt::Value> value, bool isNew);
 
  protected:
-  std::shared_ptr<ITable> m_table = nullptr;
+  std::shared_ptr<ITable> m_table;
 };
 
 #endif
diff --git a/wpilibc/shared/include/Commands/Scheduler.h b/wpilibc/shared/include/Commands/Scheduler.h
index 1bd4affc03..065fbadce8 100644
--- a/wpilibc/shared/include/Commands/Scheduler.h
+++ b/wpilibc/shared/include/Commands/Scheduler.h
@@ -64,7 +64,7 @@ class Scheduler : public ErrorBase, public NamedSendable {
   std::vector<std::string> commands;
   std::vector<double> ids;
   std::vector<double> toCancel;
-  std::shared_ptr<ITable> m_table = nullptr;
+  std::shared_ptr<ITable> m_table;
   bool m_runningCommandsChanged = false;
 };
 #endif
diff --git a/wpilibc/shared/include/Commands/Subsystem.h b/wpilibc/shared/include/Commands/Subsystem.h
index b4a5604050..8762ec8251 100644
--- a/wpilibc/shared/include/Commands/Subsystem.h
+++ b/wpilibc/shared/include/Commands/Subsystem.h
@@ -44,7 +44,7 @@ class Subsystem : public ErrorBase, public NamedSendable {
   virtual std::string GetSmartDashboardType() const;
 
  protected:
-  std::shared_ptr<ITable> m_table = nullptr;
+  std::shared_ptr<ITable> m_table;
 };
 
 #endif
diff --git a/wpilibc/shared/src/RobotState.cpp b/wpilibc/shared/src/RobotState.cpp
index 127c50ca4f..cb2820844c 100644
--- a/wpilibc/shared/src/RobotState.cpp
+++ b/wpilibc/shared/src/RobotState.cpp
@@ -2,7 +2,7 @@
 
 #include "Base.h"
 
-std::shared_ptr<RobotStateInterface> RobotState::impl = nullptr;
+std::shared_ptr<RobotStateInterface> RobotState::impl;
 
 void RobotState::SetImplementation(RobotStateInterface& i) {
   impl = std::shared_ptr<RobotStateInterface>(
diff --git a/wpilibc/shared/src/SmartDashboard/SmartDashboard.cpp b/wpilibc/shared/src/SmartDashboard/SmartDashboard.cpp
index b6a38ae020..bee0c03215 100644
--- a/wpilibc/shared/src/SmartDashboard/SmartDashboard.cpp
+++ b/wpilibc/shared/src/SmartDashboard/SmartDashboard.cpp
@@ -13,7 +13,7 @@
 #include "networktables/NetworkTable.h"
 #include "HLUsageReporting.h"
 
-std::shared_ptr<ITable> SmartDashboard::m_table = nullptr;
+std::shared_ptr<ITable> SmartDashboard::m_table;
 std::map<std::shared_ptr<ITable> , Sendable *> SmartDashboard::m_tablesToData;
 
 void SmartDashboard::init() {
diff --git a/wpilibc/simulation/include/AnalogInput.h b/wpilibc/simulation/include/AnalogInput.h
index 9ce15d31c2..59a3a85952 100644
--- a/wpilibc/simulation/include/AnalogInput.h
+++ b/wpilibc/simulation/include/AnalogInput.h
@@ -51,5 +51,5 @@ private:
 	SimFloatInput* m_impl;
 	int64_t m_accumulatorOffset;
 
-	std::shared_ptr<ITable> m_table = nullptr;
+	std::shared_ptr<ITable> m_table;
 };
diff --git a/wpilibc/simulation/include/DigitalInput.h b/wpilibc/simulation/include/DigitalInput.h
index 632da8b0b7..1482e9cabb 100644
--- a/wpilibc/simulation/include/DigitalInput.h
+++ b/wpilibc/simulation/include/DigitalInput.h
@@ -36,5 +36,5 @@ private:
 	bool m_lastValue;
 	SimDigitalInput *m_impl;
 
-	std::shared_ptr<ITable> m_table = nullptr;
+	std::shared_ptr<ITable> m_table;
 };
diff --git a/wpilibc/simulation/include/Gyro.h b/wpilibc/simulation/include/Gyro.h
index 9503738ab3..7e4e40ae75 100644
--- a/wpilibc/simulation/include/Gyro.h
+++ b/wpilibc/simulation/include/Gyro.h
@@ -56,5 +56,5 @@ private:
 
 	SimGyro* impl;
 
-	std::shared_ptr<ITable> m_table = nullptr;
+	std::shared_ptr<ITable> m_table;
 };
diff --git a/wpilibc/simulation/include/PWM.h b/wpilibc/simulation/include/PWM.h
index dd29a9376d..52007fb661 100644
--- a/wpilibc/simulation/include/PWM.h
+++ b/wpilibc/simulation/include/PWM.h
@@ -96,7 +96,7 @@ protected:
 	void InitTable(std::shared_ptr<ITable> subTable) override;
 	std::shared_ptr<ITable> GetTable() const override;
 
-	std::shared_ptr<ITable> m_table = nullptr;
+	std::shared_ptr<ITable> m_table;
 
 private:
 	uint32_t m_channel;
diff --git a/wpilibc/simulation/include/Relay.h b/wpilibc/simulation/include/Relay.h
index a96b9b6568..abc9ad5ed9 100644
--- a/wpilibc/simulation/include/Relay.h
+++ b/wpilibc/simulation/include/Relay.h
@@ -69,7 +69,7 @@ public:
 	void InitTable(std::shared_ptr<ITable> subTable) override;
 	std::shared_ptr<ITable> GetTable() const override;
 
-	std::shared_ptr<ITable> m_table = nullptr;
+	std::shared_ptr<ITable> m_table;
 
 private:
 	uint32_t m_channel;