diff --git a/libraries/audio/src/AudioDynamics.h b/libraries/audio/src/AudioDynamics.h
index 6f36605025..a43833610a 100644
--- a/libraries/audio/src/AudioDynamics.h
+++ b/libraries/audio/src/AudioDynamics.h
@@ -10,6 +10,7 @@
 // Inline functions to implement audio dynamics processing
 //
 
+#include <stddef.h>
 #include <math.h>
 #include <stdint.h>
 
diff --git a/libraries/shared/src/OctalCode.cpp b/libraries/shared/src/OctalCode.cpp
index b1ceab4149..c7ad4a790d 100644
--- a/libraries/shared/src/OctalCode.cpp
+++ b/libraries/shared/src/OctalCode.cpp
@@ -213,7 +213,7 @@ void setOctalCodeSectionValue(unsigned char* octalCode, int section, char sectio
     int byteForSection = (BITS_IN_OCTAL * section / BITS_IN_BYTE);
     unsigned char* byteAt = octalCode + 1 + byteForSection;
     char bitInByte = (BITS_IN_OCTAL * section) % BITS_IN_BYTE;
-    char shiftBy = BITS_IN_BYTE - bitInByte - BITS_IN_OCTAL;
+    int8_t shiftBy = BITS_IN_BYTE - bitInByte - BITS_IN_OCTAL;
     const unsigned char UNSHIFTED_MASK = 0x07;
     unsigned char shiftedMask;
     unsigned char shiftedValue;