diff --git a/src/routing/olsr/event-garbage-collector.cc b/src/contrib/event-garbage-collector.cc
similarity index 100%
rename from src/routing/olsr/event-garbage-collector.cc
rename to src/contrib/event-garbage-collector.cc
diff --git a/src/routing/olsr/event-garbage-collector.h b/src/contrib/event-garbage-collector.h
similarity index 100%
rename from src/routing/olsr/event-garbage-collector.h
rename to src/contrib/event-garbage-collector.h
diff --git a/src/contrib/wscript b/src/contrib/wscript
new file mode 100644
index 000000000..18e72ac89
--- /dev/null
+++ b/src/contrib/wscript
@@ -0,0 +1,12 @@
+## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
+
+def build(bld):
+    module = bld.create_ns3_module('contrib', ['simulator'])
+    module.source = [
+        'event-garbage-collector.cc',
+        ]
+
+    headers = bld.create_obj('ns3header')
+    headers.source = [
+        'event-garbage-collector.h',
+        ]
diff --git a/src/routing/olsr/olsr-agent-impl.h b/src/routing/olsr/olsr-agent-impl.h
index 22722c852..ab22927f2 100644
--- a/src/routing/olsr/olsr-agent-impl.h
+++ b/src/routing/olsr/olsr-agent-impl.h
@@ -37,7 +37,7 @@
 #include "ns3/packet.h"
 #include "ns3/node.h"
 #include "ns3/socket.h"
-#include "event-garbage-collector.h"
+#include "ns3/event-garbage-collector.h"
 #include "ns3/timer.h"
 #include "ns3/callback-trace-source.h"
 
diff --git a/src/routing/olsr/wscript b/src/routing/olsr/wscript
index f6d866dcc..ba2f76687 100644
--- a/src/routing/olsr/wscript
+++ b/src/routing/olsr/wscript
@@ -1,7 +1,7 @@
 ## -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
 def build(bld):
-    module = bld.create_ns3_module('olsr', ['internet-node'])
+    module = bld.create_ns3_module('olsr', ['internet-node', 'contrib'])
     module.includes = '.'
     module.source = [
         'olsr-header.cc',
@@ -10,7 +10,6 @@ def build(bld):
         'olsr-agent.cc',
         'olsr-agent-impl.cc',
         'olsr.cc',
-        'event-garbage-collector.cc',
         ]
 
     headers = bld.create_obj('ns3header')
diff --git a/src/wscript b/src/wscript
index f0df494d6..efa55d5cd 100644
--- a/src/wscript
+++ b/src/wscript
@@ -14,6 +14,7 @@ all_modules = (
     'core',
     'common',
     'simulator',
+    'contrib',
     'node',
     'internet-node',
     'devices/point-to-point',