4 files changed, 6 insertions, 7 deletions
diff --git a/src/mesa/pipe/p_context.h b/src/mesa/pipe/p_context.h
index 25b5dc35e43..7a18d488657 100644
--- a/src/mesa/pipe/p_context.h
+++ b/src/mesa/pipe/p_context.h
@@ -29,7 +29,7 @@
 #define PIPE_CONTEXT_H
 
 #include "p_state.h"
-#include <stdint.h>
+
 
 struct pipe_state_cache;
 
@@ -97,7 +97,7 @@ struct pipe_context {
    boolean (*get_query_result)(struct pipe_context *pipe, 
                                struct pipe_query *q,
                                boolean wait,
-                               uint64_t *result);
+                               uint64 *result);
 
    /*
     * State functions
diff --git a/src/mesa/pipe/p_util.h b/src/mesa/pipe/p_util.h
index 46edcf30753..1bf606bf4b4 100644
--- a/src/mesa/pipe/p_util.h
+++ b/src/mesa/pipe/p_util.h
@@ -30,7 +30,6 @@
 
 #include "p_compiler.h"
 #include <math.h>
-#include <stdint.h>
 
 
 #ifdef WIN32
diff --git a/src/mesa/pipe/softpipe/sp_context.h b/src/mesa/pipe/softpipe/sp_context.h
index 394baf01097..3537f86a61e 100644
--- a/src/mesa/pipe/softpipe/sp_context.h
+++ b/src/mesa/pipe/softpipe/sp_context.h
@@ -76,7 +76,7 @@ struct softpipe_context {
    /* Counter for occlusion queries.  Note this supports overlapping
     * queries.
     */
-   uint64_t occlusion_count;
+   uint64 occlusion_count;
 
    /*
     * Mapped vertex buffers
diff --git a/src/mesa/pipe/softpipe/sp_query.c b/src/mesa/pipe/softpipe/sp_query.c
index bf753dad98f..6a8a43aedaf 100644
--- a/src/mesa/pipe/softpipe/sp_query.c
+++ b/src/mesa/pipe/softpipe/sp_query.c
@@ -37,8 +37,8 @@
 #include "sp_query.h"
 
 struct softpipe_query {
-   uint64_t start;
-   uint64_t end;
+   uint64 start;
+   uint64 end;
 };
 
 
@@ -87,7 +87,7 @@ static boolean
 softpipe_get_query_result(struct pipe_context *pipe, 
 			  struct pipe_query *q,
 			  boolean wait,
-			  uint64_t *result )
+			  uint64 *result )
 {
    struct softpipe_query *sq = softpipe_query(q);
    *result = sq->end - sq->start;