Index: tools/build_common_defs.py
===================================================================
diff -u -r18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df -r6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1
--- tools/build_common_defs.py	(.../build_common_defs.py)	(revision 18c90a1b2b6c7339bdd192a2d2fac32f2b8a35df)
+++ tools/build_common_defs.py	(.../build_common_defs.py)	(revision 6d104d3185ac3ed7c18c97ecdc13fd59bf53a8d1)
@@ -167,7 +167,7 @@
                       cpp_header="AlarmDefs.h",
                       code_prepend=  ("\n"
                                       "from enum import unique\n"
-                                      "from ..utils.base import AlarmEnum\n"),
+                                      "from ..utils.enums import AlarmEnum\n"),
                       code_class_def=("\n\n" 
                                       "# Branch: {0}\n" 
                                       "@unique\n"
@@ -189,7 +189,7 @@
                       cpp_header="MsgDefs.h",
                       code_prepend=  ("\n"
                                       "from enum import unique\n"
-                                      "from ..utils.base import DialinEnum\n"),
+                                      "from ..utils.enums import DialinEnum\n"),
                       code_class_def=("\n\n"
                                       "# Branch: {0}\n"
                                       "@unique\n"