--- a/src/applications/udp-client-server/udp-client-server-test.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/applications/udp-client-server/udp-client-server-test.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -263,4 +263,4 @@
   AddTestCase (new PacketLossCounterTestCase);
 }
 
-UdpClientServerTestSuite udpClientServerTestSuite;
+static UdpClientServerTestSuite udpClientServerTestSuite;

--- a/src/common/buffer-test.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/common/buffer-test.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -333,6 +333,6 @@
   AddTestCase (new BufferTest);
 }
 
-BufferTestSuite g_bufferTestSuite;
+static BufferTestSuite g_bufferTestSuite;
 
 } // namespace ns3

--- a/src/common/packet.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/common/packet.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -1323,7 +1323,7 @@
   AddTestCase (new PacketTest);
 }
 
-PacketTestSuite g_packetTestSuite;
+static PacketTestSuite g_packetTestSuite;
 
 
 } // namespace ns3

--- a/src/common/pcap-file-test-suite.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/common/pcap-file-test-suite.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -1133,4 +1133,4 @@
   AddTestCase (new DiffTestCase);
 }
 
-PcapFileTestSuite pcapFileTestSuite;
+static PcapFileTestSuite pcapFileTestSuite;

--- a/src/common/spectrum-value-test.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/common/spectrum-value-test.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -362,8 +362,8 @@
 
 
 // static instance of test suites
-SpectrumValueTestSuite g_SpectrumValueTestSuite;
-SpectrumConverterTestSuite g_SpectrumConverterTestSuite;
+static SpectrumValueTestSuite g_SpectrumValueTestSuite;
+static SpectrumConverterTestSuite g_SpectrumConverterTestSuite;
 
 
 

--- a/src/contrib/energy/test/basic-energy-model-test.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/contrib/energy/test/basic-energy-model-test.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -409,5 +409,5 @@
 }
 
 // create an instance of the test suite
-BasicEnergyModelTestSuite g_energyModelTestSuite;
+static BasicEnergyModelTestSuite g_energyModelTestSuite;
 

--- a/src/contrib/energy/test/li-ion-energy-source-test.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/contrib/energy/test/li-ion-energy-source-test.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -93,6 +93,6 @@
 }
 
 // create an instance of the test suite
-LiIonEnergySourceTestSuite g_liIonEnergySourceTestSuite;
+static LiIonEnergySourceTestSuite g_liIonEnergySourceTestSuite;
 
 } // namespace ns3

--- a/src/contrib/energy/test/rv-battery-model-test.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/contrib/energy/test/rv-battery-model-test.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -903,4 +903,4 @@
 }
 
 // create an instance of the test suite
-RvBatteryModelTestSuite g_rvBatteryModelTestSuite;
+static RvBatteryModelTestSuite g_rvBatteryModelTestSuite;

--- a/src/core/callback-test-suite.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/core/callback-test-suite.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -585,6 +585,6 @@
   AddTestCase (new MakeCallbackTemplatesTestCase);
 }
 
-CallbackTestSuite CallbackTestSuite;
+static CallbackTestSuite CallbackTestSuite;
 
 } // namespace

--- a/src/core/command-line.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/core/command-line.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -510,6 +510,6 @@
   AddTestCase (new CommandLineStringTestCase);
 }
 
-CommandLineTestSuite CommandLineTestSuite;
+static CommandLineTestSuite CommandLineTestSuite;
 
 } // namespace ns3

--- a/src/core/config.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/core/config.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -1238,6 +1238,6 @@
   AddTestCase (new ObjectVectorConfigTestCase);
 }
 
-ConfigTestSuite configTestSuite;
+static ConfigTestSuite configTestSuite;
 
 } // namespace ns3

--- a/src/core/global-value.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/core/global-value.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -275,7 +275,7 @@
   AddTestCase (new GlobalValueTestCase);
 }
 
-GlobalValueTestSuite globalValueTestSuite;
+static GlobalValueTestSuite globalValueTestSuite;
 
 } // namespace ns3
 

--- a/src/core/names-test-suite.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/core/names-test-suite.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -972,4 +972,4 @@
   AddTestCase (new AlternateFindTestCase);
 }
 
-NamesTestSuite namesTestSuite;
+static NamesTestSuite namesTestSuite;

--- a/src/core/object.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/core/object.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -797,6 +797,6 @@
   AddTestCase (new ObjectFactoryTestCase);
 }
 
-ObjectTestSuite objectTestSuite;
+static ObjectTestSuite objectTestSuite;
 
 } // namespace ns3

--- a/src/core/random-variable.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/core/random-variable.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -2162,6 +2162,6 @@
   AddTestCase (new RandomNumberSerializationTestCase);
 }
 
-BasicRandomNumberTestSuite BasicRandomNumberTestSuite;
+static BasicRandomNumberTestSuite BasicRandomNumberTestSuite;
 
 } // namespace ns3

--- a/src/core/rng-test-suite.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/core/rng-test-suite.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -431,4 +431,4 @@
   AddTestCase (new RngParetoTestCase);
 }
 
-RngTestSuite rngTestSuite;
+static RngTestSuite rngTestSuite;

--- a/src/core/traced-callback-test-suite.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/core/traced-callback-test-suite.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -122,4 +122,4 @@
   AddTestCase (new BasicTracedCallbackTestCase);
 }
 
-TracedCallbackTestSuite tracedCallbackTestSuite;
+static TracedCallbackTestSuite tracedCallbackTestSuite;

--- a/src/core/type-traits-test-suite.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/core/type-traits-test-suite.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -61,6 +61,6 @@
   AddTestCase (new TypeTraitsTestCase);
 }
 
-TypeTraitsTestSuite typeTraitsTestSuite;
+static TypeTraitsTestSuite typeTraitsTestSuite;
 
 } // namespace ns3

--- a/src/devices/lte/test/lte-bearer-test.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/devices/lte/test/lte-bearer-test.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -123,4 +123,4 @@
   AddTestCase (new Ns3LteBearerTestCase);
 }
 
-Ns3LteBearerTestTestSuite ns3LteBearerTestTestSuite;
+static Ns3LteBearerTestTestSuite ns3LteBearerTestTestSuite;

--- a/src/devices/lte/test/lte-device-test.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/devices/lte/test/lte-device-test.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -196,4 +196,4 @@
   AddTestCase (new Ns3LteDeviceTestCase);
 }
 
-Ns3LteDeviceTestTestSuite ns3LteDeviceTestTestSuite;
+static Ns3LteDeviceTestTestSuite ns3LteDeviceTestTestSuite;

--- a/src/devices/lte/test/lte-phy-test.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/devices/lte/test/lte-phy-test.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -168,4 +168,4 @@
   AddTestCase (new Ns3LtePhyTestCase);
 }
 
-Ns3LtePhyTestTestSuite ns3LtePhyTestTestSuite;
+static Ns3LtePhyTestTestSuite ns3LtePhyTestTestSuite;

--- a/src/devices/lte/test/lte-propagation-loss-model-test.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/devices/lte/test/lte-propagation-loss-model-test.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -206,4 +206,4 @@
   AddTestCase (new Ns3LtePropagationLossModelTestCase);
 }
 
-Ns3LtePropagationLossModelTestTestSuite ns3LtePropagationLossModelTestTestSuite;
+static Ns3LtePropagationLossModelTestTestSuite ns3LtePropagationLossModelTestTestSuite;

--- a/src/devices/mesh/dot11s/test/dot11s-test-suite.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/devices/mesh/dot11s/test/dot11s-test-suite.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -288,6 +288,6 @@
   AddTestCase (new PeerLinkFrameStartTest);
 }
 
-Dot11sTestSuite g_dot11sTestSuite;
+static Dot11sTestSuite g_dot11sTestSuite;
 }
 }

--- a/src/devices/mesh/flame/flame-test-suite.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/devices/mesh/flame/flame-test-suite.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -152,7 +152,7 @@
   AddTestCase (new FlameRtableTest);
 }
 
-FlameTestSuite g_flameTestSuite;
+static FlameTestSuite g_flameTestSuite;
 
 }
 }

--- a/src/devices/mesh/mesh-information-element-vector.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/devices/mesh/mesh-information-element-vector.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -215,6 +215,6 @@
   AddTestCase (new MeshInformationElementVectorBist);
 }
 
-MeshTestSuite g_meshTestSuite;
+static MeshTestSuite g_meshTestSuite;
 
 } //namespace ns3

--- a/src/devices/point-to-point/point-to-point-test.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/devices/point-to-point/point-to-point-test.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -69,6 +69,6 @@
   AddTestCase (new PointToPointTest);
 }
 
-PointToPointTestSuite g_pointToPointTestSuite;
+static PointToPointTestSuite g_pointToPointTestSuite;
 
 } // namespace ns3

--- a/src/devices/spectrum/spectrum-interference-test.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/devices/spectrum/spectrum-interference-test.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -215,6 +215,6 @@
 
 }
 
-SpectrumInterferenceTestSuite spectrumInterferenceTestSuite;
+static SpectrumInterferenceTestSuite spectrumInterferenceTestSuite;
 
 } // namespace ns3

--- a/src/devices/uan/test/uan-energy-model-test.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/devices/uan/test/uan-energy-model-test.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -311,6 +311,6 @@
 }
 
 // create an instance of the test suite
-UanEnergyModelTestSuite g_uanEnergyModelTestSuite;
+static UanEnergyModelTestSuite g_uanEnergyModelTestSuite;
 
 } // namespace ns3

--- a/src/devices/uan/test/uan-test.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/devices/uan/test/uan-test.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -262,7 +262,7 @@
   AddTestCase (new UanTest);
 }
 
-UanTestSuite g_uanTestSuite;
+static UanTestSuite g_uanTestSuite;
 
 
 

--- a/src/devices/wifi/block-ack-test-suite.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/devices/wifi/block-ack-test-suite.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -275,4 +275,4 @@
   AddTestCase (new CtrlBAckResponseHeaderTest);
 }
 
-BlockAckTestSuite g_blockAckTestSuite;
+static BlockAckTestSuite g_blockAckTestSuite;

--- a/src/devices/wifi/dcf-manager-test.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/devices/wifi/dcf-manager-test.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -679,6 +679,6 @@
   AddTestCase (new DcfManagerTest);
 }
 
-DcfTestSuite g_dcfTestSuite;
+static DcfTestSuite g_dcfTestSuite;
 
 } // namespace ns3

--- a/src/devices/wifi/interference-helper-tx-duration-test.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/devices/wifi/interference-helper-tx-duration-test.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -194,6 +194,6 @@
   AddTestCase (new InterferenceHelperTxDurationTest);
 }
 
-TxDurationTestSuite g_txDurationTestSuite;
+static TxDurationTestSuite g_txDurationTestSuite;
 } //namespace ns3 
 

--- a/src/devices/wifi/wifi-test.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/devices/wifi/wifi-test.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -303,6 +303,6 @@
   AddTestCase (new InterferenceHelperSequenceTest); // Bug 991
 }
 
-WifiTestSuite g_wifiTestSuite;
+static WifiTestSuite g_wifiTestSuite;
 
 } // namespace ns3

--- a/src/devices/wimax/mac-messages-test.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/devices/wimax/mac-messages-test.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -148,4 +148,4 @@
   AddTestCase (new DsaRequestTestCase);
 }
 
-Ns3WimaxMacMessagesTestSuite ns3WimaxMacMessagesTestSuite;
+static Ns3WimaxMacMessagesTestSuite ns3WimaxMacMessagesTestSuite;

--- a/src/devices/wimax/phy-test.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/devices/wimax/phy-test.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -186,4 +186,4 @@
 
 }
 
-Ns3WimaxPhyTestSuite ns3WimaxPhyTestSuite;
+static Ns3WimaxPhyTestSuite ns3WimaxPhyTestSuite;

--- a/src/devices/wimax/qos-test.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/devices/wimax/qos-test.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -293,4 +293,4 @@
   AddTestCase (new Ns3WimaxSchedulingTestCase);
 }
 
-Ns3WimaxQoSTestSuite ns3WimaxQoSTestSuite;
+static Ns3WimaxQoSTestSuite ns3WimaxQoSTestSuite;

--- a/src/devices/wimax/ss-mac-test.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/devices/wimax/ss-mac-test.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -173,4 +173,4 @@
   AddTestCase (new Ns3WimaxManagementConnectionsTestCase);
 }
 
-Ns3WimaxSSMacTestSuite ns3WimaxSSMacTestSuite;
+static Ns3WimaxSSMacTestSuite ns3WimaxSSMacTestSuite;

--- a/src/devices/wimax/wimax-fragmentation-test.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/devices/wimax/wimax-fragmentation-test.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -194,4 +194,4 @@
   AddTestCase (new Ns3WimaxFragmentationTestCase);
 }
 
-Ns3WimaxFragmentationTestSuite ns3WimaxFragmentationTestSuite;
+static Ns3WimaxFragmentationTestSuite ns3WimaxFragmentationTestSuite;

--- a/src/devices/wimax/wimax-service-flow-test.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/devices/wimax/wimax-service-flow-test.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -169,4 +169,4 @@
   AddTestCase (new Ns3WimaxSfCreationTestCase);
 }
 
-Ns3WimaxServiceFlowTestSuite ns3WimaxServiceFlowTestSuite;
+static Ns3WimaxServiceFlowTestSuite ns3WimaxServiceFlowTestSuite;

--- a/src/devices/wimax/wimax-tlv-test.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/devices/wimax/wimax-tlv-test.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -231,4 +231,4 @@
   AddTestCase (new Ns3WimaxSfTlvTestCase);
 }
 
-Ns3WimaxTlvTestSuite ns3WimaxTlvTestSuite;
+static Ns3WimaxTlvTestSuite ns3WimaxTlvTestSuite;

--- a/src/internet-stack/ipv6-extension-header-test-suite.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/internet-stack/ipv6-extension-header-test-suite.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -231,4 +231,4 @@
   }
 };
 
-Ipv6ExtensionHeaderTestSuite ipv6ExtensionHeaderTestSuite;
+static Ipv6ExtensionHeaderTestSuite ipv6ExtensionHeaderTestSuite;

--- a/src/node/packetbb-test-suite.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/node/packetbb-test-suite.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -3827,4 +3827,4 @@
   }
 }
 
-PbbTestSuite pbbTestSuite;
+static PbbTestSuite pbbTestSuite;

--- a/src/test/error-model-test-suite.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/test/error-model-test-suite.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -132,4 +132,4 @@
 }
 
 // Do not forget to allocate an instance of this TestSuite
-ErrorModelTestSuite errorModelTestSuite;
+static ErrorModelTestSuite errorModelTestSuite;

--- a/src/test/ns3tcp/ns3tcp-cwnd-test-suite.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/test/ns3tcp/ns3tcp-cwnd-test-suite.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -575,4 +575,4 @@
   AddTestCase (new Ns3TcpCwndTestCase2);
 }
 
-Ns3TcpCwndTestSuite ns3TcpCwndTestSuite;
+static Ns3TcpCwndTestSuite ns3TcpCwndTestSuite;

--- a/src/test/ns3tcp/ns3tcp-interop-test-suite.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/test/ns3tcp/ns3tcp-interop-test-suite.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -313,4 +313,4 @@
   AddTestCase (new Ns3TcpInteroperabilityTestCase);
 }
 
-Ns3TcpInteroperabilityTestSuite ns3TcpInteroperabilityTestSuite;
+static Ns3TcpInteroperabilityTestSuite ns3TcpInteroperabilityTestSuite;

--- a/src/test/ns3tcp/ns3tcp-loss-test-suite.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/test/ns3tcp/ns3tcp-loss-test-suite.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -432,4 +432,4 @@
   AddTestCase (new Ns3TcpLossTestCase2);
 }
 
-Ns3TcpLossTestSuite ns3TcpLossTestSuite;
+static Ns3TcpLossTestSuite ns3TcpLossTestSuite;

--- a/src/test/ns3tcp/ns3tcp-socket-test-suite.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/test/ns3tcp/ns3tcp-socket-test-suite.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -279,4 +279,4 @@
   AddTestCase (new Ns3TcpSocketTestCase2);
 }
 
-Ns3TcpSocketTestSuite ns3TcpSocketTestSuite;
+static Ns3TcpSocketTestSuite ns3TcpSocketTestSuite;

--- a/src/test/ns3wifi/wifi-interference-test-suite.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/test/ns3wifi/wifi-interference-test-suite.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -277,5 +277,5 @@
   AddTestCase (new WifiInterferenceTestCase);
 }
 
-WifiInterferenceTestSuite wifiInterferenceTestSuite;
+static WifiInterferenceTestSuite wifiInterferenceTestSuite;
 

--- a/src/test/ns3wifi/wifi-msdu-aggregator-test-suite.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/test/ns3wifi/wifi-msdu-aggregator-test-suite.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -208,4 +208,4 @@
   AddTestCase (new WifiMsduAggregatorThroughputTest);
 }
 
-WifiMsduAggregatorTestSuite wifiMsduAggregatorTestSuite;
+static WifiMsduAggregatorTestSuite wifiMsduAggregatorTestSuite;

--- a/src/test/nsctcp/nsctcp-loss-test-suite.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/test/nsctcp/nsctcp-loss-test-suite.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -279,4 +279,4 @@
   AddTestCase (new NscTcpLossTestCase2);
 }
 
-NscTcpLossTestSuite nscTcpLossTestSuite;
+static NscTcpLossTestSuite nscTcpLossTestSuite;

--- a/src/test/sample-test-suite.cc	Wed Jan 05 20:53:38 2011 -0800
+++ b/src/test/sample-test-suite.cc	Mon Jan 10 15:55:29 2011 -0800
@@ -63,4 +63,4 @@
 }
 
 // Do not forget to allocate an instance of this TestSuite
-SampleTestSuite sampleTestSuite;
+static SampleTestSuite sampleTestSuite;