diff --git a/types/convert.go b/types/convert.go
index 8477b5c..4db8451 100644
--- a/types/convert.go
+++ b/types/convert.go
@@ -87,10 +87,11 @@ func swapstars(s string) string {
 
 func (t *Type) CGoType() string {
 	ct := swapstars("C." + t.CType())
+	ct = strings.ReplaceAll(ct,"unsigned ","u")
+	ct = strings.ReplaceAll(ct,"signed ","u")
+	ct = strings.ReplaceAll(ct,"long ","long")
+	ct = strings.ReplaceAll(ct,"complex ","complex")
 	ct = strings.ReplaceAll(ct," ","_")
-	if ct == "C.long_long" {
-		ct = "C.long" // FIXME why?
-	}
 	return ct
 }