diff --git a/src/python/loxi/of10/__init__.py b/src/python/loxi/of10/__init__.py
index e1c5e3a..db3105d 100644
--- a/src/python/loxi/of10/__init__.py
+++ b/src/python/loxi/of10/__init__.py
@@ -6,7 +6,10 @@
 # Automatically generated by LOXI from template init.py
 # Do not modify
 
-import action, common, const, message
+import const
+import action
+import message
+import common
 from const import *
 from common import *
 from loxi import ProtocolError
diff --git a/src/python/loxi/of10/action.py b/src/python/loxi/of10/action.py
index a69de3b..e2cf539 100644
--- a/src/python/loxi/of10/action.py
+++ b/src/python/loxi/of10/action.py
@@ -9,8 +9,9 @@
 import struct
 import loxi
 import const
-import common
 import action
+import message
+import common
 import util
 import loxi.generic_util
 
diff --git a/src/python/loxi/of10/common.py b/src/python/loxi/of10/common.py
index 334ee4d..fb835a7 100644
--- a/src/python/loxi/of10/common.py
+++ b/src/python/loxi/of10/common.py
@@ -9,8 +9,9 @@
 import struct
 import loxi
 import const
-import common
 import action
+import message
+import common
 import util
 import loxi.generic_util
 
diff --git a/src/python/loxi/of10/message.py b/src/python/loxi/of10/message.py
index bd4b5f4..24b4e94 100644
--- a/src/python/loxi/of10/message.py
+++ b/src/python/loxi/of10/message.py
@@ -9,8 +9,9 @@
 import struct
 import loxi
 import const
-import common
 import action
+import message
+import common
 import util
 import loxi.generic_util