diff --git a/pyopencl/scan.py b/pyopencl/scan.py
index 0ea9e01e28fdbeca4058290ca0352639f4597880..93339eba32291be578bb4fa8503a118656d5db86 100644
--- a/pyopencl/scan.py
+++ b/pyopencl/scan.py
@@ -1,10 +1,6 @@
 """Scan primitive."""
 
-from __future__ import division
-from __future__ import absolute_import
-import six
-from six.moves import range
-from six.moves import zip
+from __future__ import division, absolute_import
 
 __copyright__ = """
 Copyright 2011-2012 Andreas Kloeckner
@@ -28,6 +24,9 @@ Derived from code within the Thrust project, https://github.com/thrust/thrust/
 
 """
 
+import six
+from six.moves import range, zip
+
 import numpy as np
 
 import pyopencl as cl
diff --git a/pyopencl/tools.py b/pyopencl/tools.py
index 36fafbc381441139b0bc62bf185005678ba2856c..c7bd5ed00280840f78d751f895e6013ea2154601 100644
--- a/pyopencl/tools.py
+++ b/pyopencl/tools.py
@@ -458,7 +458,7 @@ class _CDeclList:
         if dtype in vec.type_to_scalar_and_count:
             return
 
-        for name, field_data in six.iteritems(dtype.fields):
+        for name, field_data in sorted(six.iteritems(dtype.fields)):
             field_dtype, offset = field_data[:2]
             self.add_dtype(field_dtype)
 
@@ -846,12 +846,12 @@ class _TemplateRenderer(object):
         if arguments is not None:
             cdl.visit_arguments(arguments)
 
-        for tv in six.itervalues(self.type_aliases):
+        for _, tv in sorted(six.iteritems(self.type_aliases)):
             cdl.add_dtype(tv)
 
         type_alias_decls = [
                 "typedef %s %s;" % (dtype_to_ctype(val), name)
-                for name, val in six.iteritems(self.type_aliases)
+                for name, val in sorted(six.iteritems(self.type_aliases))
                 ]
 
         return cdl.get_declarations() + "\n" + "\n".join(type_alias_decls)