diff --git a/include/mach.h b/include/mach.h
index 23089e4..0f1a5ae 100644
--- a/include/mach.h
+++ b/include/mach.h
@@ -1,3 +1,11 @@
+#ifndef _MACH_H_
+#define _MACH_H_ 1
+#if defined(__cplusplus)
+extern "C" { 
+#endif
+
+AUTOLIB(mach)
+
 /*
  * Architecture-dependent application data.
  * 
@@ -351,8 +359,6 @@
 	uint		format;		/* print format: 'x', 'X', 'f', 'z', 'Z' */
 };
 
-Regdesc*	regdesc(char*);
-
 enum
 {
 	/* machine types */
@@ -498,7 +504,7 @@
 
 Symbol*	flookupsym(Fhdr*, char*);
 Symbol*	ffindsym(Fhdr*, Loc, uint);
-Symbol*	addsym(Fhdr*, Symbol*);
+Symbol*	_addsym(Fhdr*, Symbol*);
 
 /*
  * Stack frame walking.
@@ -525,3 +531,7 @@
 };
 
 extern int machdebug;
+#if defined(__cplusplus)
+}
+#endif
+#endif