diff --git a/common/include/ui.h b/common/include/ui.h
index c171a5196..a6a0469ea 100644
--- a/common/include/ui.h
+++ b/common/include/ui.h
@@ -260,7 +260,7 @@ UI_DIALOG * ui_create_dialog( short x, short y, short w, short h, enum dialog_fl
 }
 
 template <>
-UI_DIALOG * ui_create_dialog( short x, short y, short w, short h, enum dialog_flags flags, typename ui_subfunction_t<void>::type callback, void *userdata );
+UI_DIALOG * ui_create_dialog( short x, short y, short w, short h, enum dialog_flags flags, ui_subfunction_t<void>::type callback, void *userdata );
 
 extern struct window *ui_dialog_get_window(UI_DIALOG *dlg);
 extern void ui_dialog_set_current_canvas(UI_DIALOG *dlg);
diff --git a/common/main/segment.h b/common/main/segment.h
index a83b8b714..49a73b759 100644
--- a/common/main/segment.h
+++ b/common/main/segment.h
@@ -356,10 +356,10 @@ class visited_segment_bitarray_t : public visited_segment_mask_t<bool, 1>
 		}
 		operator int() const DXX_CXX11_EXPLICIT_DELETE;
 	};
-	struct bitproxy_t : public tmpl_bitproxy_t<typename array_t::reference>
+	struct bitproxy_t : public tmpl_bitproxy_t<array_t::reference>
 	{
-		bitproxy_t(typename array_t::reference byte, unsigned shift) :
-			tmpl_bitproxy_t<typename array_t::reference>(byte, shift)
+		bitproxy_t(array_t::reference byte, unsigned shift) :
+			tmpl_bitproxy_t<array_t::reference>(byte, shift)
 		{
 		}
 		bitproxy_t& operator=(bool b)
@@ -372,7 +372,7 @@ class visited_segment_bitarray_t : public visited_segment_mask_t<bool, 1>
 		}
 		bitproxy_t& operator=(int) DXX_CXX11_EXPLICIT_DELETE;
 	};
-	typedef tmpl_bitproxy_t<typename array_t::const_reference> const_bitproxy_t;
+	typedef tmpl_bitproxy_t<array_t::const_reference> const_bitproxy_t;
 public:
 	bitproxy_t operator[](size_type segnum)
 	{