--- gvpe/config.h.in	2005/03/18 01:53:05	1.9
+++ gvpe/config.h.in	2005/03/18 02:32:20	1.10
@@ -341,11 +341,9 @@
 
 #endif
 
-// include clocale first because gettext.h might overwrite setlocale
-#if defined(HAVE_CLOCALE) && defined(__cplusplus)
-# include <clocale>
+#if HAVE_CLOCALE
+# define CLOCALE <clocale>
 #else
-# include <locale.h>
+# define CLOCALE <locale.h>
 #endif
-#include "gettext.h"