--- a/src/openflow/test/openflow-switch-test-suite.cc	Fri Dec 23 12:28:32 2011 -0800
+++ b/src/openflow/test/openflow-switch-test-suite.cc	Fri Dec 23 13:08:14 2011 -0800
@@ -19,9 +19,6 @@
  * Author: Blake Hurd  <naimorai@gmail.com>
  */
 
-
-#ifdef NS3_OPENFLOW
-
 // An essential include is test.h
 #include "ns3/test.h"
 
@@ -188,6 +185,5 @@
 }
 
 // Do not forget to allocate an instance of this TestSuite
-SwitchTestSuite switchTestSuite;
+static SwitchTestSuite switchTestSuite;
 
-#endif // NS3_OPENFLOW