diff --git a/lib/rb/ext/strlcpy.c b/lib/rb/ext/strlcpy.c
index 3996950..6700ff2 100644
--- a/lib/rb/ext/strlcpy.c
+++ b/lib/rb/ext/strlcpy.c
@@ -17,11 +17,10 @@
  * under the License.
  */
 
-#include <string.h>
+#include "strlcpy.h"
 
 #ifndef HAVE_STRLCPY
 #define HAVE_STRLCPY
-
 size_t
 strlcpy (char *dst, const char *src, size_t dst_sz)
 {
@@ -38,7 +37,5 @@
       *(dst - 1) = '\0';
     return n + strlen (src);
 }
-#else
-extern size_t strlcpy(char *, const char *, size_t);
 #endif
 
diff --git a/lib/rb/ext/strlcpy.h b/lib/rb/ext/strlcpy.h
new file mode 100644
index 0000000..b37f6f4
--- /dev/null
+++ b/lib/rb/ext/strlcpy.h
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+#include <string.h>
+
+#ifndef HAVE_STRLCPY
+size_t
+strlcpy (char *dst, const char *src, size_t dst_sz)
+#else
+extern size_t strlcpy(char *, const char *, size_t);
+#endif
+
diff --git a/lib/rb/ext/struct.c b/lib/rb/ext/struct.c
index d719e33..5a9a679 100644
--- a/lib/rb/ext/struct.c
+++ b/lib/rb/ext/struct.c
@@ -20,6 +20,7 @@
 #include "struct.h"
 #include "constants.h"
 #include "macros.h"
+#include "strlcpy.h"
 
 VALUE thrift_union_class;