diff --git a/mission/devices/devicedefinitions/GomspaceDefinitions.h b/mission/devices/devicedefinitions/GomspaceDefinitions.h
index 40a4fc59..5d435375 100644
--- a/mission/devices/devicedefinitions/GomspaceDefinitions.h
+++ b/mission/devices/devicedefinitions/GomspaceDefinitions.h
@@ -208,8 +208,8 @@ static const uint16_t MAX_CONFIGTABLE_ADDRESS = 408;
 static const uint16_t MAX_HKTABLE_ADDRESS = 187;
 // Sources:
 // GomSpace library lib/p60-dock_client/include/gs/p60-dock/param
-static const uint16_t HK_TABLE_SIZE = P60DOCK_HK_SIZE;
-static const uint16_t CONFIG_TABLE_SIZE = P60DOCK_PARAM_SIZE;
+static const uint16_t HK_TABLE_SIZE = gsConstants::P60DOCK_HK_SIZE;
+static const uint16_t CONFIG_TABLE_SIZE = gsConstants::P60DOCK_PARAM_SIZE;
 static const size_t MAX_REPLY_SIZE = CONFIG_TABLE_SIZE;
 static const uint16_t CAL_TABLE = 0xAE;
 static const uint8_t HK_TABLE_ENTRIES = 100;
@@ -385,8 +385,8 @@ enum Ids {
 static const uint16_t MAX_CONFIGTABLE_ADDRESS = 316;
 static const uint16_t MAX_HKTABLE_ADDRESS = 141;
 /** The size of the csp reply containing the housekeeping table data */
-static const uint16_t HK_TABLE_SIZE = P60PDU_HK_SIZE;
-static const uint16_t CONFIG_TABLE_SIZE = P60PDU_PARAM_SIZE;
+static const uint16_t HK_TABLE_SIZE = gsConstants::P60PDU_HK_SIZE;
+static const uint16_t CONFIG_TABLE_SIZE = gsConstants::P60PDU_PARAM_SIZE;
 /** When retrieving full configuration parameter table */
 static const uint16_t MAX_REPLY_SIZE = CONFIG_TABLE_SIZE;
 static const uint8_t HK_TABLE_ENTRIES = 73;
@@ -654,8 +654,8 @@ enum Ids : lp_id_t {
 static const uint16_t MAX_CONFIGTABLE_ADDRESS = 26;
 static const uint16_t MAX_HKTABLE_ADDRESS = 120;
 static const uint8_t HK_TABLE_ENTRIES = 64;
-static const uint16_t HK_TABLE_SIZE = P60ACU_HK_SIZE;
-static const uint16_t CONFIG_TABLE_SIZE = P60ACU_PARAM_SIZE;
+static const uint16_t HK_TABLE_SIZE = gsConstants::P60ACU_HK_SIZE;
+static const uint16_t CONFIG_TABLE_SIZE = gsConstants::P60ACU_PARAM_SIZE;
 static const size_t MAX_REPLY_SIZE = HK_TABLE_SIZE;
 
 class CoreHk : public StaticLocalDataSet<14> {
diff --git a/mission/devices/devicedefinitions/gomspaceDefines.h b/mission/devices/devicedefinitions/gomspaceDefines.h
index af96c228..92c02d6b 100644
--- a/mission/devices/devicedefinitions/gomspaceDefines.h
+++ b/mission/devices/devicedefinitions/gomspaceDefines.h
@@ -3,7 +3,23 @@
 
 #include "fsfw/platform.h"
 
-#ifdef PLATFORM_WIN
+#ifdef PLATFORM_UNIX
+
+// I really don't want to pull in all of those GomSpace headers just for 6 constants..
+// Those are the headers which contain the defines which were just hardcoded below.
+
+//#include "p60acu_hk.h"
+//#include "p60acu_param.h"
+//#include "p60dock_hk.h"
+//#include "p60dock_param.h"
+//#include "p60pdu_hk.h"
+//#include "p60pdu_param.h"
+
+#endif
+
+#include <cstdint>
+
+namespace gsConstants {
 
 static constexpr uint32_t P60DOCK_HK_SIZE = 0xBE;
 static constexpr uint32_t P60DOCK_PARAM_SIZE = 0x19C;
@@ -12,15 +28,6 @@ static constexpr uint32_t P60PDU_PARAM_SIZE = 0x13E;
 static constexpr uint32_t P60ACU_HK_SIZE = 0x7C;
 static constexpr uint32_t P60ACU_PARAM_SIZE = 0x1B;
 
-#else
-
-#include "p60acu_hk.h"
-#include "p60acu_param.h"
-#include "p60dock_hk.h"
-#include "p60dock_param.h"
-#include "p60pdu_hk.h"
-#include "p60pdu_param.h"
-
-#endif
+}
 
 #endif /* MISSION_DEVICES_DEVICEDEFINITIONS_GOMSPACEDEFINES_H_ */