diff --git a/guile/mu-guile-message.cc b/guile/mu-guile-message.cc
index e27fd78a..c099dbf1 100644
--- a/guile/mu-guile-message.cc
+++ b/guile/mu-guile-message.cc
@@ -18,11 +18,7 @@
 */
 #include "mu-guile-message.hh"
 
-extern "C" {
-#include "libguile/scm.h"
-#include "libguile/strings.h"
-}
-
+#include <libguile.h>
 #include "message/mu-message.hh"
 #include "utils/mu-utils.hh"
 #include <config.h>
diff --git a/guile/mu-guile-message.hh b/guile/mu-guile-message.hh
index 9ac84ce3..0e7201dc 100644
--- a/guile/mu-guile-message.hh
+++ b/guile/mu-guile-message.hh
@@ -24,7 +24,7 @@
  * Initialize this mu guile module.
  *
  * @param data
- *
+q *
  * @return
  */
 extern "C" {
diff --git a/guile/mu-guile.cc b/guile/mu-guile.cc
index 3da8eb32..ff62273c 100644
--- a/guile/mu-guile.cc
+++ b/guile/mu-guile.cc
@@ -26,9 +26,7 @@
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wredundant-decls"
-extern "C" {
 #include <libguile.h>
-}
 #pragma GCC diagnostic pop
 
 #include <mu-runtime.hh>
diff --git a/guile/mu-guile.hh b/guile/mu-guile.hh
index ea886a22..6265995e 100644
--- a/guile/mu-guile.hh
+++ b/guile/mu-guile.hh
@@ -21,9 +21,7 @@
 #define __MU_GUILE_H__
 
 #include <glib.h>
-extern "C" {
 #include <libguile.h>
-}
 #include <mu-query.hh>
 
 /**
diff --git a/lib/mu-script.cc b/lib/mu-script.cc
index ccecf17b..02e3830f 100644
--- a/lib/mu-script.cc
+++ b/lib/mu-script.cc
@@ -23,9 +23,7 @@
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wredundant-decls"
-extern "C" {
 #include <libguile.h>
-}
 #pragma GCC diagnostic pop
 #endif /*BUILD_GUILE*/