diff --git a/bindings/python/ns3modulescan.py b/bindings/python/ns3modulescan.py
index 618e57155..c2877bc9f 100644
--- a/bindings/python/ns3modulescan.py
+++ b/bindings/python/ns3modulescan.py
@@ -303,7 +303,7 @@ def ns3_module_scan(top_builddir, pygen_file_name, everything_h, cflags):
             #'NS3_ASSERT_ENABLE': None,
             #'NS3_LOG_ENABLE': None,
             },
-        cflags=('--gccxml-cxxflags %r' % (cflags,))
+        cflags=('--gccxml-cxxflags %r %s' % (cflags,'-DPYTHON_SCAN'))
         )
 
     module_parser.parse_init([everything_h],
diff --git a/bindings/python/wscript b/bindings/python/wscript
index 938d60798..e2320a69a 100644
--- a/bindings/python/wscript
+++ b/bindings/python/wscript
@@ -419,12 +419,6 @@ __dummy_function_to_force_template_instantiation_v2 ()
    Time t1, t2, t3;
    t1 = t2 + t3;
    t1 = t2 - t3;
-   TimeSquare tsq = t2*t3;
-   Time tsqdiv = tsq/Seconds(1);
-   Scalar scal = t2/t3;
-   TimeInvert inv = scal/t3;
-   t1 = scal*t1;
-   t1 = t1/scal;
    t1 < t2;
    t1 <= t2;
    t1 == t2;
diff --git a/src/core/model/int64x64-128.h b/src/core/model/int64x64-128.h
index 55d369304..cae689ef1 100644
--- a/src/core/model/int64x64-128.h
+++ b/src/core/model/int64x64-128.h
@@ -1,4 +1,5 @@
-#ifndef INT64X64_128_H
+#include "ns3/core-config.h"
+#if !defined(INT64X64_128_H) && defined (INT64X64_USE_128) && !defined(PYTHON_SCAN)
 #define INT64X64_128_H
 
 #include "ns3/core-config.h"
diff --git a/src/core/model/int64x64-cairo.h b/src/core/model/int64x64-cairo.h
index 6d11e192d..d5cecb115 100644
--- a/src/core/model/int64x64-cairo.h
+++ b/src/core/model/int64x64-cairo.h
@@ -1,4 +1,5 @@
-#ifndef INT64X64_CAIRO_H
+#include "ns3/core-config.h"
+#if !defined(INT64X64_CAIRO_H) && defined (INT64X64_USE_CAIRO) && !defined(PYTHON_SCAN)
 #define INT64X64_CAIRO_H
 
 #include <stdint.h>
diff --git a/src/core/model/int64x64-double.h b/src/core/model/int64x64-double.h
index 6a53cf68a..678c982f1 100644
--- a/src/core/model/int64x64-double.h
+++ b/src/core/model/int64x64-double.h
@@ -1,4 +1,5 @@
-#ifndef INT64X64_DOUBLE_H
+#include "ns3/core-config.h"
+#if !defined(INT64X64_DOUBLE_H) && (defined (INT64X64_USE_DOUBLE) || defined(PYTHON_SCAN))
 #define INT64X64_DOUBLE_H
 
 #include <iostream>
diff --git a/src/core/wscript b/src/core/wscript
index 8aaaac179..b89d5843a 100644
--- a/src/core/wscript
+++ b/src/core/wscript
@@ -211,6 +211,7 @@ def build(bld):
         'model/attribute-accessor-helper.h',
         'model/boolean.h',
         'model/int64x64.h',
+        'model/int64x64-double.h',
         'model/integer.h',
         'model/uinteger.h',
         'model/double.h',