diff --git a/add_mesh_3d_function_surface.py b/add_mesh_3d_function_surface.py
index 5f5e74b53492d69311ef3ef037c624158c1273c8..1e15ddcc639fe9969fdef50253a63e05fe699d5e 100644
--- a/add_mesh_3d_function_surface.py
+++ b/add_mesh_3d_function_surface.py
@@ -497,7 +497,6 @@ class AddXYZFunctionSurface(bpy.types.Operator):
 
 
 ################################
-import space_info
 
 
 # Define "3D Function Surface" menu
@@ -517,16 +516,18 @@ def register():
     bpy.utils.register_module(__name__)
 
     # Add menus to the "Add Mesh" menu
-    space_info.INFO_MT_mesh_add.append(menu_func_z)
-    space_info.INFO_MT_mesh_add.append(menu_func_xyz)
+    INFO_MT_mesh_add = bpy.types.INFO_MT_mesh_add
+    INFO_MT_mesh_add.append(menu_func_z)
+    INFO_MT_mesh_add.append(menu_func_xyz)
 
 
 def unregister():
     bpy.utils.unregister_module(__name__)
 
     # Remove menus from the "Add Mesh" menu.
-    space_info.INFO_MT_mesh_add.remove(menu_func_z)
-    space_info.INFO_MT_mesh_add.remove(menu_func_xyz)
+    INFO_MT_mesh_add = bpy.types.INFO_MT_mesh_add
+    INFO_MT_mesh_add.remove(menu_func_z)
+    INFO_MT_mesh_add.remove(menu_func_xyz)
 
 if __name__ == "__main__":
-    register()
+    register()
\ No newline at end of file
diff --git a/add_mesh_ant_landscape.py b/add_mesh_ant_landscape.py
index b07fe992f0b42149e208b3c8f523381b159613e4..48f3675f796362b4875f706c73955b999b57c9ed 100644
--- a/add_mesh_ant_landscape.py
+++ b/add_mesh_ant_landscape.py
@@ -799,7 +799,6 @@ class landscape_add(bpy.types.Operator):
 
 ###------------------------------------------------------------
 # Register
-import space_info
 
     # Define "Landscape" menu
 def menu_func_landscape(self, context):
@@ -808,12 +807,12 @@ def menu_func_landscape(self, context):
 def register():
     bpy.utils.register_module(__name__)
 
-    space_info.INFO_MT_mesh_add.append(menu_func_landscape)
+    bpy.types.INFO_MT_mesh_add.append(menu_func_landscape)
 
 def unregister():
     bpy.utils.unregister_module(__name__)
 
-    space_info.INFO_MT_mesh_add.remove(menu_func_landscape)
+    bpy.types.INFO_MT_mesh_add.remove(menu_func_landscape)
 
 if __name__ == "__main__":
     register()
diff --git a/add_mesh_extras.py b/add_mesh_extras.py
index 40236d04b93091e77eda63eb9850dd12b9301594..01e1b4b0949d7be744034999a6c1553778799eab 100644
--- a/add_mesh_extras.py
+++ b/add_mesh_extras.py
@@ -522,7 +522,6 @@ class INFO_MT_mesh_extras_add(bpy.types.Menu):
 
 
 # Register all operators and panels
-import space_info
 
 # Define "Extras" menu
 def menu_func(self, context):
@@ -533,14 +532,14 @@ def register():
     bpy.utils.register_module(__name__)
 
     # Add "Extras" menu to the "Add Mesh" menu
-    space_info.INFO_MT_mesh_add.append(menu_func)
+    bpy.types.INFO_MT_mesh_add.append(menu_func)
 
 
 def unregister():
     bpy.utils.unregister_module(__name__)
 
     # Remove "Extras" menu from the "Add Mesh" menu.
-    space_info.INFO_MT_mesh_add.remove(menu_func)
+    bpy.types.INFO_MT_mesh_add.remove(menu_func)
 
 if __name__ == "__main__":
     register()
diff --git a/add_mesh_gemstones.py b/add_mesh_gemstones.py
index 9ae823827afad40d6bc89c5fbd963be6408b44ba..13bcbc1ba839280da98c3d2afca4deea7f10eb0b 100644
--- a/add_mesh_gemstones.py
+++ b/add_mesh_gemstones.py
@@ -347,7 +347,6 @@ class INFO_MT_mesh_gemstones_add(bpy.types.Menu):
 
 
 # Register all operators and panels
-import space_info
 
 
 # Define "Gemstones" menu
@@ -359,14 +358,15 @@ def register():
     bpy.utils.register_module(__name__)
 
     # Add "Gemstones" menu to the "Add Mesh" menu
-    space_info.INFO_MT_mesh_add.append(menu_func)
+    bpy.types.INFO_MT_mesh_add.append(menu_func)
 
 
 def unregister():
     bpy.utils.unregister_module(__name__)
 
     # Remove "Gemstones" menu from the "Add Mesh" menu.
-    space_info.INFO_MT_mesh_add.remove(menu_func)
+    bpy.types.INFO_MT_mesh_add.remove(menu_func)
+
 
 if __name__ == "__main__":
     register()
diff --git a/add_mesh_pipe_joint.py b/add_mesh_pipe_joint.py
index 392ca09933f8051a5b6760199a1881cfd7f9ad61..86e1d1f378d07e635118660437313ab2c5ad496d 100644
--- a/add_mesh_pipe_joint.py
+++ b/add_mesh_pipe_joint.py
@@ -1126,8 +1126,6 @@ class INFO_MT_mesh_pipe_joints_add(bpy.types.Menu):
 
 ################################
 
-import space_info
-
 
 # Define "Pipe Joints" menu
 def menu_func(self, context):
@@ -1138,14 +1136,15 @@ def register():
     bpy.utils.register_module(__name__)
 
     # Add "Pipe Joints" menu to the "Add Mesh" menu
-    space_info.INFO_MT_mesh_add.append(menu_func)
+    bpy.types.INFO_MT_mesh_add.append(menu_func)
 
 
 def unregister():
     bpy.utils.unregister_module(__name__)
 
     # Remove "Pipe Joints" menu from the "Add Mesh" menu.
-    space_info.INFO_MT_mesh_add.remove(menu_func)
+    bpy.types.INFO_MT_mesh_add.remove(menu_func)
+
 
 if __name__ == "__main__":
     register()
diff --git a/add_mesh_solid.py b/add_mesh_solid.py
index 48d73e44d27400d2418859a4c633fd7761cc85de..46ee7327f7fc04627e52e250b9eb345d853f224f 100644
--- a/add_mesh_solid.py
+++ b/add_mesh_solid.py
@@ -796,9 +796,6 @@ class OtherMenu(bpy.types.Menu):
         layout.operator_context = 'INVOKE_REGION_WIN'
         layout.operator(Solids.bl_idname, text = "Cube").preset = "c"
         layout.operator(Solids.bl_idname, text = "Soccer ball").preset = "sb"
-        
-
-import space_info
 
 
 def menu_func(self, context):
@@ -808,12 +805,14 @@ def menu_func(self, context):
 def register():
     bpy.utils.register_module(__name__)
 
-    space_info.INFO_MT_mesh_add.append(menu_func)
+    bpy.types.INFO_MT_mesh_add.append(menu_func)
+
 
 def unregister():
     bpy.utils.unregister_module(__name__)
 
-    space_info.INFO_MT_mesh_add.remove(menu_func)
-      
+    bpy.types.INFO_MT_mesh_add.remove(menu_func)
+
+
 if __name__ == "__main__":
     register()
diff --git a/object_fracture/__init__.py b/object_fracture/__init__.py
index 8fac798828509930342754d462ab9e300b8c3e54..33d1c851c0bd67d87b8add2807f1d456280c3805 100644
--- a/object_fracture/__init__.py
+++ b/object_fracture/__init__.py
@@ -58,8 +58,6 @@ class INFO_MT_add_fracture_objects(bpy.types.Menu):
         layout.operator("object.import_fracture_recorder",
             text="Rigidbody Recorder")
 
-import space_info
-
 
 def menu_func(self, context):
     self.layout.menu("INFO_MT_add_fracture_objects", icon="PLUGIN")
@@ -69,14 +67,15 @@ def register():
     bpy.utils.register_module(__name__)
 
     # Add the "add fracture objects" menu to the "Add" menu
-    space_info.INFO_MT_add.append(menu_func)
+    bpy.types.INFO_MT_add.append(menu_func)
 
 
 def unregister():
     bpy.utils.unregister_module(__name__)
 
     # Remove "add fracture objects" menu from the "Add" menu.
-    space_info.INFO_MT_add.remove(menu_func)
+    bpy.types.INFO_MT_add.remove(menu_func)
+
 
 if __name__ == "__main__":
     register()
diff --git a/rigify/ui.py b/rigify/ui.py
index 7fadbd3780158ce3fbdb7cb5cd73e4bdef966cc5..a751cfe93fe585494a5448ce3c8bbdc866126e62 100644
--- a/rigify/ui.py
+++ b/rigify/ui.py
@@ -240,7 +240,7 @@ class Sample(bpy.types.Operator):
 
 #menu_func = (lambda self, context: self.layout.menu("INFO_MT_armature_metarig_add", icon='OUTLINER_OB_ARMATURE'))
 
-#import space_info  # ensure the menu is loaded first
+#from bl_ui import space_info  # ensure the menu is loaded first
 
 def register():
     bpy.utils.register_class(DATA_PT_rigify_buttons)