diff --git a/headers/cpp/streambuf.h b/headers/cpp/streambuf.h
index 193c499382..52f5a963ee 100644
--- a/headers/cpp/streambuf.h
+++ b/headers/cpp/streambuf.h
@@ -58,7 +58,7 @@ extern "C" {
 #if _G_IO_IO_FILE_VERSION == 0x20001
 #define _IO_wchar_t _G_wchar_t
 #else
-#define _IO_wchar_t short
+#define _IO_wchar_t wchar_t
 #endif
 #endif
 
@@ -320,7 +320,7 @@ struct streambuf : public _IO_FILE { // protected??
     void setp(char* p, char* ep)
       { _IO_write_base=_IO_write_ptr=p; _IO_write_end=ep; }
     void setg(char* eb, char* g, char *eg) {
-      if (_IO_file_flags & _IO_IN_BACKUP) _IO_free_backup_area(this); 
+      if (_IO_file_flags & _IO_IN_BACKUP) _IO_free_backup_area(this);
       _IO_read_base = eb; _IO_read_ptr = g; _IO_read_end = eg; }
     char *shortbuf() { return _shortbuf; }
 
@@ -342,7 +342,7 @@ struct streambuf : public _IO_FILE { // protected??
     void unsave_markers(); // Make all streammarkers !saving().
     int put_mode() { return _flags & _IO_CURRENTLY_PUTTING; }
     int switch_to_get_mode();
-    
+
     streambuf(int flags=0);
   public:
     static int flush_all();