diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.properties b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.properties
index 5b3b05f584..020a9479e8 100644
--- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.properties
+++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.cpp/src/main/resources/cpp-zip/ant/build.properties
@@ -8,7 +8,7 @@ command.dir=/home/lvuser/
 # Libraries to use
 wpilib=${user.home}/wpilib/cpp/${cpp-version}
 wpilib.lib=${wpilib}/lib
-roboRIOAllowedImages=20
+roboRIOAllowedImages=22
 
 # Ant support
 wpilib.ant.dir=${wpilib}/ant
diff --git a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.properties b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.properties
index 91d60fb51d..5e4440e0e2 100644
--- a/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.properties
+++ b/eclipse-plugins/edu.wpi.first.wpilib.plugins.java/src/main/resources/java-zip/ant/build.properties
@@ -20,7 +20,7 @@ networktables.sources=${wpilib.lib}/NetworkTables-sources.jar
 #jnaerator.jar=${wpilib.lib}/jnaerator-runtime.jar
 #classpath=${wpilib.jar}:${networktables.jar}:${jna.jar}:${jnaerator.jar}
 classpath=${wpilib.jar}:${networktables.jar}
-roboRIOAllowedImages=20
+roboRIOAllowedImages=22
 
 # Ant support
 wpilib.ant.dir=${wpilib}/ant
diff --git a/hal/lib/Athena/i2clib/i2c-lib.h b/hal/lib/Athena/i2clib/i2c-lib.h
index 0a93fe5ea5..b34cb33d0a 100644
--- a/hal/lib/Athena/i2clib/i2c-lib.h
+++ b/hal/lib/Athena/i2clib/i2c-lib.h
@@ -1,16 +1,16 @@
-#pragma once
+#ifndef __I2C_LIB_H__
+#define __I2C_LIB_H__
 
 #ifdef __cplusplus
 extern "C" {
 #endif
-
 int i2clib_open(const char *device);
 void i2clib_close(int handle);
 int i2clib_read(int handle, uint8_t dev_addr, char *recv_buf, int32_t recv_size);
 int i2clib_write(int handle, uint8_t dev_addr, const char *send_buf, int32_t send_size);
 int i2clib_writeread(int handle, uint8_t dev_addr, const char *send_buf, int32_t send_size, char *recv_buf, int32_t recv_size);
-
 #ifdef __cplusplus
 }
 #endif
 
+#endif /* __I2C_LIB_H__ */
\ No newline at end of file
diff --git a/hal/lib/Athena/spilib/spi-lib.h b/hal/lib/Athena/spilib/spi-lib.h
index 54cdc93881..b5c2a7ae75 100644
--- a/hal/lib/Athena/spilib/spi-lib.h
+++ b/hal/lib/Athena/spilib/spi-lib.h
@@ -1,12 +1,9 @@
 #ifndef __SPI_LIB_H__
 #define __SPI_LIB_H__
 
-#pragma once
-
 #ifdef __cplusplus
 extern "C" {
 #endif
-
 int spilib_open(const char *device);
 void spilib_close(int handle);
 int spilib_setspeed(int handle, uint32_t speed);
@@ -15,11 +12,8 @@ int spilib_setopts(int handle, int msb_first, int sample_on_trailing, int clk_id
 int spilib_read(int handle, char *recv_buf, int32_t size);
 int spilib_write(int handle, const char *send_buf, int32_t size);
 int spilib_writeread(int handle, const char *send_buf, char *recv_buf, int32_t size);
-
 #ifdef __cplusplus
 }
 #endif
 
-#endif /* __SPI_LIB_H__ */
-
-
+#endif /* __SPI_LIB_H__ */
\ No newline at end of file
diff --git a/ni-libraries/libFRC_NetworkCommunication.so.1.5.0 b/ni-libraries/libFRC_NetworkCommunication.so.1.5.0
index ec11245317..48e69d739f 100755
Binary files a/ni-libraries/libFRC_NetworkCommunication.so.1.5.0 and b/ni-libraries/libFRC_NetworkCommunication.so.1.5.0 differ
diff --git a/ni-libraries/libFRC_NetworkCommunicationLV.so.1.5.0 b/ni-libraries/libFRC_NetworkCommunicationLV.so.1.5.0
index 586ea2ffc5..3b76ce967f 100755
Binary files a/ni-libraries/libFRC_NetworkCommunicationLV.so.1.5.0 and b/ni-libraries/libFRC_NetworkCommunicationLV.so.1.5.0 differ
diff --git a/ni-libraries/libRoboRIO_FRC_ChipObject.so.1.2.0 b/ni-libraries/libRoboRIO_FRC_ChipObject.so.1.2.0
index f6adf4ef70..316bdcee1d 100755
Binary files a/ni-libraries/libRoboRIO_FRC_ChipObject.so.1.2.0 and b/ni-libraries/libRoboRIO_FRC_ChipObject.so.1.2.0 differ