diff --git a/x11-toolkits/open-motif/Makefile b/x11-toolkits/open-motif/Makefile
index 5de4716a7bbd..d58f219993d5 100644
--- a/x11-toolkits/open-motif/Makefile
+++ b/x11-toolkits/open-motif/Makefile
@@ -660,6 +660,9 @@ pre-install:
 
 post-install: share-doc share-guides share-examples
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+.for dir in Mrm Xm
+	cd ${WRKSRC}/lib/${dir} && ${INSTALL_DATA} *I.h ${PREFIX}/include/${dir}
+.endfor
 
 share-doc:
 	@${MKDIR} ${PREFIX}/share/doc/openmotif/
diff --git a/x11-toolkits/open-motif/pkg-plist b/x11-toolkits/open-motif/pkg-plist
index c8d421c5766f..3e8a6bf4de40 100644
--- a/x11-toolkits/open-motif/pkg-plist
+++ b/x11-toolkits/open-motif/pkg-plist
@@ -44,185 +44,14 @@ bin/xmbind
 bin/xmfonts
 bin/xmforc
 bin/xmform
+include/Mrm/MrmAppl.h
+include/Mrm/MrmDecls.h
+include/Mrm/MrmMsgI.h
+include/Mrm/MrmPublic.h
+include/Mrm/MrmosI.h
 include/X11/bitmaps/xm_error
 include/X11/bitmaps/xm_hour16
 include/X11/bitmaps/xm_hour16m
-include/Mrm/MrmAppl.h
-include/Mrm/MrmDecls.h
-include/Mrm/MrmPublic.h
-include/Mrm/MrmosI.h
-include/Xm/AccColorT.h
-include/Xm/AccTextT.h
-include/Xm/ActivatableT.h
-include/Xm/ArrowB.h
-include/Xm/ArrowBG.h
-include/Xm/ArrowBGP.h
-include/Xm/ArrowBP.h
-include/Xm/AtomMgr.h
-include/Xm/BaseClassP.h
-include/Xm/BulletinB.h
-include/Xm/BulletinBP.h
-include/Xm/CacheP.h
-include/Xm/CareVisualT.h
-include/Xm/CascadeB.h
-include/Xm/CascadeBG.h
-include/Xm/CascadeBGP.h
-include/Xm/CascadeBP.h
-include/Xm/ClipWindowP.h
-include/Xm/ColorObjP.h
-include/Xm/ColorP.h
-include/Xm/ComboBox.h
-include/Xm/ComboBoxP.h
-include/Xm/Command.h
-include/Xm/CommandP.h
-include/Xm/ContItemT.h
-include/Xm/Container.h
-include/Xm/ContainerP.h
-include/Xm/ContainerT.h
-include/Xm/CutPaste.h
-include/Xm/DesktopP.h
-include/Xm/DialogS.h
-include/Xm/DialogSEP.h
-include/Xm/DialogSP.h
-include/Xm/DialogSavvyT.h
-include/Xm/Display.h
-include/Xm/DisplayP.h
-include/Xm/DragC.h
-include/Xm/DragCP.h
-include/Xm/DragDrop.h
-include/Xm/DragIcon.h
-include/Xm/DragIconP.h
-include/Xm/DragOverS.h
-include/Xm/DragOverSP.h
-include/Xm/DrawP.h
-include/Xm/DrawingA.h
-include/Xm/DrawingAP.h
-include/Xm/DrawnB.h
-include/Xm/DrawnBP.h
-include/Xm/DropSMgr.h
-include/Xm/DropSMgrP.h
-include/Xm/DropTrans.h
-include/Xm/DropTransP.h
-include/Xm/ExtObjectP.h
-include/Xm/FileSB.h
-include/Xm/FileSBP.h
-include/Xm/Form.h
-include/Xm/FormP.h
-include/Xm/Frame.h
-include/Xm/FrameP.h
-include/Xm/Gadget.h
-include/Xm/GadgetP.h
-include/Xm/GrabShell.h
-include/Xm/GrabShellP.h
-include/Xm/IconFile.h
-include/Xm/IconFileP.h
-include/Xm/IconG.h
-include/Xm/IconGP.h
-include/Xm/IconH.h
-include/Xm/IconHP.h
-include/Xm/JoinSideT.h
-include/Xm/Label.h
-include/Xm/LabelG.h
-include/Xm/LabelGP.h
-include/Xm/LabelP.h
-include/Xm/LayoutT.h
-include/Xm/List.h
-include/Xm/ListP.h
-include/Xm/MainW.h
-include/Xm/MainWP.h
-include/Xm/Manager.h
-include/Xm/ManagerP.h
-include/Xm/MenuProcP.h
-include/Xm/MenuShell.h
-include/Xm/MenuShellP.h
-include/Xm/MenuStateP.h
-include/Xm/MenuT.h
-include/Xm/MenuUtilP.h
-include/Xm/MessageB.h
-include/Xm/MessageBP.h
-include/Xm/MwmUtil.h
-include/Xm/NavigatorT.h
-include/Xm/Notebook.h
-include/Xm/NotebookP.h
-include/Xm/PanedW.h
-include/Xm/PanedWP.h
-include/Xm/PointInT.h
-include/Xm/Primitive.h
-include/Xm/PrimitiveP.h
-include/Xm/Print.h
-include/Xm/PrintSP.h
-include/Xm/Protocols.h
-include/Xm/ProtocolsP.h
-include/Xm/PushB.h
-include/Xm/PushBG.h
-include/Xm/PushBGP.h
-include/Xm/PushBP.h
-include/Xm/RCLayoutP.h
-include/Xm/RCMenuP.h
-include/Xm/RepType.h
-include/Xm/RowColumn.h
-include/Xm/RowColumnP.h
-include/Xm/SSpinB.h
-include/Xm/SSpinBP.h
-include/Xm/SashP.h
-include/Xm/Scale.h
-include/Xm/ScaleP.h
-include/Xm/Screen.h
-include/Xm/ScreenP.h
-include/Xm/ScrollBar.h
-include/Xm/ScrollBarP.h
-include/Xm/ScrollFrameT.h
-include/Xm/ScrolledW.h
-include/Xm/ScrolledWP.h
-include/Xm/SelectioB.h
-include/Xm/SelectioBP.h
-include/Xm/SeparatoG.h
-include/Xm/SeparatoGP.h
-include/Xm/Separator.h
-include/Xm/SeparatorP.h
-include/Xm/ShellEP.h
-include/Xm/SpecRenderT.h
-include/Xm/SpinB.h
-include/Xm/SpinBP.h
-include/Xm/TakesDefT.h
-include/Xm/TearOffBP.h
-include/Xm/TearOffP.h
-include/Xm/Text.h
-include/Xm/TextF.h
-include/Xm/TextFP.h
-include/Xm/TextFSelP.h
-include/Xm/TextInP.h
-include/Xm/TextOutP.h
-include/Xm/TextP.h
-include/Xm/TextSelP.h
-include/Xm/TextStrSoP.h
-include/Xm/ToggleB.h
-include/Xm/ToggleBG.h
-include/Xm/ToggleBGP.h
-include/Xm/ToggleBP.h
-include/Xm/TraitP.h
-include/Xm/Transfer.h
-include/Xm/TransferP.h
-include/Xm/TransferT.h
-include/Xm/TransltnsP.h
-include/Xm/TravConT.h
-include/Xm/TxtPropCv.h
-include/Xm/UnhighlightT.h
-include/Xm/UnitTypeT.h
-include/Xm/VaSimpleP.h
-include/Xm/VendorS.h
-include/Xm/VendorSEP.h
-include/Xm/VendorSP.h
-include/Xm/VirtKeys.h
-include/Xm/VirtKeysP.h
-include/Xm/Xm.h
-include/Xm/XmAll.h
-include/Xm/XmIm.h
-include/Xm/XmP.h
-include/Xm/XmStrDefs.h
-include/Xm/Xmfuncs.h
-include/Xm/XmosP.h
-include/Xm/XpmP.h
 include/X11/bitmaps/xm_hour32
 include/X11/bitmaps/xm_hour32m
 include/X11/bitmaps/xm_information
@@ -233,6 +62,270 @@ include/X11/bitmaps/xm_noenter32m
 include/X11/bitmaps/xm_question
 include/X11/bitmaps/xm_warning
 include/X11/bitmaps/xm_working
+include/Xm/AccColorT.h
+include/Xm/AccTextT.h
+include/Xm/ActivatableT.h
+include/Xm/ArrowB.h
+include/Xm/ArrowBG.h
+include/Xm/ArrowBGP.h
+include/Xm/ArrowBP.h
+include/Xm/AtomMgr.h
+include/Xm/BaseClassI.h
+include/Xm/BaseClassP.h
+include/Xm/BitmapsI.h
+include/Xm/BulletinB.h
+include/Xm/BulletinBI.h
+include/Xm/BulletinBP.h
+include/Xm/CacheI.h
+include/Xm/CacheP.h
+include/Xm/CallbackI.h
+include/Xm/CareVisualT.h
+include/Xm/CareVisualTI.h
+include/Xm/CascadeB.h
+include/Xm/CascadeBG.h
+include/Xm/CascadeBGI.h
+include/Xm/CascadeBGP.h
+include/Xm/CascadeBI.h
+include/Xm/CascadeBP.h
+include/Xm/ClipWindTI.h
+include/Xm/ClipWindowP.h
+include/Xm/CntrbmI.h
+include/Xm/ColorI.h
+include/Xm/ColorObjI.h
+include/Xm/ColorObjP.h
+include/Xm/ColorP.h
+include/Xm/ComboBox.h
+include/Xm/ComboBoxP.h
+include/Xm/Command.h
+include/Xm/CommandI.h
+include/Xm/CommandP.h
+include/Xm/ContItemT.h
+include/Xm/Container.h
+include/Xm/ContainerP.h
+include/Xm/ContainerT.h
+include/Xm/CutPaste.h
+include/Xm/CutPasteI.h
+include/Xm/DesktopP.h
+include/Xm/DestI.h
+include/Xm/DialogS.h
+include/Xm/DialogSEP.h
+include/Xm/DialogSP.h
+include/Xm/DialogSavvyT.h
+include/Xm/Display.h
+include/Xm/DisplayI.h
+include/Xm/DisplayP.h
+include/Xm/DragBSI.h
+include/Xm/DragC.h
+include/Xm/DragCI.h
+include/Xm/DragCP.h
+include/Xm/DragDrop.h
+include/Xm/DragICCI.h
+include/Xm/DragIcon.h
+include/Xm/DragIconI.h
+include/Xm/DragIconP.h
+include/Xm/DragOverS.h
+include/Xm/DragOverSI.h
+include/Xm/DragOverSP.h
+include/Xm/DragUnderI.h
+include/Xm/DrawI.h
+include/Xm/DrawP.h
+include/Xm/DrawingA.h
+include/Xm/DrawingAI.h
+include/Xm/DrawingAP.h
+include/Xm/DrawnB.h
+include/Xm/DrawnBP.h
+include/Xm/DropSMgr.h
+include/Xm/DropSMgrI.h
+include/Xm/DropSMgrP.h
+include/Xm/DropTrans.h
+include/Xm/DropTransP.h
+include/Xm/ExtObjectI.h
+include/Xm/ExtObjectP.h
+include/Xm/FileSB.h
+include/Xm/FileSBP.h
+include/Xm/Form.h
+include/Xm/FormP.h
+include/Xm/Frame.h
+include/Xm/FrameP.h
+include/Xm/GMUtilsI.h
+include/Xm/Gadget.h
+include/Xm/GadgetI.h
+include/Xm/GadgetP.h
+include/Xm/GadgetUtiI.h
+include/Xm/GeoUtilsI.h
+include/Xm/GrabShell.h
+include/Xm/GrabShellP.h
+include/Xm/HashI.h
+include/Xm/IconFile.h
+include/Xm/IconFileP.h
+include/Xm/IconG.h
+include/Xm/IconGI.h
+include/Xm/IconGP.h
+include/Xm/IconH.h
+include/Xm/IconHP.h
+include/Xm/ImageCachI.h
+include/Xm/JoinSideT.h
+include/Xm/Label.h
+include/Xm/LabelG.h
+include/Xm/LabelGI.h
+include/Xm/LabelGP.h
+include/Xm/LabelI.h
+include/Xm/LabelP.h
+include/Xm/LayoutT.h
+include/Xm/List.h
+include/Xm/ListP.h
+include/Xm/MainW.h
+include/Xm/MainWP.h
+include/Xm/Manager.h
+include/Xm/ManagerI.h
+include/Xm/ManagerP.h
+include/Xm/MapEventsI.h
+include/Xm/MenuProcI.h
+include/Xm/MenuProcP.h
+include/Xm/MenuShell.h
+include/Xm/MenuShellI.h
+include/Xm/MenuShellP.h
+include/Xm/MenuStateI.h
+include/Xm/MenuStateP.h
+include/Xm/MenuT.h
+include/Xm/MenuUtilI.h
+include/Xm/MenuUtilP.h
+include/Xm/MessageB.h
+include/Xm/MessageBI.h
+include/Xm/MessageBP.h
+include/Xm/MessagesI.h
+include/Xm/MwmUtil.h
+include/Xm/NavigatorT.h
+include/Xm/Notebook.h
+include/Xm/NotebookP.h
+include/Xm/PanedW.h
+include/Xm/PanedWP.h
+include/Xm/PixConvI.h
+include/Xm/PointInT.h
+include/Xm/Primitive.h
+include/Xm/PrimitiveI.h
+include/Xm/PrimitiveP.h
+include/Xm/Print.h
+include/Xm/PrintSI.h
+include/Xm/PrintSP.h
+include/Xm/Protocols.h
+include/Xm/ProtocolsI.h
+include/Xm/ProtocolsP.h
+include/Xm/PushB.h
+include/Xm/PushBG.h
+include/Xm/PushBGP.h
+include/Xm/PushBP.h
+include/Xm/RCHookI.h
+include/Xm/RCLayoutI.h
+include/Xm/RCLayoutP.h
+include/Xm/RCMenuI.h
+include/Xm/RCMenuP.h
+include/Xm/ReadImageI.h
+include/Xm/RegionI.h
+include/Xm/RepType.h
+include/Xm/RepTypeI.h
+include/Xm/ResConverI.h
+include/Xm/ResEncodI.h
+include/Xm/ResIndI.h
+include/Xm/RowColumn.h
+include/Xm/RowColumnI.h
+include/Xm/RowColumnP.h
+include/Xm/SSpinB.h
+include/Xm/SSpinBP.h
+include/Xm/SashP.h
+include/Xm/Scale.h
+include/Xm/ScaleP.h
+include/Xm/Screen.h
+include/Xm/ScreenI.h
+include/Xm/ScreenP.h
+include/Xm/ScrollBar.h
+include/Xm/ScrollBarP.h
+include/Xm/ScrollFramTI.h
+include/Xm/ScrollFrameT.h
+include/Xm/ScrolledW.h
+include/Xm/ScrolledWI.h
+include/Xm/ScrolledWP.h
+include/Xm/SelectioB.h
+include/Xm/SelectioBI.h
+include/Xm/SelectioBP.h
+include/Xm/SeparatoG.h
+include/Xm/SeparatoGI.h
+include/Xm/SeparatoGP.h
+include/Xm/Separator.h
+include/Xm/SeparatorP.h
+include/Xm/ShellEP.h
+include/Xm/SpecRenderT.h
+include/Xm/SpinB.h
+include/Xm/SpinBP.h
+include/Xm/SyntheticI.h
+include/Xm/TakesDefT.h
+include/Xm/TearOffBP.h
+include/Xm/TearOffI.h
+include/Xm/TearOffP.h
+include/Xm/Text.h
+include/Xm/TextDIconI.h
+include/Xm/TextF.h
+include/Xm/TextFI.h
+include/Xm/TextFP.h
+include/Xm/TextFSelI.h
+include/Xm/TextFSelP.h
+include/Xm/TextI.h
+include/Xm/TextInI.h
+include/Xm/TextInP.h
+include/Xm/TextOutI.h
+include/Xm/TextOutP.h
+include/Xm/TextP.h
+include/Xm/TextSelI.h
+include/Xm/TextSelP.h
+include/Xm/TextStrSoI.h
+include/Xm/TextStrSoP.h
+include/Xm/ToggleB.h
+include/Xm/ToggleBG.h
+include/Xm/ToggleBGI.h
+include/Xm/ToggleBGP.h
+include/Xm/ToggleBP.h
+include/Xm/TraitI.h
+include/Xm/TraitP.h
+include/Xm/Transfer.h
+include/Xm/TransferI.h
+include/Xm/TransferP.h
+include/Xm/TransferT.h
+include/Xm/TransltnsP.h
+include/Xm/TravActI.h
+include/Xm/TravConT.h
+include/Xm/TraversalI.h
+include/Xm/TxtPropCv.h
+include/Xm/UnhighlightT.h
+include/Xm/UniqueEvnI.h
+include/Xm/UnitTypeT.h
+include/Xm/VaSimpleI.h
+include/Xm/VaSimpleP.h
+include/Xm/VendorS.h
+include/Xm/VendorSEI.h
+include/Xm/VendorSEP.h
+include/Xm/VendorSI.h
+include/Xm/VendorSP.h
+include/Xm/VirtKeys.h
+include/Xm/VirtKeysI.h
+include/Xm/VirtKeysP.h
+include/Xm/Xm.h
+include/Xm/XmAll.h
+include/Xm/XmI.h
+include/Xm/XmIm.h
+include/Xm/XmImI.h
+include/Xm/XmMsgI.h
+include/Xm/XmP.h
+include/Xm/XmRenderTI.h
+include/Xm/XmStrDefs.h
+include/Xm/XmStrDefsI.h
+include/Xm/XmStringI.h
+include/Xm/XmTabListI.h
+include/Xm/Xmfuncs.h
+include/Xm/XmosI.h
+include/Xm/XmosP.h
+include/Xm/XpmI.h
+include/Xm/XpmP.h
+include/Xm/regexpI.h
 include/uil/Uil.h
 include/uil/UilDBDef.h
 include/uil/UilDef.h