diff --git a/firmware/Makefile b/firmware/Makefile
index bd0d962..84bdfda 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -163,6 +163,7 @@ INCDIR = $(CONFDIR) \
          util/math/ \
          console/binary/ \
          boards/ \
+         shared/ \
          $(BOARDDIR)/io/
 
 # Define C warning options here.
diff --git a/firmware/boards/f0_module/bootloader/bootloader.cpp b/firmware/boards/f0_module/bootloader/bootloader.cpp
index 8a63115..3d68fc4 100644
--- a/firmware/boards/f0_module/bootloader/bootloader.cpp
+++ b/firmware/boards/f0_module/bootloader/bootloader.cpp
@@ -2,6 +2,7 @@
 #include "port_shared.h"
 #include "flash.h"
 #include "io_pins.h"
+#include "crc.h"
 
 #include <cstring>
 
@@ -12,7 +13,6 @@ extern uint32_t __ram_vectors_start__[64];
 extern uint32_t __ram_vectors_size__;
 
 #define SWAP_UINT32(x) ((((x) >> 24) & 0xff) | (((x) << 8) & 0xff0000) | (((x) >> 8) & 0xff00) | (((x) << 24) & 0xff000000))
-uint32_t crc32(const uint8_t *buf, uint32_t size);
 
 bool isAppValid() {
     const uint32_t* appFlash = 
diff --git a/firmware/shared/crc.cpp b/firmware/shared/crc.cpp
index d2adef1..5bb31b3 100644
--- a/firmware/shared/crc.cpp
+++ b/firmware/shared/crc.cpp
@@ -1,4 +1,4 @@
-#include <cstdint>
+#include "crc.h"
 
 static const uint32_t crc32_tab[] = { 0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
         0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4,
@@ -44,12 +44,14 @@ static const uint32_t crc32_tab[] = { 0x00000000, 0x77073096, 0xee0e612c, 0x9909
         0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8,
         0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d };
 
+uint32_t crc32(const void *buf, uint32_t size) {
+	return crc32inc(buf, 0, size);
+}
 
-uint32_t crc32(const uint8_t *buf, uint32_t size) {
-    const uint8_t *p;
+uint32_t crc32inc(const void *buf, uint32_t crc, uint32_t size) {
+    auto p = reinterpret_cast<const uint8_t*>(buf);
 
-    p = buf;
-    uint32_t crc = 0xFFFFFFFF;
+    crc = crc ^ 0xFFFFFFFF;
 
     while (size--) {
         crc = crc32_tab[(crc ^ *p++) & 0xFF] ^ (crc >> 8);
diff --git a/firmware/util/math/crc.h b/firmware/shared/crc.h
similarity index 56%
rename from firmware/util/math/crc.h
rename to firmware/shared/crc.h
index d634c97..5f7851f 100644
--- a/firmware/util/math/crc.h
+++ b/firmware/shared/crc.h
@@ -7,16 +7,7 @@
 
 #pragma once
 
-#include "stdint.h"
+#include <cstdint>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-uint8_t crc8(const uint8_t * buf, uint8_t len);
 uint32_t crc32(const void *buf, uint32_t size);
 uint32_t crc32inc(const void *buf, uint32_t crc, uint32_t size);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */