diff -ru openvpn-2.1.0~/basic.h openvpn-2.1.0/basic.h
--- openvpn-2.1.0~/basic.h	2009-12-27 15:25:40.000000000 +0100
+++ openvpn-2.1.0/basic.h	2009-12-27 15:26:09.000000000 +0100
@@ -22,22 +22,11 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include <stdbool.h>
+
 #ifndef BASIC_H
 #define BASIC_H
 
-/* bool definitions */
-#ifndef bool
-#define bool int
-#endif
-
-#ifndef true
-#define true 1
-#endif
-
-#ifndef false
-#define false 0
-#endif
-
 #define BOOL_CAST(x) ((x) ? (true) : (false))
 
 /* size of an array */
diff -ru openvpn-2.1.0~/socket.c openvpn-2.1.0/socket.c
--- openvpn-2.1.0~/socket.c	2009-12-27 15:25:40.000000000 +0100
+++ openvpn-2.1.0/socket.c	2009-12-27 15:28:48.000000000 +0100
@@ -2008,7 +2008,7 @@
 
 /* set environmental variables for ip/port in *addr */
 void
-setenv_sockaddr (struct env_set *es, const char *name_prefix, const struct openvpn_sockaddr *addr, const bool flags)
+setenv_sockaddr (struct env_set *es, const char *name_prefix, const struct openvpn_sockaddr *addr, const unsigned int flags)
 {
   char name_buf[256];
 
@@ -2029,7 +2029,7 @@
 }
 
 void
-setenv_in_addr_t (struct env_set *es, const char *name_prefix, in_addr_t addr, const bool flags)
+setenv_in_addr_t (struct env_set *es, const char *name_prefix, in_addr_t addr, const unsigned int flags)
 {
   if (addr || !(flags & SA_SET_IF_NONZERO))
     {
@@ -2044,7 +2044,7 @@
 setenv_link_socket_actual (struct env_set *es,
 			   const char *name_prefix,
 			   const struct link_socket_actual *act,
-			   const bool flags)
+			   const unsigned int flags)
 {
   setenv_sockaddr (es, name_prefix, &act->dest, flags);
 }
diff -ru openvpn-2.1.0~/socket.h openvpn-2.1.0/socket.h
--- openvpn-2.1.0~/socket.h	2009-12-27 15:25:40.000000000 +0100
+++ openvpn-2.1.0/socket.h	2009-12-27 15:29:08.000000000 +0100
@@ -357,17 +357,17 @@
 void setenv_sockaddr (struct env_set *es,
 		      const char *name_prefix,
 		      const struct openvpn_sockaddr *addr,
-		      const bool flags);
+		      const unsigned int flags);
 
 void setenv_in_addr_t (struct env_set *es,
 		       const char *name_prefix,
 		       in_addr_t addr,
-		       const bool flags);
+		       const unsigned int flags);
 
 void setenv_link_socket_actual (struct env_set *es,
 				const char *name_prefix,
 				const struct link_socket_actual *act,
-				const bool flags);
+				const unsigned int flags);
 
 void bad_address_length (int actual, int expected);