diff --git a/iface/nips/nips_vm/ChangeLog b/iface/nips/nips_vm/ChangeLog
index 3b7ffc58e..18fbf8e76 100644
--- a/iface/nips/nips_vm/ChangeLog
+++ b/iface/nips/nips_vm/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-27  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
+
+	Fix compilation with Clang.
+
+	* state.c: Do not include state_inline.h twice with different
+	value of STATE_INLINE.  It was included once via state.h with
+	STATE_INLINE = "extern inline", and another time directly with
+	STATE_INLINE = "extern". Now...
+	* state.h: ... only include it once here with STATE_INLINE =
+	"static inline".
+
 2010-01-21  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
 
 	Kill a warning on Ubuntu.
diff --git a/iface/nips/nips_vm/state.c b/iface/nips/nips_vm/state.c
index 4d745a60d..0e62026ad 100644
--- a/iface/nips/nips_vm/state.c
+++ b/iface/nips/nips_vm/state.c
@@ -17,12 +17,6 @@
 
 #define STATE_OUT_DOTTY_LINE_END "\\l\\"
 
-
-// import functions as "extern" for unoptimized compilation
-#define STATE_INLINE extern
-#include "state_inline.h"
-#undef STATE_INLINE
-
 // *** helper functions ***
 
 // allocate memory of size sz in supplied buffer
diff --git a/iface/nips/nips_vm/state.h b/iface/nips/nips_vm/state.h
index 6a1aa53ce..f9aa97b6f 100644
--- a/iface/nips/nips_vm/state.h
+++ b/iface/nips/nips_vm/state.h
@@ -121,7 +121,7 @@ typedef struct t_global_state_header
 typedef st_global_state_header nipsvm_state_t;
 
 // inline functions as "extern inline" for optimized compilation
-#define STATE_INLINE extern inline
+#define STATE_INLINE static inline
 #include "state_inline.h"
 #undef STATE_INLINE