Rich's feedback

@@ -21,19 +21,18 @@
 
 /*
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright 2017 Jason King.
+ * Copyright 2018 Jason King.
  */
 
 #include <dlfcn.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <demangle.h>
-#include <sysdemangle.h>
+#include <demangle-sys.h>
 
 #include "dis_util.h"
 
 int g_error;    /* global process exit status, set when warn() is called */
 

@@ -91,11 +90,11 @@
         return (ret);
 }
 
 
 /*
- * Since -C flag explicitly says C++, for now at least, force language to
+ * Since the -C flag explicitly says C++, for now at least, force language to
  * C++
  */
 const char *
 dis_demangle(const char *name)
 {