diff --git a/src/click/examples/nsclick-udp-client-server-wifi.cc b/src/click/examples/nsclick-udp-client-server-wifi.cc
index 8bd9a9ffb..a47ebbfbf 100644
--- a/src/click/examples/nsclick-udp-client-server-wifi.cc
+++ b/src/click/examples/nsclick-udp-client-server-wifi.cc
@@ -32,13 +32,13 @@
 
 #include <fstream>
 #include "ns3/core-module.h"
-#include "ns3/internet-module.h"
-#include "ns3/applications-module.h"
 #include "ns3/network-module.h"
+#include "ns3/internet-module.h"
 #include "ns3/wifi-module.h"
+#include "ns3/mobility-module.h"
+#include "ns3/applications-module.h"
 #include "ns3/ipv4-click-routing.h"
 #include "ns3/click-internet-stack-helper.h"
-#include "ns3/mobility-helper.h"
 
 using namespace ns3;
 
diff --git a/src/click/examples/wscript b/src/click/examples/wscript
index c42672d75..6157f1dc3 100644
--- a/src/click/examples/wscript
+++ b/src/click/examples/wscript
@@ -2,19 +2,19 @@
 
 def build(bld):
    obj = bld.create_ns3_program('nsclick-simple-lan',
-                                ['click', 'csma', 'internet'])
+                                ['click', 'csma', 'internet', 'applications'])
    obj.source = 'nsclick-simple-lan.cc'
 
    obj = bld.create_ns3_program('nsclick-raw-wlan',
-                                ['click', 'wifi', 'internet'])
+                                ['click', 'wifi', 'internet', 'applications'])
    obj.source = 'nsclick-raw-wlan.cc'
 
    obj = bld.create_ns3_program('nsclick-udp-client-server-csma',
-                                ['click', 'csma', 'internet'])
+                                ['click', 'csma', 'internet', 'applications'])
    obj.source = 'nsclick-udp-client-server-csma.cc'
 
    obj = bld.create_ns3_program('nsclick-udp-client-server-wifi',
-                                ['click', 'wifi', 'internet'])
+                                ['click', 'wifi', 'internet', 'applications'])
    obj.source = 'nsclick-udp-client-server-wifi.cc'
 
    obj = bld.create_ns3_program('nsclick-routing',
diff --git a/src/click/model/ipv4-click-routing.cc b/src/click/model/ipv4-click-routing.cc
index 91e4d1d36..3f7e374dd 100644
--- a/src/click/model/ipv4-click-routing.cc
+++ b/src/click/model/ipv4-click-routing.cc
@@ -193,7 +193,7 @@ Ipv4ClickRouting::GetInterfaceId (const char *ifname)
   // more interfaces defined in the Click graph
   // for a Click node than are defined for it in
   // the simulation script
-  if (retval >= (int) m_ipv4->GetNInterfaces ())
+  if (retval > (int) m_ipv4->GetNInterfaces ())
     {
       return -1;
     }