auto import from //depot/cupcake/@135843
diff --git a/libutil/op_types.h b/libutil/op_types.h
new file mode 100644
index 0000000..c025b23
--- /dev/null
+++ b/libutil/op_types.h
@@ -0,0 +1,37 @@
+/**
+ * @file op_types.h
+ * General-utility types
+ *
+ * @remark Copyright 2002 OProfile authors
+ * @remark Read the file COPYING
+ *
+ * @author John Levon
+ * @author Philippe Elie
+ */
+
+#ifndef OP_TYPES_H
+#define OP_TYPES_H
+
+#ifndef __KERNEL__
+
+#include <sys/types.h>
+
+/*@{\name miscellaneous types */
+typedef unsigned char u8;
+typedef unsigned short u16;
+typedef unsigned int u32;
+typedef unsigned long long u64;
+typedef int fd_t;
+/*@}*/
+
+/** generic type for holding addresses */
+typedef unsigned long long vma_t;
+
+/** generic type to hold a sample count in pp tools */
+typedef u64 count_type;
+
+#else
+#include <linux/types.h>
+#endif
+
+#endif /* OP_TYPES_H */