diff --git a/Makefile.am b/Makefile.am
index 4a8847e4c..7ce7f06dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -513,6 +513,7 @@ libutil_a_SOURCES = \
 	src/util/Chrono.hxx \
 	src/util/Clamp.hxx \
 	src/util/DeleteDisposer.hxx \
+	src/util/OffsetPointer.hxx \
 	src/util/Alloc.cxx src/util/Alloc.hxx \
 	src/util/AllocatedArray.hxx \
 	src/util/VarSize.hxx \
diff --git a/src/util/Cast.hxx b/src/util/Cast.hxx
index b530878e0..d71fb593e 100644
--- a/src/util/Cast.hxx
+++ b/src/util/Cast.hxx
@@ -30,28 +30,11 @@
 #ifndef CAST_HXX
 #define CAST_HXX
 
+#include "OffsetPointer.hxx"
 #include "Compiler.h"
 
 #include <stddef.h>
 
-/**
- * Offset the given pointer by the specified number of bytes.
- */
-static inline constexpr void *
-OffsetPointer(void *p, ptrdiff_t offset)
-{
-	return (char *)p + offset;
-}
-
-/**
- * Offset the given pointer by the specified number of bytes.
- */
-static inline constexpr const void *
-OffsetPointer(const void *p, ptrdiff_t offset)
-{
-	return (const char *)p + offset;
-}
-
 template<typename T, typename U>
 static inline constexpr T *
 OffsetCast(U *p, ptrdiff_t offset)
diff --git a/src/util/OffsetPointer.hxx b/src/util/OffsetPointer.hxx
new file mode 100644
index 000000000..ddb301610
--- /dev/null
+++ b/src/util/OffsetPointer.hxx
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2013-2014 Max Kellermann <max.kellermann@gmail.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the
+ * distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <stddef.h>
+
+/**
+ * Offset the given pointer by the specified number of bytes.
+ */
+static inline constexpr void *
+OffsetPointer(void *p, ptrdiff_t offset)
+{
+	return (char *)p + offset;
+}
+
+/**
+ * Offset the given pointer by the specified number of bytes.
+ */
+static inline constexpr const void *
+OffsetPointer(const void *p, ptrdiff_t offset)
+{
+	return (const char *)p + offset;
+}