diff --git a/avro/maxavro.cc b/avro/maxavro.cc
index 81f894bbe..f4aa57d3f 100644
--- a/avro/maxavro.cc
+++ b/avro/maxavro.cc
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
-#include "maxavro_internal.h"
+#include "maxavro_internal.hh"
 #include <maxbase/assert.h>
 #include <maxscale/log.hh>
 #include <errno.h>
diff --git a/avro/maxavro.h b/avro/maxavro.hh
similarity index 98%
rename from avro/maxavro.h
rename to avro/maxavro.hh
index 47d459ee8..fb712f572 100644
--- a/avro/maxavro.h
+++ b/avro/maxavro.hh
@@ -17,9 +17,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <jansson.h>
-#include <maxscale/buffer.h>
-
-MXS_BEGIN_DECLS
+#include <maxscale/buffer.hh>
 
 /** File magic and sync marker sizes block sizes */
 #define AVRO_MAGIC_SIZE  4
@@ -155,5 +153,3 @@ GWBUF* maxavro_file_binary_header(MAXAVRO_FILE* file);
 /** File error functions */
 enum maxavro_error maxavro_get_error(MAXAVRO_FILE* file);
 const char*        maxavro_get_error_string(MAXAVRO_FILE* file);
-
-MXS_END_DECLS
diff --git a/avro/maxavro_datablock.cc b/avro/maxavro_datablock.cc
index ee57ff8c6..9e9017f9d 100644
--- a/avro/maxavro_datablock.cc
+++ b/avro/maxavro_datablock.cc
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "maxavro.h"
+#include "maxavro.hh"
 #include <string.h>
 #include <unistd.h>
 #include <sys/types.h>
diff --git a/avro/maxavro_file.cc b/avro/maxavro_file.cc
index 79c2987c9..a8264b57b 100644
--- a/avro/maxavro_file.cc
+++ b/avro/maxavro_file.cc
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "maxavro_internal.h"
+#include "maxavro_internal.hh"
 #include <errno.h>
 #include <string.h>
 #include <maxbase/assert.h>
diff --git a/avro/maxavro_internal.h b/avro/maxavro_internal.hh
similarity index 97%
rename from avro/maxavro_internal.h
rename to avro/maxavro_internal.hh
index 1432f13f4..6f0ee091c 100644
--- a/avro/maxavro_internal.h
+++ b/avro/maxavro_internal.hh
@@ -13,8 +13,8 @@
 
 #pragma once
 
-#include "maxavro.h"
-#include <maxscale/alloc.h>
+#include "maxavro.hh"
+#include <maxbase/alloc.h>
 
 /**
  * Private header for maxavro
diff --git a/avro/maxavro_record.cc b/avro/maxavro_record.cc
index 4e07f9ef6..88a356f51 100644
--- a/avro/maxavro_record.cc
+++ b/avro/maxavro_record.cc
@@ -12,7 +12,7 @@
  */
 
 #include <maxscale/cdefs.h>
-#include "maxavro_internal.h"
+#include "maxavro_internal.hh"
 #include <string.h>
 #include <maxbase/assert.h>
 #include <maxscale/log.hh>
diff --git a/avro/maxavro_schema.cc b/avro/maxavro_schema.cc
index 8659d1447..362c0e61c 100644
--- a/avro/maxavro_schema.cc
+++ b/avro/maxavro_schema.cc
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include "maxavro_internal.h"
+#include "maxavro_internal.hh"
 #include <jansson.h>
 #include <string.h>
 #include <maxbase/assert.h>
diff --git a/avro/maxavro_write.cc b/avro/maxavro_write.cc
index 7b5ec306b..4cc6a17b1 100644
--- a/avro/maxavro_write.cc
+++ b/avro/maxavro_write.cc
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdbool.h>
-#include "maxavro_internal.h"
+#include "maxavro_internal.hh"
 #include <maxscale/log.hh>
 #include <errno.h>
 
diff --git a/avro/maxavrocheck.cc b/avro/maxavrocheck.cc
index 09352c4d0..5e3f29ceb 100644
--- a/avro/maxavrocheck.cc
+++ b/avro/maxavrocheck.cc
@@ -15,7 +15,7 @@
  * @file maxavrocheck.c - Simple Avro file validator
  */
 
-#include <maxavro.h>
+#include <maxavro.hh>
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
diff --git a/avro/test/CMakeLists.txt b/avro/test/CMakeLists.txt
index 363fbb976..7b33c2f61 100644
--- a/avro/test/CMakeLists.txt
+++ b/avro/test/CMakeLists.txt
@@ -1,3 +1,3 @@
-add_executable(test_values test_values.c)
+add_executable(test_values test_values.cc)
 target_link_libraries(test_values maxavro)
 
diff --git a/avro/test/test_values.c b/avro/test/test_values.cc
similarity index 97%
rename from avro/test/test_values.c
rename to avro/test/test_values.cc
index 877e3492f..a307cc09b 100644
--- a/avro/test/test_values.c
+++ b/avro/test/test_values.cc
@@ -11,7 +11,7 @@
  * Public License.
  */
 
-#include <maxavro.h>
+#include <maxavro.hh>
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
diff --git a/server/modules/routing/avrorouter/avro_client.cc b/server/modules/routing/avrorouter/avro_client.cc
index 87c9bda4b..a088a6a11 100644
--- a/server/modules/routing/avrorouter/avro_client.cc
+++ b/server/modules/routing/avrorouter/avro_client.cc
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
-#include <maxavro.h>
+#include <maxavro.hh>
 #include <fstream>
 #include <sstream>
 #include <maxscale/service.hh>
diff --git a/server/modules/routing/avrorouter/avrorouter.hh b/server/modules/routing/avrorouter/avrorouter.hh
index 6f6121980..05546925b 100644
--- a/server/modules/routing/avrorouter/avrorouter.hh
+++ b/server/modules/routing/avrorouter/avrorouter.hh
@@ -25,7 +25,7 @@
 #include <maxscale/mysql_binlog.h>
 #include <maxscale/users.h>
 #include <cdc.hh>
-#include <maxavro.h>
+#include <maxavro.hh>
 #include <binlog_common.hh>
 #include <maxscale/protocol/mysql.hh>
 #include <blr_constants.hh>