diff --git a/src/gallium/include/pipe/p_compiler.h b/src/gallium/include/pipe/p_compiler.h
index b951ac108b3..f543236a0e1 100644
--- a/src/gallium/include/pipe/p_compiler.h
+++ b/src/gallium/include/pipe/p_compiler.h
@@ -103,22 +103,8 @@ typedef unsigned char boolean;
 
 
 
+/* Macro for stack alignment. */
 #if defined(__GNUC__)
-#define PIPE_DEPRECATED  __attribute__((__deprecated__))
-#else
-#define PIPE_DEPRECATED
-#endif
-
-
-
-/* Macros for data alignment. */
-#if defined(__GNUC__)
-
-/* See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Type-Attributes.html */
-#define PIPE_ALIGN_TYPE(_alignment, _type) _type __attribute__((aligned(_alignment)))
-
-/* See http://gcc.gnu.org/onlinedocs/gcc-4.4.2/gcc/Variable-Attributes.html */
-#define PIPE_ALIGN_VAR(_alignment) __attribute__((aligned(_alignment)))
 
 #ifdef PIPE_ARCH_X86
 #define PIPE_ALIGN_STACK __attribute__((force_align_arg_pointer))
@@ -128,17 +114,10 @@ typedef unsigned char boolean;
 
 #elif defined(_MSC_VER)
 
-/* See http://msdn.microsoft.com/en-us/library/83ythb65.aspx */
-#define PIPE_ALIGN_TYPE(_alignment, _type) __declspec(align(_alignment)) _type
-#define PIPE_ALIGN_VAR(_alignment) __declspec(align(_alignment))
-
 #define PIPE_ALIGN_STACK
 
 #elif defined(SWIG)
 
-#define PIPE_ALIGN_TYPE(_alignment, _type) _type
-#define PIPE_ALIGN_VAR(_alignment)
-
 #define PIPE_ALIGN_STACK
 
 #else
@@ -165,21 +144,6 @@ typedef unsigned char boolean;
    union { char __cl_space[CACHE_LINE_SIZE]; \
            decl; }
 
-#if defined(__GNUC__)
-
-#define PIPE_READ_WRITE_BARRIER() __asm__("":::"memory")
-
-#elif defined(_MSC_VER)
-
-#define PIPE_READ_WRITE_BARRIER() _ReadWriteBarrier()
-
-#else
-
-#warning "Unsupported compiler"
-#define PIPE_READ_WRITE_BARRIER() /* */
-
-#endif
-
 #if defined(__cplusplus)
 }
 #endif