diff --git a/AUTHORS b/AUTHORS
index b802ef5..a4e5316 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -29,7 +29,8 @@ Oliver Mihatsch, Greg Sternberg, Werner Hofer, Giampiero Giancipoli,
 Glenn Mabutt, Paul Kreiner, Erik Kunze, Mike Frysinger, Martin Waitz,
 Mark McLoughlin, Paul Fox, Juan Jose Costello, Andre Leiadella,
 Alberto Lusiani, Malvina Mazin, Dave Stuart, Rohit Kumar, Donald Dugger,
-Steven Carr, Uwe Völker, Charles Coffing, and Guillaume Rousse.
+Steven Carr, Uwe Völker, Charles Coffing, Guillaume Rousse, and
+Alessandro Praduroux.
 
 Probably I forgot quite a few people sending a patch here and there, which
 really made a difference. Without those, some obscure bugs still would
diff --git a/ChangeLog b/ChangeLog
index 9f643f6..e5abce6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-05  Alessandro Praduroux <pradu@pradu.it>
+	* rfb/rfb.h: do not misplace guards, which makes it possible to
+	  double include rfb.h from C++.
+
 2007-03-31  Guillaume Rousse <Guillaume.Rousse@inria.fr>
 	* configure.ac, **/Makefile.am: build shared libraries
 
diff --git a/rfb/rfb.h b/rfb/rfb.h
index b664efe..0dad2b9 100644
--- a/rfb/rfb.h
+++ b/rfb/rfb.h
@@ -965,8 +965,10 @@ extern rfbBool rfbSendTextChatMessage(rfbClientPtr cl, uint32_t length, char *bu
 
 
 
-#endif
 
 #if(defined __cplusplus)
 }
 #endif
+
+#endif
+