diff --git a/src/nouveau/codegen/nv50_ir.cpp b/src/nouveau/codegen/nv50_ir.cpp
index 95227a5eb3a..b26a72531fa 100644
--- a/src/nouveau/codegen/nv50_ir.cpp
+++ b/src/nouveau/codegen/nv50_ir.cpp
@@ -275,7 +275,7 @@ LValue::isUniform() const
    return !insn->srcExists(1) && insn->getSrc(0)->isUniform();
 }
 
-Symbol::Symbol(Program *prog, DataFile f, ubyte fidx)
+Symbol::Symbol(Program *prog, DataFile f, uint8_t fidx)
 {
    baseSym = NULL;
 
diff --git a/src/nouveau/codegen/nv50_ir.h b/src/nouveau/codegen/nv50_ir.h
index 35a8f0a8a50..ec28b79b282 100644
--- a/src/nouveau/codegen/nv50_ir.h
+++ b/src/nouveau/codegen/nv50_ir.h
@@ -790,7 +790,7 @@ public:
 class Symbol : public Value
 {
 public:
-   Symbol(Program *, DataFile file = FILE_MEMORY_CONST, ubyte fileIdx = 0);
+   Symbol(Program *, DataFile file = FILE_MEMORY_CONST, uint8_t fileIdx = 0);
    ~Symbol() { }
 
    virtual Symbol *clone(ClonePolicy<Function>&) const;
@@ -804,7 +804,7 @@ public:
    // print with indirect values
    int print(char *, size_t, Value *, Value *, DataType ty = TYPE_NONE) const;
 
-   inline void setFile(DataFile file, ubyte fileIndex = 0)
+   inline void setFile(DataFile file, uint8_t fileIndex = 0)
    {
       reg.file = file;
       reg.fileIndex = fileIndex;
diff --git a/src/nouveau/codegen/nv50_ir_driver.h b/src/nouveau/codegen/nv50_ir_driver.h
index 0e350ce099b..d8bd868270f 100644
--- a/src/nouveau/codegen/nv50_ir_driver.h
+++ b/src/nouveau/codegen/nv50_ir_driver.h
@@ -52,9 +52,9 @@ struct nv50_ir_varying
    unsigned input    : 1; /* indicates direction of system values */
    unsigned oread    : 1; /* true if output is read from parallel TCP */
 
-   ubyte id; /* TGSI register index */
-   ubyte sn; /* TGSI semantic name */
-   ubyte si; /* TGSI semantic index */
+   uint8_t id; /* TGSI register index */
+   uint8_t sn; /* TGSI semantic name */
+   uint8_t si; /* TGSI semantic index */
 };
 
 #ifndef NDEBUG