--- a/open-src/driver/xf86-input-mouse/Makefile	Fri Jan 22 14:17:58 2016 -0800
+++ b/open-src/driver/xf86-input-mouse/Makefile	Fri Jan 22 21:21:32 2016 -0800
@@ -1,8 +1,8 @@
 ###############################################################################
 #
-# xf86-input-mouse 1.x Makefile
+# xf86-input-mouse Makefile
 #
-# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -56,6 +56,9 @@
 MODULE_PKGCONFIG_DIR=$(PKGCONFIG_DIR_SHARE)
 MODULE_PKGCONFIG_DIR_SET=yes
 
+# Fix path for installing headers in proto area and in xorg-mouse.pc
+FIX_PC_FILES = xorg-mouse.pc.in
+MODULE_CONFIG_OPTS += --with-sdkdir='$(XORG_SDK_INCLUDES_DIR)'
 MODULE_INSTALL_MAKEFLAGS = sdkdir='$(XORG_SDK_INCLUDES_DIR)'
 
 include ../Makefile.inc

--- a/open-src/driver/xf86-input-synaptics/Makefile	Fri Jan 22 14:17:58 2016 -0800
+++ b/open-src/driver/xf86-input-synaptics/Makefile	Fri Jan 22 21:21:32 2016 -0800
@@ -2,7 +2,7 @@
 #
 # xf86-input-synaptics driver for Synaptics & compatible touchpads
 #
-# Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -52,7 +52,9 @@
 # Extra install rules
 MODULE_ADD_INSTALL_TARGETS = install_fdi
 
-# Fix path for installing headers in proto area
+# Fix path for installing headers in proto area and in xorg-synaptics.pc
+FIX_PC_FILES = xorg-synaptics.pc.in
+MODULE_CONFIG_OPTS += --with-sdkdir='$(XORG_SDK_INCLUDES_DIR)'
 MODULE_INSTALL_MAKEFLAGS = sdkdir='$(XORG_SDK_INCLUDES_DIR)'
 
 # Install xorg-synaptics.pc to /usr/share since it defines the architecture

--- a/open-src/lib/fontconfig/Makefile	Fri Jan 22 14:17:58 2016 -0800
+++ b/open-src/lib/fontconfig/Makefile	Fri Jan 22 21:21:32 2016 -0800
@@ -123,6 +123,9 @@
 
 # pkg-config files to update
 FIX_PC_FILES=fontconfig.pc.in
+# Don't include path to freetype headers in our proto area in the *.pc files.
+# The 'Requires: freetype' will handle the right -I flags for us.
+MODULE_FIX_PC_FLAGS += -e 's| \@FREETYPE_CFLAGS\@||g;'
 
 BINSUBDIR       = $(BINSUBDIR_$(BUILD_TYPE))
 BINSUBDIR_32    = $(SUBDIR32)

--- a/open-src/lib/libxshmfence/Makefile	Fri Jan 22 14:17:58 2016 -0800
+++ b/open-src/lib/libxshmfence/Makefile	Fri Jan 22 21:21:32 2016 -0800
@@ -2,7 +2,7 @@
 #
 # libxshmfence
 #
-# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the "Software"),
@@ -51,4 +51,7 @@
 # pkg-config files that need to have -R added
 FIX_PC_FILES=xshmfence.pc.in
 
+# Don't include path to x11proto headers in our proto area in the *.pc files.
+MODULE_FIX_PC_FLAGS += -e 's| \@XPROTO_CFLAGS\@||g;'
+
 include ../Makefile.inc