diff --git a/libguile/ChangeLog b/libguile/ChangeLog
index 68af192c9..c06480af8 100644
--- a/libguile/ChangeLog
+++ b/libguile/ChangeLog
@@ -1,3 +1,8 @@
+2005-02-27  Mikael Djurfeldt  <djurfeldt@nada.kth.se>
+
+	* gh.h: Bugfix: Include <libguile.h> outside of the extern "C"
+	block.
+
 2005-02-25  Marius Vollmer  <mvo@zagadka.de>
 
 	* hashtab.c (scm_i_rehash): Remove elements from old bucket vector
diff --git a/libguile/gh.h b/libguile/gh.h
index dbb04b197..64a6579cc 100644
--- a/libguile/gh.h
+++ b/libguile/gh.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1995,1996,1997,1998,2000,2001 Free Software Foundation, Inc.
+/* Copyright (C) 1995,1996,1997,1998,2000,2001, 2005 Free Software Foundation, Inc.
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,12 +19,14 @@
 #ifndef __GH_H
 #define __GH_H
 
+/* This needs to be included outside of the extern "C" block.
+ */
+#include <libguile.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <libguile.h>
-
 /* gcc has extern inline functions that are basically as fast as macros */
 #ifdef __GNUC__
 # define INL inline