diff --git a/include/osmocom/vty/buffer.h b/include/osmocom/vty/buffer.h
index 482a919..f6c86a1 100644
--- a/include/osmocom/vty/buffer.h
+++ b/include/osmocom/vty/buffer.h
@@ -39,7 +39,7 @@
 /* Add the given data to the end of the buffer. */
 extern void buffer_put(struct buffer *, const void *, size_t);
 /* Add a single character to the end of the buffer. */
-extern void buffer_putc(struct buffer *, u_char);
+extern void buffer_putc(struct buffer *, unsigned char);
 /* Add a NUL-terminated string to the end of the buffer. */
 extern void buffer_putstr(struct buffer *, const char *);
 
diff --git a/include/osmocom/vty/command.h b/include/osmocom/vty/command.h
index 3acbe78..89dc28f 100644
--- a/include/osmocom/vty/command.h
+++ b/include/osmocom/vty/command.h
@@ -122,7 +122,7 @@
 	unsigned int cmdsize;	/*!< \brief Command index count. */
 	char *config;		/*!< \brief Configuration string */
 	vector subconfig;	/*!< \brief Sub configuration string */
-	u_char attr;		/*!< \brief Command attributes */
+	unsigned char attr;	/*!< \brief Command attributes */
 };
 
 /*! \brief Command description structure. */