Fixed include order (#245)

See wpilibsuite/styleguide (#11).

wpilibc/sim/include/DriverStation.h

@@ -7,12 +7,6 @@
 
 #pragma once
 
-#ifdef _WIN32
-// Ensure that Winsock2.h is included before Windows.h, which can get
-// pulled in by anybody (e.g., Boost).
-#include <Winsock2.h>
-#endif
-
 #include <condition_variable>
 #include <mutex>
 #include <string>
@@ -23,6 +17,12 @@
 #include "SensorBase.h"
 #include "simulation/gz_msgs/msgs.h"
 
+#ifdef _WIN32
+// Ensure that Winsock2.h is included before Windows.h, which can get
+// pulled in by anybody (e.g., Boost).
+#include <Winsock2.h>
+#endif
+
 struct HALCommonControlData;
 class AnalogInput;
 

wpilibc/sim/include/Joystick.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <memory>
+
 #include "ErrorBase.h"
 #include "GenericHID.h"
 

wpilibc/sim/include/RobotDrive.h

@@ -10,6 +10,7 @@
 #include <stdint.h>
 
 #include <memory>
+
 #include "ErrorBase.h"
 #include "MotorSafety.h"
 #include "MotorSafetyHelper.h"

wpilibc/sim/include/SafePWM.h

@@ -8,6 +8,7 @@
 #pragma once
 
 #include <memory>
+
 #include "MotorSafety.h"
 #include "MotorSafetyHelper.h"
 #include "PWM.h"

wpilibc/sim/include/WPILib.h

@@ -9,15 +9,17 @@
 
 #define SIMULATION "gazebo"
 
+#include <cstring>
 #include <iostream>
-#include "string.h"
 
+#include "AnalogGyro.h"
+#include "AnalogInput.h"
+#include "AnalogPotentiometer.h"
 #include "Buttons/Button.h"
 #include "Buttons/InternalButton.h"
 #include "Buttons/JoystickButton.h"
 #include "Buttons/NetworkButton.h"
 #include "Buttons/Trigger.h"
-
 #include "Commands/Command.h"
 #include "Commands/CommandGroup.h"
 #include "Commands/PIDCommand.h"
@@ -29,13 +31,6 @@
 #include "Commands/WaitCommand.h"
 #include "Commands/WaitForChildren.h"
 #include "Commands/WaitUntilCommand.h"
-
-#include "SmartDashboard/SendableChooser.h"
-#include "SmartDashboard/SmartDashboard.h"
-
-#include "AnalogGyro.h"
-#include "AnalogInput.h"
-#include "AnalogPotentiometer.h"
 #include "Counter.h"
 #include "DigitalInput.h"
 #include "DoubleSolenoid.h"
@@ -49,6 +44,8 @@
 #include "RobotBase.h"
 #include "RobotDrive.h"
 #include "SampleRobot.h"
+#include "SmartDashboard/SendableChooser.h"
+#include "SmartDashboard/SmartDashboard.h"
 #include "Solenoid.h"
 #include "SpeedController.h"
 #include "Talon.h"

wpilibc/sim/include/simulation/SimContinuousOutput.h

@@ -7,18 +7,18 @@
 
 #pragma once
 
-#ifdef _WIN32
-// Ensure that Winsock2.h is included before Windows.h, which can get
-// pulled in by anybody (e.g., Boost).
-#include <Winsock2.h>
-#endif
-
 #include <string>
 
 #include <gazebo/transport/transport.hh>
 
 #include "SpeedController.h"
 
+#ifdef _WIN32
+// Ensure that Winsock2.h is included before Windows.h, which can get
+// pulled in by anybody (e.g., Boost).
+#include <Winsock2.h>
+#endif
+
 using namespace gazebo;
 
 class SimContinuousOutput {

wpilibc/sim/include/simulation/simTime.h

@@ -7,17 +7,17 @@
 
 #pragma once
 
+#include <condition_variable>
+#include <mutex>
+
+#include "simulation/SimFloatInput.h"
+
 #ifdef _WIN32
 // Ensure that Winsock2.h is included before Windows.h, which can get
 // pulled in by anybody (e.g., Boost).
 #include <Winsock2.h>
 #endif
 
-#include <condition_variable>
-#include <mutex>
-
-#include "simulation/SimFloatInput.h"
-
 namespace wpilib {
 namespace internal {
 extern double simTime;