diff --git a/examples/udp-client-server/udp-client-server.cc b/examples/udp-client-server/udp-client-server.cc
index 68485e276..866495971 100644
--- a/examples/udp-client-server/udp-client-server.cc
+++ b/examples/udp-client-server/udp-client-server.cc
@@ -25,7 +25,6 @@
 
 #include <fstream>
 #include "ns3/core-module.h"
-#include "ns3/core-module.h"
 #include "ns3/csma-module.h"
 #include "ns3/applications-module.h"
 #include "ns3/internet-module.h"
diff --git a/src/aodv/test/bug-772.cc b/src/aodv/test/bug-772.cc
index 79492bcf5..7fd198d24 100644
--- a/src/aodv/test/bug-772.cc
+++ b/src/aodv/test/bug-772.cc
@@ -19,7 +19,6 @@
  */
 
 #include "bug-772.h"
-
 #include "ns3/simulator.h"
 #include "ns3/random-variable-stream.h"
 #include "ns3/rng-seed-manager.h"
@@ -27,7 +26,6 @@
 #include "ns3/mobility-helper.h"
 #include "ns3/double.h"
 #include "ns3/uinteger.h"
-#include "ns3/string.h"
 #include "ns3/boolean.h"
 #include "ns3/yans-wifi-helper.h"
 #include "ns3/internet-stack-helper.h"
diff --git a/src/csma-layout/examples/csma-star.cc b/src/csma-layout/examples/csma-star.cc
index 658770556..8df4c1aab 100644
--- a/src/csma-layout/examples/csma-star.cc
+++ b/src/csma-layout/examples/csma-star.cc
@@ -20,7 +20,6 @@
 #include "ns3/csma-module.h"
 #include "ns3/csma-star-helper.h"
 #include "ns3/applications-module.h"
-#include "ns3/csma-module.h"
 #include "ns3/internet-module.h"
 #include "ns3/ipv6-address-generator.h"
 
diff --git a/src/dsr/model/dsr-options.cc b/src/dsr/model/dsr-options.cc
index 48c40d1eb..2afcf18f5 100644
--- a/src/dsr/model/dsr-options.cc
+++ b/src/dsr/model/dsr-options.cc
@@ -35,7 +35,6 @@
 #include <list>
 #include <ctime>
 #include <map>
-
 #include "ns3/ptr.h"
 #include "ns3/log.h"
 #include "ns3/assert.h"
@@ -46,7 +45,6 @@
 #include "ns3/udp-header.h"
 #include "ns3/pointer.h"
 #include "ns3/node-list.h"
-#include "ns3/uinteger.h"
 #include "ns3/object-vector.h"
 #include "ns3/ipv4-l3-protocol.h"
 #include "ns3/ipv4-interface.h"
@@ -55,7 +53,6 @@
 #include "ns3/ipv4-route.h"
 #include "ns3/icmpv4-l4-protocol.h"
 #include "ns3/ip-l4-protocol.h"
-
 #include "dsr-option-header.h"
 #include "dsr-options.h"
 #include "dsr-rcache.h"
diff --git a/src/internet/test/tcp-rto-test.cc b/src/internet/test/tcp-rto-test.cc
index 93012e6d1..0bff63e6f 100644
--- a/src/internet/test/tcp-rto-test.cc
+++ b/src/internet/test/tcp-rto-test.cc
@@ -16,7 +16,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  */
-#include "tcp-error-model.h"
 
 #include "ns3/node.h"
 #include "ns3/log.h"
diff --git a/src/lte/helper/lte-helper.cc b/src/lte/helper/lte-helper.cc
index a7109088f..65579885f 100644
--- a/src/lte/helper/lte-helper.cc
+++ b/src/lte/helper/lte-helper.cc
@@ -21,7 +21,6 @@
  *              Biljana Bojovic <biljana.bojovic@cttc.es> (Carrier Aggregation) 
  */
 
-
 #include "lte-helper.h"
 #include <ns3/string.h>
 #include <ns3/log.h>
@@ -42,7 +41,6 @@
 #include <ns3/friis-spectrum-propagation-loss.h>
 #include <ns3/trace-fading-loss-model.h>
 #include <ns3/isotropic-antenna-model.h>
-#include <ns3/lte-enb-net-device.h>
 #include <ns3/lte-ue-net-device.h>
 #include <ns3/ff-mac-scheduler.h>
 #include <ns3/lte-ffr-algorithm.h>
@@ -65,7 +63,6 @@
 #include <ns3/buildings-propagation-loss-model.h>
 #include <ns3/lte-spectrum-value-helper.h>
 #include <ns3/epc-x2.h>
-#include <ns3/pointer.h>
 #include <ns3/object-map.h>
 #include <ns3/object-factory.h>
 
diff --git a/src/lte/helper/point-to-point-epc-helper.cc b/src/lte/helper/point-to-point-epc-helper.cc
index e0cd7458a..8fd0cb156 100644
--- a/src/lte/helper/point-to-point-epc-helper.cc
+++ b/src/lte/helper/point-to-point-epc-helper.cc
@@ -28,7 +28,6 @@
 #include <ns3/boolean.h>
 #include <ns3/eps-bearer.h>
 #include <ns3/ipv4-address.h>
-#include <ns3/ipv4-address.h>
 #include <ns3/internet-stack-helper.h>
 #include <ns3/point-to-point-helper.h>
 #include <ns3/packet-socket-helper.h>
diff --git a/src/lte/model/lte-mi-error-model.cc b/src/lte/model/lte-mi-error-model.cc
index 6822da45f..8e362669c 100644
--- a/src/lte/model/lte-mi-error-model.cc
+++ b/src/lte/model/lte-mi-error-model.cc
@@ -29,19 +29,15 @@
 *      Marco Miozzo <marco.miozzo@cttc.es>
 */ 
 
-
 #include <list>
 #include <vector>
 #include <ns3/log.h>
 #include <ns3/pointer.h>
 #include <stdint.h>
 #include <cmath>
-#include <stdint.h>
 #include "stdlib.h"
 #include <ns3/lte-mi-error-model.h>
 
-
-
 namespace ns3 {
 
 NS_LOG_COMPONENT_DEFINE ("LteMiErrorModel");
diff --git a/src/lte/test/lte-test-fading.cc b/src/lte/test/lte-test-fading.cc
index b40e34b2e..6ae8c6e33 100644
--- a/src/lte/test/lte-test-fading.cc
+++ b/src/lte/test/lte-test-fading.cc
@@ -19,15 +19,11 @@
 */
 
 #include "ns3/simulator.h"
-
 #include "ns3/log.h"
-
 #include "ns3/spectrum-test.h"
-
 #include "ns3/lte-phy-tag.h"
 #include "ns3/lte-test-ue-phy.h"
 #include "ns3/lte-chunk-processor.h"
-
 #include "ns3/lte-test-fading.h"
 #include <ns3/buildings-propagation-loss-model.h>
 #include <ns3/node-container.h>
@@ -42,14 +38,10 @@
 #include <ns3/lte-ue-net-device.h>
 #include <ns3/lte-enb-net-device.h>
 #include <ns3/lte-ue-rrc.h>
-#include <ns3/lte-helper.h>
 #include <ns3/lte-enb-phy.h>
 #include <ns3/lte-ue-phy.h>
 #include "lte-test-sinr-chunk-processor.h"
 
-// #include <ns3/trace-fading-loss-model.h>
-// #include <ns3/spectrum-value.h>
-
 using namespace ns3;
 
 NS_LOG_COMPONENT_DEFINE ("LteFadingTest");
diff --git a/src/lte/test/lte-test-fdmt-ff-mac-scheduler.cc b/src/lte/test/lte-test-fdmt-ff-mac-scheduler.cc
index 310936bdc..0326d732d 100644
--- a/src/lte/test/lte-test-fdmt-ff-mac-scheduler.cc
+++ b/src/lte/test/lte-test-fdmt-ff-mac-scheduler.cc
@@ -23,7 +23,6 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-
 #include <ns3/object.h>
 #include <ns3/spectrum-interference.h>
 #include <ns3/spectrum-error-model.h>
@@ -50,9 +49,6 @@
 #include <ns3/boolean.h>
 #include <ns3/enum.h>
 
-
-#include "lte-test-fdmt-ff-mac-scheduler.h"
-
 using namespace ns3;
 
 NS_LOG_COMPONENT_DEFINE ("LenaTestFdMtFfMacScheduler");
diff --git a/src/lte/test/lte-test-mimo.cc b/src/lte/test/lte-test-mimo.cc
index 81e6579fa..bc154ba33 100644
--- a/src/lte/test/lte-test-mimo.cc
+++ b/src/lte/test/lte-test-mimo.cc
@@ -21,7 +21,6 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-
 #include <ns3/object.h>
 #include <ns3/spectrum-interference.h>
 #include <ns3/spectrum-error-model.h>
@@ -30,7 +29,6 @@
 #include <ns3/simulator.h>
 #include <ns3/packet.h>
 #include <ns3/ptr.h>
-#include <iostream>
 #include "ns3/radio-bearer-stats-calculator.h"
 #include <ns3/mobility-building-info.h>
 #include <ns3/buildings-propagation-loss-model.h>
@@ -52,7 +50,6 @@
 #include <ns3/pointer.h>
 #include <ns3/enum.h>
 #include <ns3/buildings-helper.h>
-
 #include "lte-test-mimo.h"
 
 
diff --git a/src/lte/test/lte-test-pathloss-model.cc b/src/lte/test/lte-test-pathloss-model.cc
index a8a20219c..b3b67bb92 100644
--- a/src/lte/test/lte-test-pathloss-model.cc
+++ b/src/lte/test/lte-test-pathloss-model.cc
@@ -19,15 +19,10 @@
  */
 
 #include "ns3/simulator.h"
-
 #include "ns3/log.h"
-
 #include "ns3/spectrum-test.h"
-
 #include "ns3/lte-phy-tag.h"
 #include "ns3/lte-chunk-processor.h"
-
-
 #include <ns3/hybrid-buildings-propagation-loss-model.h>
 #include <ns3/node-container.h>
 #include <ns3/mobility-helper.h>
@@ -43,10 +38,8 @@
 #include <ns3/lte-ue-net-device.h>
 #include <ns3/lte-enb-net-device.h>
 #include <ns3/lte-ue-rrc.h>
-#include <ns3/lte-helper.h>
 #include <ns3/lte-enb-phy.h>
 #include <ns3/lte-ue-phy.h>
-
 #include "lte-test-ue-phy.h"
 #include "lte-test-pathloss-model.h"
 
diff --git a/src/lte/test/lte-test-tdmt-ff-mac-scheduler.cc b/src/lte/test/lte-test-tdmt-ff-mac-scheduler.cc
index ed2751084..95efda308 100644
--- a/src/lte/test/lte-test-tdmt-ff-mac-scheduler.cc
+++ b/src/lte/test/lte-test-tdmt-ff-mac-scheduler.cc
@@ -23,7 +23,6 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-
 #include <ns3/object.h>
 #include <ns3/spectrum-interference.h>
 #include <ns3/spectrum-error-model.h>
@@ -50,9 +49,6 @@
 #include <ns3/boolean.h>
 #include <ns3/enum.h>
 
-
-#include "lte-test-tdmt-ff-mac-scheduler.h"
-
 using namespace ns3;
 
 NS_LOG_COMPONENT_DEFINE ("LenaTestTdMtFfMacScheduler");
diff --git a/src/lte/test/lte-test-tta-ff-mac-scheduler.cc b/src/lte/test/lte-test-tta-ff-mac-scheduler.cc
index 1aee9e606..3c73ce93a 100644
--- a/src/lte/test/lte-test-tta-ff-mac-scheduler.cc
+++ b/src/lte/test/lte-test-tta-ff-mac-scheduler.cc
@@ -23,7 +23,6 @@
 #include <iostream>
 #include <sstream>
 #include <string>
-
 #include <ns3/object.h>
 #include <ns3/spectrum-interference.h>
 #include <ns3/spectrum-error-model.h>
@@ -50,9 +49,6 @@
 #include <ns3/boolean.h>
 #include <ns3/enum.h>
 
-
-#include "lte-test-tta-ff-mac-scheduler.h"
-
 using namespace ns3;
 
 NS_LOG_COMPONENT_DEFINE ("LenaTestTtaFfMacScheduler");
diff --git a/src/mesh/model/dot11s/hwmp-protocol.cc b/src/mesh/model/dot11s/hwmp-protocol.cc
index 99eeb4625..8688d21cc 100644
--- a/src/mesh/model/dot11s/hwmp-protocol.cc
+++ b/src/mesh/model/dot11s/hwmp-protocol.cc
@@ -27,7 +27,6 @@
 #include "ns3/packet.h"
 #include "ns3/mesh-point-device.h"
 #include "ns3/wifi-net-device.h"
-#include "ns3/mesh-point-device.h"
 #include "ns3/mesh-wifi-interface-mac.h"
 #include "ns3/random-variable-stream.h"
 #include "airtime-metric.h"
diff --git a/src/mesh/model/flame/flame-protocol.cc b/src/mesh/model/flame/flame-protocol.cc
index 80a46e97a..783c52262 100644
--- a/src/mesh/model/flame/flame-protocol.cc
+++ b/src/mesh/model/flame/flame-protocol.cc
@@ -28,7 +28,6 @@
 #include "ns3/packet.h"
 #include "ns3/mesh-point-device.h"
 #include "ns3/wifi-net-device.h"
-#include "ns3/mesh-point-device.h"
 #include "ns3/mesh-wifi-interface-mac.h"
 
 namespace ns3 {
diff --git a/src/mobility/examples/ns2-mobility-trace.cc b/src/mobility/examples/ns2-mobility-trace.cc
index 19bbff95b..54296accd 100644
--- a/src/mobility/examples/ns2-mobility-trace.cc
+++ b/src/mobility/examples/ns2-mobility-trace.cc
@@ -51,10 +51,8 @@
 #include <iostream>
 #include <fstream>
 #include <sstream>
-
 #include "ns3/core-module.h"
 #include "ns3/mobility-module.h"
-#include "ns3/mobility-module.h"
 #include "ns3/ns2-mobility-helper.h"
 
 using namespace ns3;
diff --git a/src/network/model/node.cc b/src/network/model/node.cc
index 5e8571f1b..eff3df88e 100644
--- a/src/network/model/node.cc
+++ b/src/network/model/node.cc
@@ -18,6 +18,7 @@
  * Authors: George F. Riley<riley@ece.gatech.edu>
  *          Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
+ 
 #include "node.h"
 #include "node-list.h"
 #include "net-device.h"
@@ -30,7 +31,6 @@
 #include "ns3/assert.h"
 #include "ns3/global-value.h"
 #include "ns3/boolean.h"
-#include "ns3/simulator.h"
 
 namespace ns3 {
 
diff --git a/src/olsr/test/bug780-test.cc b/src/olsr/test/bug780-test.cc
index ce285029f..69b71a319 100644
--- a/src/olsr/test/bug780-test.cc
+++ b/src/olsr/test/bug780-test.cc
@@ -33,7 +33,6 @@
 #include "ns3/boolean.h"
 #include "ns3/ipv4-address-helper.h"
 #include "ns3/ipv4-interface-container.h"
-#include "ns3/internet-stack-helper.h"
 #include "ns3/rng-seed-manager.h"
 #include "ns3/simple-net-device-helper.h"
 #include "ns3/simple-net-device.h"
diff --git a/src/topology-read/test/rocketfuel-topology-reader-test-suite.cc b/src/topology-read/test/rocketfuel-topology-reader-test-suite.cc
index fd92af37d..e8b433e32 100644
--- a/src/topology-read/test/rocketfuel-topology-reader-test-suite.cc
+++ b/src/topology-read/test/rocketfuel-topology-reader-test-suite.cc
@@ -28,7 +28,6 @@
 #include "ns3/abort.h"
 #include "ns3/attribute.h"
 #include "ns3/object-factory.h"
-#include "ns3/object-factory.h"
 #include "ns3/simulator.h"
 
 using namespace ns3;
diff --git a/src/uan/model/uan-channel.cc b/src/uan/model/uan-channel.cc
index e03fa5e78..57bb2c9f5 100644
--- a/src/uan/model/uan-channel.cc
+++ b/src/uan/model/uan-channel.cc
@@ -27,8 +27,6 @@
 #include "ns3/log.h"
 #include "ns3/pointer.h"
 #include "ns3/string.h"
-#include "ns3/log.h"
-
 #include "uan-channel.h"
 #include "uan-phy.h"
 #include "uan-prop-model.h"
diff --git a/src/wimax/examples/wimax-multicast.cc b/src/wimax/examples/wimax-multicast.cc
index 2d2958a48..18a224f77 100644
--- a/src/wimax/examples/wimax-multicast.cc
+++ b/src/wimax/examples/wimax-multicast.cc
@@ -59,7 +59,6 @@
 #include "ns3/csma-module.h"
 #include <iostream>
 #include "ns3/global-route-manager.h"
-#include "ns3/mobility-module.h"
 #include "ns3/internet-module.h"
 #include "ns3/vector.h"
 
diff --git a/src/wimax/model/bs-scheduler-rtps.cc b/src/wimax/model/bs-scheduler-rtps.cc
index ca1d60477..1689d1a74 100644
--- a/src/wimax/model/bs-scheduler-rtps.cc
+++ b/src/wimax/model/bs-scheduler-rtps.cc
@@ -35,7 +35,6 @@
 #include "service-flow.h"
 #include "service-flow-record.h"
 #include "service-flow-manager.h"
-#include "wimax-mac-queue.h"
 
 namespace ns3 {
 
diff --git a/src/wimax/model/ofdm-downlink-frame-prefix.cc b/src/wimax/model/ofdm-downlink-frame-prefix.cc
index 63a28acca..cb8800562 100644
--- a/src/wimax/model/ofdm-downlink-frame-prefix.cc
+++ b/src/wimax/model/ofdm-downlink-frame-prefix.cc
@@ -18,7 +18,6 @@
  * Author: Jahanzeb Farooq <jahanzeb.farooq@sophia.inria.fr>
  */
 
-#include <stdint.h>
 #include <stdint.h>
 #include "ofdm-downlink-frame-prefix.h"
 #include "ns3/address-utils.h"