diff --git a/include/crc32.h b/include/crc32.h
index 942c133262e..5e269272a49 100644
--- a/include/crc32.h
+++ b/include/crc32.h
@@ -15,4 +15,7 @@
 
 #include <crc.h>
 
+#warning This include file is deprecated in favor of crc.h. \
+Include crc.h instead.
+
 #endif
diff --git a/include/crc8.h b/include/crc8.h
index 6f7860b885d..b690b909f3a 100644
--- a/include/crc8.h
+++ b/include/crc8.h
@@ -10,4 +10,7 @@
 
 #include <crc.h>
 
+#warning This include file is deprecated in favor of crc.h. \
+Include crc.h instead.
+
 #endif
diff --git a/lib/crc/crc16_sw.c b/lib/crc/crc16_sw.c
index d730fb471ab..a0451b47358 100644
--- a/lib/crc/crc16_sw.c
+++ b/lib/crc/crc16_sw.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <crc16.h>
+#include <crc.h>
 
 u16_t crc16(const u8_t *src, size_t len, u16_t polynomial,
 	    u16_t initial_value, bool pad)
diff --git a/lib/crc/crc32_sw.c b/lib/crc/crc32_sw.c
index 44eb4dac175..52e263c31ad 100644
--- a/lib/crc/crc32_sw.c
+++ b/lib/crc/crc32_sw.c
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <crc32.h>
+#include <crc.h>
 
 u32_t crc32_ieee(const u8_t *data, size_t len)
 {
diff --git a/lib/crc/crc8_sw.c b/lib/crc/crc8_sw.c
index 6856fe30d9a..d426579f184 100644
--- a/lib/crc/crc8_sw.c
+++ b/lib/crc/crc8_sw.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <crc8.h>
+#include <crc.h>
 
 static const u8_t crc8_ccitt_small_table[16] = {
 	0x00, 0x07, 0x0e, 0x09, 0x1c, 0x1b, 0x12, 0x15,
diff --git a/subsys/fs/fcb/fcb_elem_info.c b/subsys/fs/fcb/fcb_elem_info.c
index aba12b37609..547dbb639b0 100644
--- a/subsys/fs/fcb/fcb_elem_info.c
+++ b/subsys/fs/fcb/fcb_elem_info.c
@@ -5,7 +5,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#include <crc8.h>
+#include <crc.h>
 
 #include "fcb.h"
 #include "fcb_priv.h"
diff --git a/subsys/fs/nffs_fs.c b/subsys/fs/nffs_fs.c
index 527064008bb..08f4384de67 100644
--- a/subsys/fs/nffs_fs.c
+++ b/subsys/fs/nffs_fs.c
@@ -11,7 +11,7 @@
 #include <init.h>
 #include <flash.h>
 #include <fs.h>
-#include <crc16.h>
+#include <crc.h>
 #include <misc/__assert.h>
 #include <misc/printk.h>
 #include <nffs/os.h>
diff --git a/subsys/fs/nvs/nvs.c b/subsys/fs/nvs/nvs.c
index abf366469cc..06a4491444c 100644
--- a/subsys/fs/nvs/nvs.c
+++ b/subsys/fs/nvs/nvs.c
@@ -10,7 +10,7 @@
 #include <errno.h>
 #include <inttypes.h>
 #include <nvs/nvs.h>
-#include <crc8.h>
+#include <crc.h>
 #include "nvs_priv.h"
 
 #define LOG_LEVEL CONFIG_NVS_LOG_LEVEL
diff --git a/subsys/mgmt/serial_util.c b/subsys/mgmt/serial_util.c
index 768f0fefe5a..30d953150f3 100644
--- a/subsys/mgmt/serial_util.c
+++ b/subsys/mgmt/serial_util.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <stdbool.h>
 #include <errno.h>
-#include <crc16.h>
+#include <crc.h>
 #include <misc/byteorder.h>
 #include <net/buf.h>
 #include <base64.h>
diff --git a/tests/application_development/cpp/src/main.cpp b/tests/application_development/cpp/src/main.cpp
index d671f11d88f..8d197ae89cb 100644
--- a/tests/application_development/cpp/src/main.cpp
+++ b/tests/application_development/cpp/src/main.cpp
@@ -18,8 +18,8 @@
 #include <kernel.h>
 #include <net/buf.h>
 #include <misc/byteorder.h>
-#include <crc8.h>
-#include <crc16.h>
+#include <crc.h>
+#include <crc.h>
 
 #include <gpio.h>
 #include <led_strip.h>