Misc. updates and bug fixes
diff --git a/parttypes.h b/parttypes.h
index 5a34d30..7e6d892 100644
--- a/parttypes.h
+++ b/parttypes.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <unistd.h>
 #include <stdlib.h>
-#include <string.h>
+#include <string>
 #include "support.h"
 
 #ifndef __PARTITION_TYPES
@@ -39,7 +39,7 @@
                const char* name, int toDisplay = 1);
    void ShowTypes(void);
    int Valid(uint16_t);
-   char* GUIDToName(struct GUIDData typeCode, char typeName[]);
+   string GUIDToName(struct GUIDData typeCode);
    struct GUIDData IDToGUID(uint16_t ID);
    uint16_t GUIDToID(struct GUIDData);
 };