diff -r 09b539910969 src/contrib/net-anim/animation-interface.cc
--- a/src/contrib/net-anim/animation-interface.cc	Mon Oct 05 15:32:12 2009 +0100
+++ b/src/contrib/net-anim/animation-interface.cc	Mon Oct 05 16:31:55 2009 +0100
@@ -21,9 +21,13 @@
 #include <stdio.h>
 #include <sstream>
 
+#include "ns3/net-anim-config.h"
+
 // Socket related includes
-#include <sys/socket.h>
-#include <netinet/in.h>
+#if defined(HAVE_SYS_SOCKET_H) && defined(HAVE_NETINET_IN_H)
+# include <sys/socket.h>
+# include <netinet/in.h>
+#endif
 
 // ns3 includes
 #include "ns3/animation-interface.h"
diff -r 09b539910969 src/contrib/net-anim/point-to-point-dumbbell-helper.cc
--- a/src/contrib/net-anim/point-to-point-dumbbell-helper.cc	Mon Oct 05 15:32:12 2009 +0100
+++ b/src/contrib/net-anim/point-to-point-dumbbell-helper.cc	Mon Oct 05 16:31:55 2009 +0100
@@ -21,9 +21,13 @@
 #include <iostream>
 #include <sstream>
 
+#include "ns3/net-anim-config.h"
+
 // Socket related includes
-#include <sys/socket.h>
-#include <netinet/in.h>
+#if defined(HAVE_SYS_SOCKET_H) && defined(HAVE_NETINET_IN_H)
+# include <sys/socket.h>
+# include <netinet/in.h>
+#endif
 
 // ns3 includes
 #include "ns3/animation-interface.h"
diff -r 09b539910969 src/contrib/net-anim/wscript
--- a/src/contrib/net-anim/wscript	Mon Oct 05 15:32:12 2009 +0100
+++ b/src/contrib/net-anim/wscript	Mon Oct 05 16:31:55 2009 +0100
@@ -1,5 +1,11 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
+def configure(conf):
+    conf.check(header_name='sys/socket.h', define_name='HAVE_SYS_SOCKET_H')
+    conf.check(header_name='netinet/in.h', define_name='HAVE_NETINET_IN_H')
+    conf.write_config_header('ns3/net-anim-config.h', top=True)
+
+
 def build(bld):
     obj = bld.create_ns3_module('net-anim')
     obj.source = [
diff -r 09b539910969 src/contrib/wscript
--- a/src/contrib/wscript	Mon Oct 05 15:32:12 2009 +0100
+++ b/src/contrib/wscript	Mon Oct 05 16:31:55 2009 +0100
@@ -14,9 +14,11 @@
     conf.report_optional_feature("XmlIo", "XmlIo",
                                  conf.env['ENABLE_LIBXML2'],
                                  "library 'libxml-2.0 >= 2.7' not found")
+    conf.write_config_header('ns3/contrib-config.h', top=True)
+
     conf.sub_config('stats')
+    conf.sub_config('net-anim')
 
-    conf.write_config_header('ns3/contrib-config.h', top=True)
 
 def build(bld):
     module = bld.create_ns3_module('contrib', ['simulator', 'common'])