diff --git a/include/sys/sysmacros.h b/include/sys/sysmacros.h
new file mode 100644
index 0000000000..a56037eafb
--- /dev/null
+++ b/include/sys/sysmacros.h
@@ -0,0 +1,32 @@
+/****************************************************************************
+ * include/sys/sysmacros.h
+ *
+ * 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.
+ *
+ ****************************************************************************/
+
+#ifndef __INCLUDE_SYS_SYSMACROS_H
+#define __INCLUDE_SYS_SYSMACROS_H
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define major(x)          ((int)(0x00ff & ((x) >> 8)))
+#define minor(x)          ((int)(0xffff00ff & (x)))
+#define makedev(maj, min) ((0xff00 & ((maj) << 8)) | (0xffff00ff & (min)))
+
+#endif /* __INCLUDE_SYS_SYSMACROS_H */
diff --git a/include/sys/types.h b/include/sys/types.h
index 475e59321b..d4d4ce0918 100644
--- a/include/sys/types.h
+++ b/include/sys/types.h
@@ -131,7 +131,7 @@ typedef int16_t      gid_t;
 
 /* dev_t is used for device IDs */
 
-typedef uint16_t     dev_t;
+typedef uint32_t     dev_t;
 
 /* ino_t is used for file serial numbers */