--- src/symboltable.cc
+++ src/symboltable.cc
@@ -11,8 +11,11 @@
 #include <string>
 #include <map>
 #include <cstdlib>		// For malloc() and friends
+#include <cstring>		// For strlen() and friends
 #include "symboltable.h"
 
+using namespace std;
+
 static char *make_c_string(const string &s);
 
 map<string,string> table;	/* XXX - Is this going to cause problems on
--- src/symboltable.h
+++ src/symboltable.h
@@ -26,7 +26,7 @@
 			/* Initialize the symbol table based on the
 			 * arguments. */
 #ifdef __cplusplus
-};
+}
 #endif	/* __cplusplus */
 
 /* This is for Emacs's benefit: