1 files changed, 8 insertions, 13 deletions
diff --git a/StarsEx/System.h b/StarsEx/System.h
index 70262a8..1652d59 100644
--- a/StarsEx/System.h
+++ b/StarsEx/System.h
@@ -11,15 +11,13 @@
     Generic ship System class
 */
 
-#ifndef System_h
-#define System_h
+#pragma once
 
-#include "Types.h"
-#include "Physical.h"
-#include "Geometry.h"
+#include <List.h>
+#include <Text.h>
 
-#include "List.h"
-#include "Text.h"
+#include "Geometry.h"
+#include "Physical.h"
 
 // +--------------------------------------------------------------------+
 
@@ -157,10 +155,10 @@ protected:
     float             sink_rate;
     float             power_level;
     int               source_index;
-    DWORD             power_flags;
+    std::uint32_t     power_flags;
     bool              power_on;
-    BYTE              emcon_power[3];
-    BYTE              emcon;
+    std::uint8_t      emcon_power[3];
+    std::uint8_t      emcon;
 
     int               explosion_type;
 
@@ -168,6 +166,3 @@ protected:
     SystemDesign*     design;
     List<Component>   components;
 };
-
-#endif  // System_h
-