diff --git a/src/dragon/config/defaults.yml b/src/dragon/config/defaults.yml
index 5df0abdbc..8e5cf2f97 100644
--- a/src/dragon/config/defaults.yml
+++ b/src/dragon/config/defaults.yml
@@ -52,6 +52,7 @@ InternalDefaults:
   internalldflags: '$internalcflags $typeldflags $frameworks $libs $libflags $lopts $libSearch $ldflags $libs'
   internalsigntarget: '$signdir/$build_target_file.unsigned'
   internalsymtarget: '$signdir/$build_target_file.unsym'
+  internallibflags: '-lobjc -lc++'
   pwd: '.'
 
 # Applied on top of both of these.
diff --git a/src/dragongen/generation.py b/src/dragongen/generation.py
index 9e543edff..f11f8d351 100644
--- a/src/dragongen/generation.py
+++ b/src/dragongen/generation.py
@@ -282,7 +282,7 @@ def rules_and_build_statements(self) -> (list, list):
         if 'logos_files' in filedict:
             for f in standardize_file_list(subdir, filedict['logos_files']):
                 used_rules.add('logos')
-                linker_conds.add('-lobjc') # TODO: generalize elsewhere
+                linker_conds.add('-lobjc')
 
                 name, ext = os.path.split(f)[1], os.path.splitext(f)[1]
                 if ext == '.x':
@@ -293,7 +293,7 @@ def rules_and_build_statements(self) -> (list, list):
                     build_state.append(Build(f'$builddir/logos/{name}.mm', 'logos', f))
                     filedict.setdefault('objcxx_files', [])
                     filedict['objcxx_files'].append(f'$builddir/logos/{name}.mm')
-                    linker_conds.add('-lc++') # TODO: generalize elsewhere
+                    linker_conds.add('-lc++')
 
         # Deal with compilation
         for a in self.project_variables['archs']: