diff --git a/.gitignore b/.gitignore
index cfc03e7bdbb3b7f101092ebb587c2f81014c9c88..d2ca1d72a8b22e47632ea37a6de43267c9907a28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,13 +2,13 @@ doap.rdf
 *.tmproj
 doc/api
 users_guide/*.html
-ext/fox16/*_wrap.cpp
-ext/fox16/*.o
-ext/fox16/conftest.dSYM
-ext/fox16/include/inlinestubs.h
-ext/fox16/librb.c
-ext/fox16/fox16.bundle
-ext/fox16/mkmf.log
+ext/fox16_c/*_wrap.cpp
+ext/fox16_c/*.o
+ext/fox16_c/conftest.dSYM
+ext/fox16_c/include/inlinestubs.h
+ext/fox16_c/librb.c
+ext/fox16_c/fox16.bundle
+ext/fox16_c/mkmf.log
 lib/fox16/kwargs.rb
 fox-includes/diffs.py
 fox-includes/diffs.txt
diff --git a/Manifest.txt b/Manifest.txt
index 04e7e6aa8f2f60a50b178408d91de5c722137531..a52fc196e58287a8a9295eabd655c2e21cee2625 100644
--- a/Manifest.txt
+++ b/Manifest.txt
@@ -130,238 +130,238 @@ examples/textedit/helpwindow.rb
 examples/textedit/prefdialog.rb
 examples/textedit/textedit.rb
 examples/unicode.rb
-ext/fox16/FXRbApp.cpp
-ext/fox16/FXRbDataTarget.cpp
-ext/fox16/FXRbGLViewer.cpp
-ext/fox16/FXRuby.cpp
-ext/fox16/MANIFEST
-ext/fox16/extconf.rb
-ext/fox16/impl.cpp
-ext/fox16/include/FXMemoryBuffer.h
-ext/fox16/include/FXRb4Splitter.h
-ext/fox16/include/FXRb7Segment.h
-ext/fox16/include/FXRbAccelTable.h
-ext/fox16/include/FXRbApp.h
-ext/fox16/include/FXRbAppVirtuals.h
-ext/fox16/include/FXRbArrowButton.h
-ext/fox16/include/FXRbBMPIcon.h
-ext/fox16/include/FXRbBMPImage.h
-ext/fox16/include/FXRbBitmap.h
-ext/fox16/include/FXRbBitmapFrame.h
-ext/fox16/include/FXRbBitmapView.h
-ext/fox16/include/FXRbBitmapVirtuals.h
-ext/fox16/include/FXRbButton.h
-ext/fox16/include/FXRbCURCursor.h
-ext/fox16/include/FXRbCanvas.h
-ext/fox16/include/FXRbCheckButton.h
-ext/fox16/include/FXRbChoiceBox.h
-ext/fox16/include/FXRbColorBar.h
-ext/fox16/include/FXRbColorDialog.h
-ext/fox16/include/FXRbColorList.h
-ext/fox16/include/FXRbColorRing.h
-ext/fox16/include/FXRbColorSelector.h
-ext/fox16/include/FXRbColorWell.h
-ext/fox16/include/FXRbColorWheel.h
-ext/fox16/include/FXRbComboBox.h
-ext/fox16/include/FXRbCommon.h
-ext/fox16/include/FXRbComposite.h
-ext/fox16/include/FXRbCursor.h
-ext/fox16/include/FXRbCursorVirtuals.h
-ext/fox16/include/FXRbDC.h
-ext/fox16/include/FXRbDCPrint.h
-ext/fox16/include/FXRbDCVirtuals.h
-ext/fox16/include/FXRbDCWindow.h
-ext/fox16/include/FXRbDataTarget.h
-ext/fox16/include/FXRbDebugTarget.h
-ext/fox16/include/FXRbDelegator.h
-ext/fox16/include/FXRbDial.h
-ext/fox16/include/FXRbDialogBox.h
-ext/fox16/include/FXRbDialogBoxVirtuals.h
-ext/fox16/include/FXRbDict.h
-ext/fox16/include/FXRbDirBox.h
-ext/fox16/include/FXRbDirDialog.h
-ext/fox16/include/FXRbDirList.h
-ext/fox16/include/FXRbDirSelector.h
-ext/fox16/include/FXRbDockBar.h
-ext/fox16/include/FXRbDockBarVirtuals.h
-ext/fox16/include/FXRbDockHandler.h
-ext/fox16/include/FXRbDockSite.h
-ext/fox16/include/FXRbDockSiteVirtuals.h
-ext/fox16/include/FXRbDockTitle.h
-ext/fox16/include/FXRbDocument.h
-ext/fox16/include/FXRbDragCorner.h
-ext/fox16/include/FXRbDrawable.h
-ext/fox16/include/FXRbDrawableVirtuals.h
-ext/fox16/include/FXRbDriveBox.h
-ext/fox16/include/FXRbFileDialog.h
-ext/fox16/include/FXRbFileDict.h
-ext/fox16/include/FXRbFileDictVirtuals.h
-ext/fox16/include/FXRbFileList.h
-ext/fox16/include/FXRbFileSelector.h
-ext/fox16/include/FXRbFoldingItemVirtuals.h
-ext/fox16/include/FXRbFoldingList.h
-ext/fox16/include/FXRbFoldingListVirtuals.h
-ext/fox16/include/FXRbFont.h
-ext/fox16/include/FXRbFontDialog.h
-ext/fox16/include/FXRbFontSelector.h
-ext/fox16/include/FXRbFontVirtuals.h
-ext/fox16/include/FXRbFrame.h
-ext/fox16/include/FXRbGIFCursor.h
-ext/fox16/include/FXRbGIFIcon.h
-ext/fox16/include/FXRbGIFImage.h
-ext/fox16/include/FXRbGLCanvas.h
-ext/fox16/include/FXRbGLCanvasVirtuals.h
-ext/fox16/include/FXRbGLContext.h
-ext/fox16/include/FXRbGLObject.h
-ext/fox16/include/FXRbGLObjectVirtuals.h
-ext/fox16/include/FXRbGLShape.h
-ext/fox16/include/FXRbGLShapeVirtuals.h
-ext/fox16/include/FXRbGLViewer.h
-ext/fox16/include/FXRbGLViewerVirtuals.h
-ext/fox16/include/FXRbGLVisual.h
-ext/fox16/include/FXRbGradientBar.h
-ext/fox16/include/FXRbGroupBox.h
-ext/fox16/include/FXRbHeader.h
-ext/fox16/include/FXRbHeaderItemVirtuals.h
-ext/fox16/include/FXRbHorizontalFrame.h
-ext/fox16/include/FXRbICOIcon.h
-ext/fox16/include/FXRbICOImage.h
-ext/fox16/include/FXRbIcon.h
-ext/fox16/include/FXRbIconItemVirtuals.h
-ext/fox16/include/FXRbIconList.h
-ext/fox16/include/FXRbIconListVirtuals.h
-ext/fox16/include/FXRbIconSource.h
-ext/fox16/include/FXRbIconSourceVirtuals.h
-ext/fox16/include/FXRbId.h
-ext/fox16/include/FXRbIdVirtuals.h
-ext/fox16/include/FXRbImage.h
-ext/fox16/include/FXRbImageFrame.h
-ext/fox16/include/FXRbImageView.h
-ext/fox16/include/FXRbImageVirtuals.h
-ext/fox16/include/FXRbInputDialog.h
-ext/fox16/include/FXRbJPGIcon.h
-ext/fox16/include/FXRbJPGImage.h
-ext/fox16/include/FXRbKnob.h
-ext/fox16/include/FXRbLabel.h
-ext/fox16/include/FXRbList.h
-ext/fox16/include/FXRbListBox.h
-ext/fox16/include/FXRbListBoxVirtuals.h
-ext/fox16/include/FXRbListItemVirtuals.h
-ext/fox16/include/FXRbListVirtuals.h
-ext/fox16/include/FXRbMDIButton.h
-ext/fox16/include/FXRbMDIChild.h
-ext/fox16/include/FXRbMDIChildVirtuals.h
-ext/fox16/include/FXRbMDIClient.h
-ext/fox16/include/FXRbMDIClientVirtuals.h
-ext/fox16/include/FXRbMainWindow.h
-ext/fox16/include/FXRbMatrix.h
-ext/fox16/include/FXRbMenuBar.h
-ext/fox16/include/FXRbMenuButton.h
-ext/fox16/include/FXRbMenuCaption.h
-ext/fox16/include/FXRbMenuCascade.h
-ext/fox16/include/FXRbMenuCheck.h
-ext/fox16/include/FXRbMenuCommand.h
-ext/fox16/include/FXRbMenuPane.h
-ext/fox16/include/FXRbMenuRadio.h
-ext/fox16/include/FXRbMenuSeparator.h
-ext/fox16/include/FXRbMenuTitle.h
-ext/fox16/include/FXRbMessageBox.h
-ext/fox16/include/FXRbObject.h
-ext/fox16/include/FXRbObjectVirtuals.h
-ext/fox16/include/FXRbOptionMenu.h
-ext/fox16/include/FXRbPCXIcon.h
-ext/fox16/include/FXRbPCXImage.h
-ext/fox16/include/FXRbPNGIcon.h
-ext/fox16/include/FXRbPNGImage.h
-ext/fox16/include/FXRbPPMIcon.h
-ext/fox16/include/FXRbPPMImage.h
-ext/fox16/include/FXRbPacker.h
-ext/fox16/include/FXRbPicker.h
-ext/fox16/include/FXRbPopup.h
-ext/fox16/include/FXRbPopupVirtuals.h
-ext/fox16/include/FXRbPrintDialog.h
-ext/fox16/include/FXRbProgressBar.h
-ext/fox16/include/FXRbProgressDialog.h
-ext/fox16/include/FXRbRGBIcon.h
-ext/fox16/include/FXRbRGBImage.h
-ext/fox16/include/FXRbRadioButton.h
-ext/fox16/include/FXRbRealSlider.h
-ext/fox16/include/FXRbRealSpinner.h
-ext/fox16/include/FXRbRealSpinnerVirtuals.h
-ext/fox16/include/FXRbRecentFiles.h
-ext/fox16/include/FXRbRegistry.h
-ext/fox16/include/FXRbReplaceDialog.h
-ext/fox16/include/FXRbRootWindow.h
-ext/fox16/include/FXRbRuler.h
-ext/fox16/include/FXRbRulerView.h
-ext/fox16/include/FXRbScintilla.h
-ext/fox16/include/FXRbScrollArea.h
-ext/fox16/include/FXRbScrollAreaVirtuals.h
-ext/fox16/include/FXRbScrollBar.h
-ext/fox16/include/FXRbScrollPane.h
-ext/fox16/include/FXRbScrollWindow.h
-ext/fox16/include/FXRbSearchDialog.h
-ext/fox16/include/FXRbSeparator.h
-ext/fox16/include/FXRbSettings.h
-ext/fox16/include/FXRbShell.h
-ext/fox16/include/FXRbShutter.h
-ext/fox16/include/FXRbShutterVirtuals.h
-ext/fox16/include/FXRbSlider.h
-ext/fox16/include/FXRbSpinner.h
-ext/fox16/include/FXRbSpinnerVirtuals.h
-ext/fox16/include/FXRbSplashWindow.h
-ext/fox16/include/FXRbSplitter.h
-ext/fox16/include/FXRbSpring.h
-ext/fox16/include/FXRbStatusBar.h
-ext/fox16/include/FXRbStatusLine.h
-ext/fox16/include/FXRbStream.h
-ext/fox16/include/FXRbStreamVirtuals.h
-ext/fox16/include/FXRbStringDict.h
-ext/fox16/include/FXRbSwitcher.h
-ext/fox16/include/FXRbTGAIcon.h
-ext/fox16/include/FXRbTGAImage.h
-ext/fox16/include/FXRbTIFIcon.h
-ext/fox16/include/FXRbTIFImage.h
-ext/fox16/include/FXRbTabBar.h
-ext/fox16/include/FXRbTabBarVirtuals.h
-ext/fox16/include/FXRbTabBook.h
-ext/fox16/include/FXRbTabItem.h
-ext/fox16/include/FXRbTable.h
-ext/fox16/include/FXRbTableItemVirtuals.h
-ext/fox16/include/FXRbTableVirtuals.h
-ext/fox16/include/FXRbText.h
-ext/fox16/include/FXRbTextField.h
-ext/fox16/include/FXRbTextVirtuals.h
-ext/fox16/include/FXRbToggleButton.h
-ext/fox16/include/FXRbToolBar.h
-ext/fox16/include/FXRbToolBarGrip.h
-ext/fox16/include/FXRbToolBarShell.h
-ext/fox16/include/FXRbToolBarTab.h
-ext/fox16/include/FXRbToolTip.h
-ext/fox16/include/FXRbTopWindow.h
-ext/fox16/include/FXRbTopWindowVirtuals.h
-ext/fox16/include/FXRbTranslator.h
-ext/fox16/include/FXRbTranslatorVirtuals.h
-ext/fox16/include/FXRbTreeItemVirtuals.h
-ext/fox16/include/FXRbTreeList.h
-ext/fox16/include/FXRbTreeListBox.h
-ext/fox16/include/FXRbTreeListBoxVirtuals.h
-ext/fox16/include/FXRbTreeListVirtuals.h
-ext/fox16/include/FXRbTriStateButton.h
-ext/fox16/include/FXRbVerticalFrame.h
-ext/fox16/include/FXRbVisual.h
-ext/fox16/include/FXRbWindow.h
-ext/fox16/include/FXRbWindowVirtuals.h
-ext/fox16/include/FXRbWizard.h
-ext/fox16/include/FXRbXBMIcon.h
-ext/fox16/include/FXRbXBMImage.h
-ext/fox16/include/FXRbXPMIcon.h
-ext/fox16/include/FXRbXPMImage.h
-ext/fox16/include/FXRuby.h
-ext/fox16/include/impl.h
-ext/fox16/make_impl.rb
-ext/fox16/markfuncs.cpp
-ext/fox16/unregisterOwnedObjects.cpp
+ext/fox16_c/FXRbApp.cpp
+ext/fox16_c/FXRbDataTarget.cpp
+ext/fox16_c/FXRbGLViewer.cpp
+ext/fox16_c/FXRuby.cpp
+ext/fox16_c/MANIFEST
+ext/fox16_c/extconf.rb
+ext/fox16_c/impl.cpp
+ext/fox16_c/include/FXMemoryBuffer.h
+ext/fox16_c/include/FXRb4Splitter.h
+ext/fox16_c/include/FXRb7Segment.h
+ext/fox16_c/include/FXRbAccelTable.h
+ext/fox16_c/include/FXRbApp.h
+ext/fox16_c/include/FXRbAppVirtuals.h
+ext/fox16_c/include/FXRbArrowButton.h
+ext/fox16_c/include/FXRbBMPIcon.h
+ext/fox16_c/include/FXRbBMPImage.h
+ext/fox16_c/include/FXRbBitmap.h
+ext/fox16_c/include/FXRbBitmapFrame.h
+ext/fox16_c/include/FXRbBitmapView.h
+ext/fox16_c/include/FXRbBitmapVirtuals.h
+ext/fox16_c/include/FXRbButton.h
+ext/fox16_c/include/FXRbCURCursor.h
+ext/fox16_c/include/FXRbCanvas.h
+ext/fox16_c/include/FXRbCheckButton.h
+ext/fox16_c/include/FXRbChoiceBox.h
+ext/fox16_c/include/FXRbColorBar.h
+ext/fox16_c/include/FXRbColorDialog.h
+ext/fox16_c/include/FXRbColorList.h
+ext/fox16_c/include/FXRbColorRing.h
+ext/fox16_c/include/FXRbColorSelector.h
+ext/fox16_c/include/FXRbColorWell.h
+ext/fox16_c/include/FXRbColorWheel.h
+ext/fox16_c/include/FXRbComboBox.h
+ext/fox16_c/include/FXRbCommon.h
+ext/fox16_c/include/FXRbComposite.h
+ext/fox16_c/include/FXRbCursor.h
+ext/fox16_c/include/FXRbCursorVirtuals.h
+ext/fox16_c/include/FXRbDC.h
+ext/fox16_c/include/FXRbDCPrint.h
+ext/fox16_c/include/FXRbDCVirtuals.h
+ext/fox16_c/include/FXRbDCWindow.h
+ext/fox16_c/include/FXRbDataTarget.h
+ext/fox16_c/include/FXRbDebugTarget.h
+ext/fox16_c/include/FXRbDelegator.h
+ext/fox16_c/include/FXRbDial.h
+ext/fox16_c/include/FXRbDialogBox.h
+ext/fox16_c/include/FXRbDialogBoxVirtuals.h
+ext/fox16_c/include/FXRbDict.h
+ext/fox16_c/include/FXRbDirBox.h
+ext/fox16_c/include/FXRbDirDialog.h
+ext/fox16_c/include/FXRbDirList.h
+ext/fox16_c/include/FXRbDirSelector.h
+ext/fox16_c/include/FXRbDockBar.h
+ext/fox16_c/include/FXRbDockBarVirtuals.h
+ext/fox16_c/include/FXRbDockHandler.h
+ext/fox16_c/include/FXRbDockSite.h
+ext/fox16_c/include/FXRbDockSiteVirtuals.h
+ext/fox16_c/include/FXRbDockTitle.h
+ext/fox16_c/include/FXRbDocument.h
+ext/fox16_c/include/FXRbDragCorner.h
+ext/fox16_c/include/FXRbDrawable.h
+ext/fox16_c/include/FXRbDrawableVirtuals.h
+ext/fox16_c/include/FXRbDriveBox.h
+ext/fox16_c/include/FXRbFileDialog.h
+ext/fox16_c/include/FXRbFileDict.h
+ext/fox16_c/include/FXRbFileDictVirtuals.h
+ext/fox16_c/include/FXRbFileList.h
+ext/fox16_c/include/FXRbFileSelector.h
+ext/fox16_c/include/FXRbFoldingItemVirtuals.h
+ext/fox16_c/include/FXRbFoldingList.h
+ext/fox16_c/include/FXRbFoldingListVirtuals.h
+ext/fox16_c/include/FXRbFont.h
+ext/fox16_c/include/FXRbFontDialog.h
+ext/fox16_c/include/FXRbFontSelector.h
+ext/fox16_c/include/FXRbFontVirtuals.h
+ext/fox16_c/include/FXRbFrame.h
+ext/fox16_c/include/FXRbGIFCursor.h
+ext/fox16_c/include/FXRbGIFIcon.h
+ext/fox16_c/include/FXRbGIFImage.h
+ext/fox16_c/include/FXRbGLCanvas.h
+ext/fox16_c/include/FXRbGLCanvasVirtuals.h
+ext/fox16_c/include/FXRbGLContext.h
+ext/fox16_c/include/FXRbGLObject.h
+ext/fox16_c/include/FXRbGLObjectVirtuals.h
+ext/fox16_c/include/FXRbGLShape.h
+ext/fox16_c/include/FXRbGLShapeVirtuals.h
+ext/fox16_c/include/FXRbGLViewer.h
+ext/fox16_c/include/FXRbGLViewerVirtuals.h
+ext/fox16_c/include/FXRbGLVisual.h
+ext/fox16_c/include/FXRbGradientBar.h
+ext/fox16_c/include/FXRbGroupBox.h
+ext/fox16_c/include/FXRbHeader.h
+ext/fox16_c/include/FXRbHeaderItemVirtuals.h
+ext/fox16_c/include/FXRbHorizontalFrame.h
+ext/fox16_c/include/FXRbICOIcon.h
+ext/fox16_c/include/FXRbICOImage.h
+ext/fox16_c/include/FXRbIcon.h
+ext/fox16_c/include/FXRbIconItemVirtuals.h
+ext/fox16_c/include/FXRbIconList.h
+ext/fox16_c/include/FXRbIconListVirtuals.h
+ext/fox16_c/include/FXRbIconSource.h
+ext/fox16_c/include/FXRbIconSourceVirtuals.h
+ext/fox16_c/include/FXRbId.h
+ext/fox16_c/include/FXRbIdVirtuals.h
+ext/fox16_c/include/FXRbImage.h
+ext/fox16_c/include/FXRbImageFrame.h
+ext/fox16_c/include/FXRbImageView.h
+ext/fox16_c/include/FXRbImageVirtuals.h
+ext/fox16_c/include/FXRbInputDialog.h
+ext/fox16_c/include/FXRbJPGIcon.h
+ext/fox16_c/include/FXRbJPGImage.h
+ext/fox16_c/include/FXRbKnob.h
+ext/fox16_c/include/FXRbLabel.h
+ext/fox16_c/include/FXRbList.h
+ext/fox16_c/include/FXRbListBox.h
+ext/fox16_c/include/FXRbListBoxVirtuals.h
+ext/fox16_c/include/FXRbListItemVirtuals.h
+ext/fox16_c/include/FXRbListVirtuals.h
+ext/fox16_c/include/FXRbMDIButton.h
+ext/fox16_c/include/FXRbMDIChild.h
+ext/fox16_c/include/FXRbMDIChildVirtuals.h
+ext/fox16_c/include/FXRbMDIClient.h
+ext/fox16_c/include/FXRbMDIClientVirtuals.h
+ext/fox16_c/include/FXRbMainWindow.h
+ext/fox16_c/include/FXRbMatrix.h
+ext/fox16_c/include/FXRbMenuBar.h
+ext/fox16_c/include/FXRbMenuButton.h
+ext/fox16_c/include/FXRbMenuCaption.h
+ext/fox16_c/include/FXRbMenuCascade.h
+ext/fox16_c/include/FXRbMenuCheck.h
+ext/fox16_c/include/FXRbMenuCommand.h
+ext/fox16_c/include/FXRbMenuPane.h
+ext/fox16_c/include/FXRbMenuRadio.h
+ext/fox16_c/include/FXRbMenuSeparator.h
+ext/fox16_c/include/FXRbMenuTitle.h
+ext/fox16_c/include/FXRbMessageBox.h
+ext/fox16_c/include/FXRbObject.h
+ext/fox16_c/include/FXRbObjectVirtuals.h
+ext/fox16_c/include/FXRbOptionMenu.h
+ext/fox16_c/include/FXRbPCXIcon.h
+ext/fox16_c/include/FXRbPCXImage.h
+ext/fox16_c/include/FXRbPNGIcon.h
+ext/fox16_c/include/FXRbPNGImage.h
+ext/fox16_c/include/FXRbPPMIcon.h
+ext/fox16_c/include/FXRbPPMImage.h
+ext/fox16_c/include/FXRbPacker.h
+ext/fox16_c/include/FXRbPicker.h
+ext/fox16_c/include/FXRbPopup.h
+ext/fox16_c/include/FXRbPopupVirtuals.h
+ext/fox16_c/include/FXRbPrintDialog.h
+ext/fox16_c/include/FXRbProgressBar.h
+ext/fox16_c/include/FXRbProgressDialog.h
+ext/fox16_c/include/FXRbRGBIcon.h
+ext/fox16_c/include/FXRbRGBImage.h
+ext/fox16_c/include/FXRbRadioButton.h
+ext/fox16_c/include/FXRbRealSlider.h
+ext/fox16_c/include/FXRbRealSpinner.h
+ext/fox16_c/include/FXRbRealSpinnerVirtuals.h
+ext/fox16_c/include/FXRbRecentFiles.h
+ext/fox16_c/include/FXRbRegistry.h
+ext/fox16_c/include/FXRbReplaceDialog.h
+ext/fox16_c/include/FXRbRootWindow.h
+ext/fox16_c/include/FXRbRuler.h
+ext/fox16_c/include/FXRbRulerView.h
+ext/fox16_c/include/FXRbScintilla.h
+ext/fox16_c/include/FXRbScrollArea.h
+ext/fox16_c/include/FXRbScrollAreaVirtuals.h
+ext/fox16_c/include/FXRbScrollBar.h
+ext/fox16_c/include/FXRbScrollPane.h
+ext/fox16_c/include/FXRbScrollWindow.h
+ext/fox16_c/include/FXRbSearchDialog.h
+ext/fox16_c/include/FXRbSeparator.h
+ext/fox16_c/include/FXRbSettings.h
+ext/fox16_c/include/FXRbShell.h
+ext/fox16_c/include/FXRbShutter.h
+ext/fox16_c/include/FXRbShutterVirtuals.h
+ext/fox16_c/include/FXRbSlider.h
+ext/fox16_c/include/FXRbSpinner.h
+ext/fox16_c/include/FXRbSpinnerVirtuals.h
+ext/fox16_c/include/FXRbSplashWindow.h
+ext/fox16_c/include/FXRbSplitter.h
+ext/fox16_c/include/FXRbSpring.h
+ext/fox16_c/include/FXRbStatusBar.h
+ext/fox16_c/include/FXRbStatusLine.h
+ext/fox16_c/include/FXRbStream.h
+ext/fox16_c/include/FXRbStreamVirtuals.h
+ext/fox16_c/include/FXRbStringDict.h
+ext/fox16_c/include/FXRbSwitcher.h
+ext/fox16_c/include/FXRbTGAIcon.h
+ext/fox16_c/include/FXRbTGAImage.h
+ext/fox16_c/include/FXRbTIFIcon.h
+ext/fox16_c/include/FXRbTIFImage.h
+ext/fox16_c/include/FXRbTabBar.h
+ext/fox16_c/include/FXRbTabBarVirtuals.h
+ext/fox16_c/include/FXRbTabBook.h
+ext/fox16_c/include/FXRbTabItem.h
+ext/fox16_c/include/FXRbTable.h
+ext/fox16_c/include/FXRbTableItemVirtuals.h
+ext/fox16_c/include/FXRbTableVirtuals.h
+ext/fox16_c/include/FXRbText.h
+ext/fox16_c/include/FXRbTextField.h
+ext/fox16_c/include/FXRbTextVirtuals.h
+ext/fox16_c/include/FXRbToggleButton.h
+ext/fox16_c/include/FXRbToolBar.h
+ext/fox16_c/include/FXRbToolBarGrip.h
+ext/fox16_c/include/FXRbToolBarShell.h
+ext/fox16_c/include/FXRbToolBarTab.h
+ext/fox16_c/include/FXRbToolTip.h
+ext/fox16_c/include/FXRbTopWindow.h
+ext/fox16_c/include/FXRbTopWindowVirtuals.h
+ext/fox16_c/include/FXRbTranslator.h
+ext/fox16_c/include/FXRbTranslatorVirtuals.h
+ext/fox16_c/include/FXRbTreeItemVirtuals.h
+ext/fox16_c/include/FXRbTreeList.h
+ext/fox16_c/include/FXRbTreeListBox.h
+ext/fox16_c/include/FXRbTreeListBoxVirtuals.h
+ext/fox16_c/include/FXRbTreeListVirtuals.h
+ext/fox16_c/include/FXRbTriStateButton.h
+ext/fox16_c/include/FXRbVerticalFrame.h
+ext/fox16_c/include/FXRbVisual.h
+ext/fox16_c/include/FXRbWindow.h
+ext/fox16_c/include/FXRbWindowVirtuals.h
+ext/fox16_c/include/FXRbWizard.h
+ext/fox16_c/include/FXRbXBMIcon.h
+ext/fox16_c/include/FXRbXBMImage.h
+ext/fox16_c/include/FXRbXPMIcon.h
+ext/fox16_c/include/FXRbXPMImage.h
+ext/fox16_c/include/FXRuby.h
+ext/fox16_c/include/impl.h
+ext/fox16_c/make_impl.rb
+ext/fox16_c/markfuncs.cpp
+ext/fox16_c/unregisterOwnedObjects.cpp
 fox-includes/FX4Splitter.h
 fox-includes/FX7Segment.h
 fox-includes/FX885910Codec.h
diff --git a/README.rdoc b/README.rdoc
index ff82d959097a9f395f19b89e912b763af3bccdff..5c45c22466f0c5f8819c60b36f26278b81dc5b4d 100644
--- a/README.rdoc
+++ b/README.rdoc
@@ -42,7 +42,7 @@ The directory structure is:
   Contains example programs demonstrating how to use FXRuby and
   its many wonderful features.
 
-* ext/fox16
+* ext/fox16_c
 
   Contains the C++ source code for the shared library part of FXRuby.
   These files are required to build FXRuby from the source code.
diff --git a/Rakefile b/Rakefile
index 4ca70b0af4ce7e1fcd3141dfc3b2a263137bb249..4b99766a2d8dfeea15d820807e46938b963573c5 100755
--- a/Rakefile
+++ b/Rakefile
@@ -49,16 +49,16 @@ SWIG_MODULES = {
 hoe = Hoe.spec "fxruby" do
   # ... project specific data ...
   self.blog_categories = %w{FXRuby}
-  self.clean_globs = [".config", "ext/fox16/Makefile", "ext/fox16/*.o", "ext/fox16/*.bundle", "ext/fox16/mkmf.log", "ext/fox16/conftest.dSYM", "ext/fox16/include/swigrubyrun.h"]
+  self.clean_globs = [".config", "ext/fox16_c/Makefile", "ext/fox16_c/*.o", "ext/fox16_c/*.bundle", "ext/fox16_c/mkmf.log", "ext/fox16_c/conftest.dSYM", "ext/fox16_c/include/swigrubyrun.h"]
   developer("Lyle Johnson", "lyle@lylejohnson.name")
   developer("Lars Kanis", "kanis@comcard.de")
   self.extra_rdoc_files = ["rdoc-sources", File.join("rdoc-sources", "README.rdoc")]
   self.remote_rdoc_dir = "doc/api"
   self.spec_extras = {
     :description => "FXRuby is the Ruby binding to the FOX GUI toolkit.",
-    :extensions => ["ext/fox16/extconf.rb"],
-    :rdoc_options => ['--main', File.join('rdoc-sources', 'README.rdoc'), '--exclude', 'ext/fox16', '--exclude', %r{aliases|kwargs|missingdep|responder}.inspect],
-    :require_paths => ['ext/fox16', 'lib'],
+    :extensions => ["ext/fox16_c/extconf.rb"],
+    :rdoc_options => ['--main', File.join('rdoc-sources', 'README.rdoc'), '--exclude', 'ext/fox16_c', '--exclude', %r{aliases|kwargs|missingdep|responder}.inspect],
+    :require_paths => ['lib'],
     :summary => "FXRuby is the Ruby binding to the FOX GUI toolkit."
   }
   self.test_globs = ["test/**/TC_*.rb"]
@@ -67,9 +67,9 @@ hoe = Hoe.spec "fxruby" do
   self.extra_rdoc_files << self.readme_file
 
   spec_extras[:files] = File.read_utf("Manifest.txt").split(/\r?\n\r?/).reject{|f| f=~/^fox-includes|^web/ }
-  spec_extras[:files] += SWIG_MODULES.values.map{|f| File.join("ext/fox16", f) }
-  spec_extras[:files] << 'ext/fox16/include/inlinestubs.h'
-  spec_extras[:files] << 'ext/fox16/librb.c'
+  spec_extras[:files] += SWIG_MODULES.values.map{|f| File.join("ext/fox16_c", f) }
+  spec_extras[:files] << 'ext/fox16_c/include/inlinestubs.h'
+  spec_extras[:files] << 'ext/fox16_c/librb.c'
   spec_extras[:files] << 'doap.rdf'
   spec_extras[:files] << 'lib/fox16/kwargs.rb'
 end
@@ -82,14 +82,14 @@ task :test => [:compile]
 # We need to go back and tell it to skip the stuff under ext.
 # rdoc_target = Rake::Task['docs'].prerequisites.first
 # rdoc_files = Rake::Task[rdoc_target].prerequisites
-# rdoc_files.reject! {|x| x == "ext/fox16" }
+# rdoc_files.reject! {|x| x == "ext/fox16_c" }
 
 # Make sure that all of the package contents exist before we try to build the package
 #Rake::Task['package'].prerequisites.unshift("swig:swig", "fxruby:setversions", "fxruby:generate_kwargs_lib")
 
 # ... project specific tasks ...
 
-Rake::ExtensionTask.new("fox16", hoe.spec) do |ext|
+Rake::ExtensionTask.new("fox16_c", hoe.spec) do |ext|
   ext.cross_compile = true
   ext.cross_platform = ['i386-mingw32']
   ext.cross_config_options += [
@@ -129,8 +129,8 @@ namespace :swig do
     sed wrapper_src_file_name
   end
 
-  task :swig_librb => ["ext/fox16/librb.c"]
-  file "ext/fox16/librb.c" do |task|
+  task :swig_librb => ["ext/fox16_c/librb.c"]
+  file "ext/fox16_c/librb.c" do |task|
     puts "generate #{task.name}"
     File.open(task.name, "w") do |io|
       io.puts "#define SWIG_GLOBAL 1"
@@ -142,11 +142,11 @@ namespace :swig do
   end
 
   desc "Run SWIG to generate the wrapper files."
-  task :swig => [:swig_librb] + SWIG_MODULES.map{|ifile, cppfile| File.join("ext/fox16", cppfile) }
+  task :swig => [:swig_librb] + SWIG_MODULES.map{|ifile, cppfile| File.join("ext/fox16_c", cppfile) }
 
   # add dependencies for compile *.i to *_wrap.cpp
   SWIG_MODULES.each do |ifile, cppfile|
-    cppfile_path = File.join("ext/fox16", cppfile)
+    cppfile_path = File.join("ext/fox16_c", cppfile)
 
     file cppfile_path => [ifile, 'macros.i', 'common.i', 'fxdefs.i', 'ruby-typemaps.i',
                           'markfuncs.i', 'exceptions.i', 'freefuncs.i', 'macros.i', 'handlers.i'
@@ -189,21 +189,21 @@ namespace :fxruby do
   end
 
   def make_impl
-    ruby '-Cext/fox16', "make_impl.rb"
+    ruby '-Cext/fox16_c', "make_impl.rb"
   end
 
   task :configure => [:scintilla, :setversions, :generate_kwargs_lib]
 
   rb_header_files = Dir['ext/include/*.h']
-  file 'ext/fox16/include/inlinestubs.h' => rb_header_files do
+  file 'ext/fox16_c/include/inlinestubs.h' => rb_header_files do
     make_impl
   end
-  file 'ext/fox16/impl.cpp' => rb_header_files do
+  file 'ext/fox16_c/impl.cpp' => rb_header_files do
     make_impl
   end
 
-  file "ext/fox16/extconf.rb" => ['ext/fox16/librb.c', 'ext/fox16/impl.cpp', 'ext/fox16/include/inlinestubs.h'] +
-      SWIG_MODULES.map{|ifile, cppfile| File.join("ext/fox16", cppfile) }
+  file "ext/fox16_c/extconf.rb" => ['ext/fox16_c/librb.c', 'ext/fox16_c/impl.cpp', 'ext/fox16_c/include/inlinestubs.h'] +
+      SWIG_MODULES.map{|ifile, cppfile| File.join("ext/fox16_c", cppfile) }
 
   task :scintilla => 'lib/fox16/scintilla.rb'
   file 'lib/fox16/scintilla.rb' => [FXSCINTILLA_INSTALL_DIR, 'scripts/iface.rb'] do
diff --git a/ext/fox16/FXRbApp.cpp b/ext/fox16_c/FXRbApp.cpp
similarity index 100%
rename from ext/fox16/FXRbApp.cpp
rename to ext/fox16_c/FXRbApp.cpp
diff --git a/ext/fox16/FXRbDataTarget.cpp b/ext/fox16_c/FXRbDataTarget.cpp
similarity index 100%
rename from ext/fox16/FXRbDataTarget.cpp
rename to ext/fox16_c/FXRbDataTarget.cpp
diff --git a/ext/fox16/FXRbGLViewer.cpp b/ext/fox16_c/FXRbGLViewer.cpp
similarity index 100%
rename from ext/fox16/FXRbGLViewer.cpp
rename to ext/fox16_c/FXRbGLViewer.cpp
diff --git a/ext/fox16/FXRuby.cpp b/ext/fox16_c/FXRuby.cpp
similarity index 99%
rename from ext/fox16/FXRuby.cpp
rename to ext/fox16_c/FXRuby.cpp
index 318b0b6c832c1ac325508ab91ef2c10ad3360c3b..35f14c0654233f3d1ac793362e108472e4d5f3d9 100644
--- a/ext/fox16/FXRuby.cpp
+++ b/ext/fox16_c/FXRuby.cpp
@@ -2023,7 +2023,7 @@ extern "C" void
 #if defined _WIN32
 __declspec(dllexport)
 #endif
-Init_fox16(void) {
+Init_fox16_c(void) {
   Init_core();
   Init_dc();
   Init_frames();
diff --git a/ext/fox16/MANIFEST b/ext/fox16_c/MANIFEST
similarity index 100%
rename from ext/fox16/MANIFEST
rename to ext/fox16_c/MANIFEST
diff --git a/ext/fox16/extconf.rb b/ext/fox16_c/extconf.rb
similarity index 99%
rename from ext/fox16/extconf.rb
rename to ext/fox16_c/extconf.rb
index 094abe7454f70def04f7c6e72b6d0f8532a5b840..ba24adff0a2a13afda8767cf2edf380f675f6914 100755
--- a/ext/fox16/extconf.rb
+++ b/ext/fox16_c/extconf.rb
@@ -149,4 +149,4 @@ do_rake_compiler_setup
 $CFLAGS += " -DRUBY_1_9" if RUBY_VERSION =~ /1\.9\./
 
 # Last step: build the makefile
-create_makefile("fox16")
+create_makefile("fox16_c")
diff --git a/ext/fox16/impl.cpp b/ext/fox16_c/impl.cpp
similarity index 100%
rename from ext/fox16/impl.cpp
rename to ext/fox16_c/impl.cpp
diff --git a/ext/fox16/include/FXMemoryBuffer.h b/ext/fox16_c/include/FXMemoryBuffer.h
similarity index 100%
rename from ext/fox16/include/FXMemoryBuffer.h
rename to ext/fox16_c/include/FXMemoryBuffer.h
diff --git a/ext/fox16/include/FXRb4Splitter.h b/ext/fox16_c/include/FXRb4Splitter.h
similarity index 100%
rename from ext/fox16/include/FXRb4Splitter.h
rename to ext/fox16_c/include/FXRb4Splitter.h
diff --git a/ext/fox16/include/FXRb7Segment.h b/ext/fox16_c/include/FXRb7Segment.h
similarity index 100%
rename from ext/fox16/include/FXRb7Segment.h
rename to ext/fox16_c/include/FXRb7Segment.h
diff --git a/ext/fox16/include/FXRbAccelTable.h b/ext/fox16_c/include/FXRbAccelTable.h
similarity index 100%
rename from ext/fox16/include/FXRbAccelTable.h
rename to ext/fox16_c/include/FXRbAccelTable.h
diff --git a/ext/fox16/include/FXRbApp.h b/ext/fox16_c/include/FXRbApp.h
similarity index 100%
rename from ext/fox16/include/FXRbApp.h
rename to ext/fox16_c/include/FXRbApp.h
diff --git a/ext/fox16/include/FXRbAppVirtuals.h b/ext/fox16_c/include/FXRbAppVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbAppVirtuals.h
rename to ext/fox16_c/include/FXRbAppVirtuals.h
diff --git a/ext/fox16/include/FXRbArrowButton.h b/ext/fox16_c/include/FXRbArrowButton.h
similarity index 100%
rename from ext/fox16/include/FXRbArrowButton.h
rename to ext/fox16_c/include/FXRbArrowButton.h
diff --git a/ext/fox16/include/FXRbBMPIcon.h b/ext/fox16_c/include/FXRbBMPIcon.h
similarity index 100%
rename from ext/fox16/include/FXRbBMPIcon.h
rename to ext/fox16_c/include/FXRbBMPIcon.h
diff --git a/ext/fox16/include/FXRbBMPImage.h b/ext/fox16_c/include/FXRbBMPImage.h
similarity index 100%
rename from ext/fox16/include/FXRbBMPImage.h
rename to ext/fox16_c/include/FXRbBMPImage.h
diff --git a/ext/fox16/include/FXRbBitmap.h b/ext/fox16_c/include/FXRbBitmap.h
similarity index 100%
rename from ext/fox16/include/FXRbBitmap.h
rename to ext/fox16_c/include/FXRbBitmap.h
diff --git a/ext/fox16/include/FXRbBitmapFrame.h b/ext/fox16_c/include/FXRbBitmapFrame.h
similarity index 100%
rename from ext/fox16/include/FXRbBitmapFrame.h
rename to ext/fox16_c/include/FXRbBitmapFrame.h
diff --git a/ext/fox16/include/FXRbBitmapView.h b/ext/fox16_c/include/FXRbBitmapView.h
similarity index 100%
rename from ext/fox16/include/FXRbBitmapView.h
rename to ext/fox16_c/include/FXRbBitmapView.h
diff --git a/ext/fox16/include/FXRbBitmapVirtuals.h b/ext/fox16_c/include/FXRbBitmapVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbBitmapVirtuals.h
rename to ext/fox16_c/include/FXRbBitmapVirtuals.h
diff --git a/ext/fox16/include/FXRbButton.h b/ext/fox16_c/include/FXRbButton.h
similarity index 100%
rename from ext/fox16/include/FXRbButton.h
rename to ext/fox16_c/include/FXRbButton.h
diff --git a/ext/fox16/include/FXRbCURCursor.h b/ext/fox16_c/include/FXRbCURCursor.h
similarity index 100%
rename from ext/fox16/include/FXRbCURCursor.h
rename to ext/fox16_c/include/FXRbCURCursor.h
diff --git a/ext/fox16/include/FXRbCanvas.h b/ext/fox16_c/include/FXRbCanvas.h
similarity index 100%
rename from ext/fox16/include/FXRbCanvas.h
rename to ext/fox16_c/include/FXRbCanvas.h
diff --git a/ext/fox16/include/FXRbCheckButton.h b/ext/fox16_c/include/FXRbCheckButton.h
similarity index 100%
rename from ext/fox16/include/FXRbCheckButton.h
rename to ext/fox16_c/include/FXRbCheckButton.h
diff --git a/ext/fox16/include/FXRbChoiceBox.h b/ext/fox16_c/include/FXRbChoiceBox.h
similarity index 100%
rename from ext/fox16/include/FXRbChoiceBox.h
rename to ext/fox16_c/include/FXRbChoiceBox.h
diff --git a/ext/fox16/include/FXRbColorBar.h b/ext/fox16_c/include/FXRbColorBar.h
similarity index 100%
rename from ext/fox16/include/FXRbColorBar.h
rename to ext/fox16_c/include/FXRbColorBar.h
diff --git a/ext/fox16/include/FXRbColorDialog.h b/ext/fox16_c/include/FXRbColorDialog.h
similarity index 100%
rename from ext/fox16/include/FXRbColorDialog.h
rename to ext/fox16_c/include/FXRbColorDialog.h
diff --git a/ext/fox16/include/FXRbColorList.h b/ext/fox16_c/include/FXRbColorList.h
similarity index 100%
rename from ext/fox16/include/FXRbColorList.h
rename to ext/fox16_c/include/FXRbColorList.h
diff --git a/ext/fox16/include/FXRbColorRing.h b/ext/fox16_c/include/FXRbColorRing.h
similarity index 100%
rename from ext/fox16/include/FXRbColorRing.h
rename to ext/fox16_c/include/FXRbColorRing.h
diff --git a/ext/fox16/include/FXRbColorSelector.h b/ext/fox16_c/include/FXRbColorSelector.h
similarity index 100%
rename from ext/fox16/include/FXRbColorSelector.h
rename to ext/fox16_c/include/FXRbColorSelector.h
diff --git a/ext/fox16/include/FXRbColorWell.h b/ext/fox16_c/include/FXRbColorWell.h
similarity index 100%
rename from ext/fox16/include/FXRbColorWell.h
rename to ext/fox16_c/include/FXRbColorWell.h
diff --git a/ext/fox16/include/FXRbColorWheel.h b/ext/fox16_c/include/FXRbColorWheel.h
similarity index 100%
rename from ext/fox16/include/FXRbColorWheel.h
rename to ext/fox16_c/include/FXRbColorWheel.h
diff --git a/ext/fox16/include/FXRbComboBox.h b/ext/fox16_c/include/FXRbComboBox.h
similarity index 100%
rename from ext/fox16/include/FXRbComboBox.h
rename to ext/fox16_c/include/FXRbComboBox.h
diff --git a/ext/fox16/include/FXRbCommon.h b/ext/fox16_c/include/FXRbCommon.h
similarity index 100%
rename from ext/fox16/include/FXRbCommon.h
rename to ext/fox16_c/include/FXRbCommon.h
diff --git a/ext/fox16/include/FXRbComposite.h b/ext/fox16_c/include/FXRbComposite.h
similarity index 100%
rename from ext/fox16/include/FXRbComposite.h
rename to ext/fox16_c/include/FXRbComposite.h
diff --git a/ext/fox16/include/FXRbCursor.h b/ext/fox16_c/include/FXRbCursor.h
similarity index 100%
rename from ext/fox16/include/FXRbCursor.h
rename to ext/fox16_c/include/FXRbCursor.h
diff --git a/ext/fox16/include/FXRbCursorVirtuals.h b/ext/fox16_c/include/FXRbCursorVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbCursorVirtuals.h
rename to ext/fox16_c/include/FXRbCursorVirtuals.h
diff --git a/ext/fox16/include/FXRbDC.h b/ext/fox16_c/include/FXRbDC.h
similarity index 100%
rename from ext/fox16/include/FXRbDC.h
rename to ext/fox16_c/include/FXRbDC.h
diff --git a/ext/fox16/include/FXRbDCPrint.h b/ext/fox16_c/include/FXRbDCPrint.h
similarity index 100%
rename from ext/fox16/include/FXRbDCPrint.h
rename to ext/fox16_c/include/FXRbDCPrint.h
diff --git a/ext/fox16/include/FXRbDCVirtuals.h b/ext/fox16_c/include/FXRbDCVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbDCVirtuals.h
rename to ext/fox16_c/include/FXRbDCVirtuals.h
diff --git a/ext/fox16/include/FXRbDCWindow.h b/ext/fox16_c/include/FXRbDCWindow.h
similarity index 100%
rename from ext/fox16/include/FXRbDCWindow.h
rename to ext/fox16_c/include/FXRbDCWindow.h
diff --git a/ext/fox16/include/FXRbDataTarget.h b/ext/fox16_c/include/FXRbDataTarget.h
similarity index 100%
rename from ext/fox16/include/FXRbDataTarget.h
rename to ext/fox16_c/include/FXRbDataTarget.h
diff --git a/ext/fox16/include/FXRbDebugTarget.h b/ext/fox16_c/include/FXRbDebugTarget.h
similarity index 100%
rename from ext/fox16/include/FXRbDebugTarget.h
rename to ext/fox16_c/include/FXRbDebugTarget.h
diff --git a/ext/fox16/include/FXRbDelegator.h b/ext/fox16_c/include/FXRbDelegator.h
similarity index 100%
rename from ext/fox16/include/FXRbDelegator.h
rename to ext/fox16_c/include/FXRbDelegator.h
diff --git a/ext/fox16/include/FXRbDial.h b/ext/fox16_c/include/FXRbDial.h
similarity index 100%
rename from ext/fox16/include/FXRbDial.h
rename to ext/fox16_c/include/FXRbDial.h
diff --git a/ext/fox16/include/FXRbDialogBox.h b/ext/fox16_c/include/FXRbDialogBox.h
similarity index 100%
rename from ext/fox16/include/FXRbDialogBox.h
rename to ext/fox16_c/include/FXRbDialogBox.h
diff --git a/ext/fox16/include/FXRbDialogBoxVirtuals.h b/ext/fox16_c/include/FXRbDialogBoxVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbDialogBoxVirtuals.h
rename to ext/fox16_c/include/FXRbDialogBoxVirtuals.h
diff --git a/ext/fox16/include/FXRbDict.h b/ext/fox16_c/include/FXRbDict.h
similarity index 100%
rename from ext/fox16/include/FXRbDict.h
rename to ext/fox16_c/include/FXRbDict.h
diff --git a/ext/fox16/include/FXRbDirBox.h b/ext/fox16_c/include/FXRbDirBox.h
similarity index 100%
rename from ext/fox16/include/FXRbDirBox.h
rename to ext/fox16_c/include/FXRbDirBox.h
diff --git a/ext/fox16/include/FXRbDirDialog.h b/ext/fox16_c/include/FXRbDirDialog.h
similarity index 100%
rename from ext/fox16/include/FXRbDirDialog.h
rename to ext/fox16_c/include/FXRbDirDialog.h
diff --git a/ext/fox16/include/FXRbDirList.h b/ext/fox16_c/include/FXRbDirList.h
similarity index 100%
rename from ext/fox16/include/FXRbDirList.h
rename to ext/fox16_c/include/FXRbDirList.h
diff --git a/ext/fox16/include/FXRbDirSelector.h b/ext/fox16_c/include/FXRbDirSelector.h
similarity index 100%
rename from ext/fox16/include/FXRbDirSelector.h
rename to ext/fox16_c/include/FXRbDirSelector.h
diff --git a/ext/fox16/include/FXRbDockBar.h b/ext/fox16_c/include/FXRbDockBar.h
similarity index 100%
rename from ext/fox16/include/FXRbDockBar.h
rename to ext/fox16_c/include/FXRbDockBar.h
diff --git a/ext/fox16/include/FXRbDockBarVirtuals.h b/ext/fox16_c/include/FXRbDockBarVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbDockBarVirtuals.h
rename to ext/fox16_c/include/FXRbDockBarVirtuals.h
diff --git a/ext/fox16/include/FXRbDockHandler.h b/ext/fox16_c/include/FXRbDockHandler.h
similarity index 100%
rename from ext/fox16/include/FXRbDockHandler.h
rename to ext/fox16_c/include/FXRbDockHandler.h
diff --git a/ext/fox16/include/FXRbDockSite.h b/ext/fox16_c/include/FXRbDockSite.h
similarity index 100%
rename from ext/fox16/include/FXRbDockSite.h
rename to ext/fox16_c/include/FXRbDockSite.h
diff --git a/ext/fox16/include/FXRbDockSiteVirtuals.h b/ext/fox16_c/include/FXRbDockSiteVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbDockSiteVirtuals.h
rename to ext/fox16_c/include/FXRbDockSiteVirtuals.h
diff --git a/ext/fox16/include/FXRbDockTitle.h b/ext/fox16_c/include/FXRbDockTitle.h
similarity index 100%
rename from ext/fox16/include/FXRbDockTitle.h
rename to ext/fox16_c/include/FXRbDockTitle.h
diff --git a/ext/fox16/include/FXRbDocument.h b/ext/fox16_c/include/FXRbDocument.h
similarity index 100%
rename from ext/fox16/include/FXRbDocument.h
rename to ext/fox16_c/include/FXRbDocument.h
diff --git a/ext/fox16/include/FXRbDragCorner.h b/ext/fox16_c/include/FXRbDragCorner.h
similarity index 100%
rename from ext/fox16/include/FXRbDragCorner.h
rename to ext/fox16_c/include/FXRbDragCorner.h
diff --git a/ext/fox16/include/FXRbDrawable.h b/ext/fox16_c/include/FXRbDrawable.h
similarity index 100%
rename from ext/fox16/include/FXRbDrawable.h
rename to ext/fox16_c/include/FXRbDrawable.h
diff --git a/ext/fox16/include/FXRbDrawableVirtuals.h b/ext/fox16_c/include/FXRbDrawableVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbDrawableVirtuals.h
rename to ext/fox16_c/include/FXRbDrawableVirtuals.h
diff --git a/ext/fox16/include/FXRbDriveBox.h b/ext/fox16_c/include/FXRbDriveBox.h
similarity index 100%
rename from ext/fox16/include/FXRbDriveBox.h
rename to ext/fox16_c/include/FXRbDriveBox.h
diff --git a/ext/fox16/include/FXRbFileDialog.h b/ext/fox16_c/include/FXRbFileDialog.h
similarity index 100%
rename from ext/fox16/include/FXRbFileDialog.h
rename to ext/fox16_c/include/FXRbFileDialog.h
diff --git a/ext/fox16/include/FXRbFileDict.h b/ext/fox16_c/include/FXRbFileDict.h
similarity index 100%
rename from ext/fox16/include/FXRbFileDict.h
rename to ext/fox16_c/include/FXRbFileDict.h
diff --git a/ext/fox16/include/FXRbFileDictVirtuals.h b/ext/fox16_c/include/FXRbFileDictVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbFileDictVirtuals.h
rename to ext/fox16_c/include/FXRbFileDictVirtuals.h
diff --git a/ext/fox16/include/FXRbFileList.h b/ext/fox16_c/include/FXRbFileList.h
similarity index 100%
rename from ext/fox16/include/FXRbFileList.h
rename to ext/fox16_c/include/FXRbFileList.h
diff --git a/ext/fox16/include/FXRbFileSelector.h b/ext/fox16_c/include/FXRbFileSelector.h
similarity index 100%
rename from ext/fox16/include/FXRbFileSelector.h
rename to ext/fox16_c/include/FXRbFileSelector.h
diff --git a/ext/fox16/include/FXRbFoldingItemVirtuals.h b/ext/fox16_c/include/FXRbFoldingItemVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbFoldingItemVirtuals.h
rename to ext/fox16_c/include/FXRbFoldingItemVirtuals.h
diff --git a/ext/fox16/include/FXRbFoldingList.h b/ext/fox16_c/include/FXRbFoldingList.h
similarity index 100%
rename from ext/fox16/include/FXRbFoldingList.h
rename to ext/fox16_c/include/FXRbFoldingList.h
diff --git a/ext/fox16/include/FXRbFoldingListVirtuals.h b/ext/fox16_c/include/FXRbFoldingListVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbFoldingListVirtuals.h
rename to ext/fox16_c/include/FXRbFoldingListVirtuals.h
diff --git a/ext/fox16/include/FXRbFont.h b/ext/fox16_c/include/FXRbFont.h
similarity index 100%
rename from ext/fox16/include/FXRbFont.h
rename to ext/fox16_c/include/FXRbFont.h
diff --git a/ext/fox16/include/FXRbFontDialog.h b/ext/fox16_c/include/FXRbFontDialog.h
similarity index 100%
rename from ext/fox16/include/FXRbFontDialog.h
rename to ext/fox16_c/include/FXRbFontDialog.h
diff --git a/ext/fox16/include/FXRbFontSelector.h b/ext/fox16_c/include/FXRbFontSelector.h
similarity index 100%
rename from ext/fox16/include/FXRbFontSelector.h
rename to ext/fox16_c/include/FXRbFontSelector.h
diff --git a/ext/fox16/include/FXRbFontVirtuals.h b/ext/fox16_c/include/FXRbFontVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbFontVirtuals.h
rename to ext/fox16_c/include/FXRbFontVirtuals.h
diff --git a/ext/fox16/include/FXRbFrame.h b/ext/fox16_c/include/FXRbFrame.h
similarity index 100%
rename from ext/fox16/include/FXRbFrame.h
rename to ext/fox16_c/include/FXRbFrame.h
diff --git a/ext/fox16/include/FXRbGIFCursor.h b/ext/fox16_c/include/FXRbGIFCursor.h
similarity index 100%
rename from ext/fox16/include/FXRbGIFCursor.h
rename to ext/fox16_c/include/FXRbGIFCursor.h
diff --git a/ext/fox16/include/FXRbGIFIcon.h b/ext/fox16_c/include/FXRbGIFIcon.h
similarity index 100%
rename from ext/fox16/include/FXRbGIFIcon.h
rename to ext/fox16_c/include/FXRbGIFIcon.h
diff --git a/ext/fox16/include/FXRbGIFImage.h b/ext/fox16_c/include/FXRbGIFImage.h
similarity index 100%
rename from ext/fox16/include/FXRbGIFImage.h
rename to ext/fox16_c/include/FXRbGIFImage.h
diff --git a/ext/fox16/include/FXRbGLCanvas.h b/ext/fox16_c/include/FXRbGLCanvas.h
similarity index 100%
rename from ext/fox16/include/FXRbGLCanvas.h
rename to ext/fox16_c/include/FXRbGLCanvas.h
diff --git a/ext/fox16/include/FXRbGLCanvasVirtuals.h b/ext/fox16_c/include/FXRbGLCanvasVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbGLCanvasVirtuals.h
rename to ext/fox16_c/include/FXRbGLCanvasVirtuals.h
diff --git a/ext/fox16/include/FXRbGLContext.h b/ext/fox16_c/include/FXRbGLContext.h
similarity index 100%
rename from ext/fox16/include/FXRbGLContext.h
rename to ext/fox16_c/include/FXRbGLContext.h
diff --git a/ext/fox16/include/FXRbGLObject.h b/ext/fox16_c/include/FXRbGLObject.h
similarity index 100%
rename from ext/fox16/include/FXRbGLObject.h
rename to ext/fox16_c/include/FXRbGLObject.h
diff --git a/ext/fox16/include/FXRbGLObjectVirtuals.h b/ext/fox16_c/include/FXRbGLObjectVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbGLObjectVirtuals.h
rename to ext/fox16_c/include/FXRbGLObjectVirtuals.h
diff --git a/ext/fox16/include/FXRbGLShape.h b/ext/fox16_c/include/FXRbGLShape.h
similarity index 100%
rename from ext/fox16/include/FXRbGLShape.h
rename to ext/fox16_c/include/FXRbGLShape.h
diff --git a/ext/fox16/include/FXRbGLShapeVirtuals.h b/ext/fox16_c/include/FXRbGLShapeVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbGLShapeVirtuals.h
rename to ext/fox16_c/include/FXRbGLShapeVirtuals.h
diff --git a/ext/fox16/include/FXRbGLViewer.h b/ext/fox16_c/include/FXRbGLViewer.h
similarity index 100%
rename from ext/fox16/include/FXRbGLViewer.h
rename to ext/fox16_c/include/FXRbGLViewer.h
diff --git a/ext/fox16/include/FXRbGLViewerVirtuals.h b/ext/fox16_c/include/FXRbGLViewerVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbGLViewerVirtuals.h
rename to ext/fox16_c/include/FXRbGLViewerVirtuals.h
diff --git a/ext/fox16/include/FXRbGLVisual.h b/ext/fox16_c/include/FXRbGLVisual.h
similarity index 100%
rename from ext/fox16/include/FXRbGLVisual.h
rename to ext/fox16_c/include/FXRbGLVisual.h
diff --git a/ext/fox16/include/FXRbGradientBar.h b/ext/fox16_c/include/FXRbGradientBar.h
similarity index 100%
rename from ext/fox16/include/FXRbGradientBar.h
rename to ext/fox16_c/include/FXRbGradientBar.h
diff --git a/ext/fox16/include/FXRbGroupBox.h b/ext/fox16_c/include/FXRbGroupBox.h
similarity index 100%
rename from ext/fox16/include/FXRbGroupBox.h
rename to ext/fox16_c/include/FXRbGroupBox.h
diff --git a/ext/fox16/include/FXRbHeader.h b/ext/fox16_c/include/FXRbHeader.h
similarity index 100%
rename from ext/fox16/include/FXRbHeader.h
rename to ext/fox16_c/include/FXRbHeader.h
diff --git a/ext/fox16/include/FXRbHeaderItemVirtuals.h b/ext/fox16_c/include/FXRbHeaderItemVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbHeaderItemVirtuals.h
rename to ext/fox16_c/include/FXRbHeaderItemVirtuals.h
diff --git a/ext/fox16/include/FXRbHorizontalFrame.h b/ext/fox16_c/include/FXRbHorizontalFrame.h
similarity index 100%
rename from ext/fox16/include/FXRbHorizontalFrame.h
rename to ext/fox16_c/include/FXRbHorizontalFrame.h
diff --git a/ext/fox16/include/FXRbICOIcon.h b/ext/fox16_c/include/FXRbICOIcon.h
similarity index 100%
rename from ext/fox16/include/FXRbICOIcon.h
rename to ext/fox16_c/include/FXRbICOIcon.h
diff --git a/ext/fox16/include/FXRbICOImage.h b/ext/fox16_c/include/FXRbICOImage.h
similarity index 100%
rename from ext/fox16/include/FXRbICOImage.h
rename to ext/fox16_c/include/FXRbICOImage.h
diff --git a/ext/fox16/include/FXRbIcon.h b/ext/fox16_c/include/FXRbIcon.h
similarity index 100%
rename from ext/fox16/include/FXRbIcon.h
rename to ext/fox16_c/include/FXRbIcon.h
diff --git a/ext/fox16/include/FXRbIconItemVirtuals.h b/ext/fox16_c/include/FXRbIconItemVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbIconItemVirtuals.h
rename to ext/fox16_c/include/FXRbIconItemVirtuals.h
diff --git a/ext/fox16/include/FXRbIconList.h b/ext/fox16_c/include/FXRbIconList.h
similarity index 100%
rename from ext/fox16/include/FXRbIconList.h
rename to ext/fox16_c/include/FXRbIconList.h
diff --git a/ext/fox16/include/FXRbIconListVirtuals.h b/ext/fox16_c/include/FXRbIconListVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbIconListVirtuals.h
rename to ext/fox16_c/include/FXRbIconListVirtuals.h
diff --git a/ext/fox16/include/FXRbIconSource.h b/ext/fox16_c/include/FXRbIconSource.h
similarity index 100%
rename from ext/fox16/include/FXRbIconSource.h
rename to ext/fox16_c/include/FXRbIconSource.h
diff --git a/ext/fox16/include/FXRbIconSourceVirtuals.h b/ext/fox16_c/include/FXRbIconSourceVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbIconSourceVirtuals.h
rename to ext/fox16_c/include/FXRbIconSourceVirtuals.h
diff --git a/ext/fox16/include/FXRbId.h b/ext/fox16_c/include/FXRbId.h
similarity index 100%
rename from ext/fox16/include/FXRbId.h
rename to ext/fox16_c/include/FXRbId.h
diff --git a/ext/fox16/include/FXRbIdVirtuals.h b/ext/fox16_c/include/FXRbIdVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbIdVirtuals.h
rename to ext/fox16_c/include/FXRbIdVirtuals.h
diff --git a/ext/fox16/include/FXRbImage.h b/ext/fox16_c/include/FXRbImage.h
similarity index 100%
rename from ext/fox16/include/FXRbImage.h
rename to ext/fox16_c/include/FXRbImage.h
diff --git a/ext/fox16/include/FXRbImageFrame.h b/ext/fox16_c/include/FXRbImageFrame.h
similarity index 100%
rename from ext/fox16/include/FXRbImageFrame.h
rename to ext/fox16_c/include/FXRbImageFrame.h
diff --git a/ext/fox16/include/FXRbImageView.h b/ext/fox16_c/include/FXRbImageView.h
similarity index 100%
rename from ext/fox16/include/FXRbImageView.h
rename to ext/fox16_c/include/FXRbImageView.h
diff --git a/ext/fox16/include/FXRbImageVirtuals.h b/ext/fox16_c/include/FXRbImageVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbImageVirtuals.h
rename to ext/fox16_c/include/FXRbImageVirtuals.h
diff --git a/ext/fox16/include/FXRbInputDialog.h b/ext/fox16_c/include/FXRbInputDialog.h
similarity index 100%
rename from ext/fox16/include/FXRbInputDialog.h
rename to ext/fox16_c/include/FXRbInputDialog.h
diff --git a/ext/fox16/include/FXRbJPGIcon.h b/ext/fox16_c/include/FXRbJPGIcon.h
similarity index 100%
rename from ext/fox16/include/FXRbJPGIcon.h
rename to ext/fox16_c/include/FXRbJPGIcon.h
diff --git a/ext/fox16/include/FXRbJPGImage.h b/ext/fox16_c/include/FXRbJPGImage.h
similarity index 100%
rename from ext/fox16/include/FXRbJPGImage.h
rename to ext/fox16_c/include/FXRbJPGImage.h
diff --git a/ext/fox16/include/FXRbKnob.h b/ext/fox16_c/include/FXRbKnob.h
similarity index 100%
rename from ext/fox16/include/FXRbKnob.h
rename to ext/fox16_c/include/FXRbKnob.h
diff --git a/ext/fox16/include/FXRbLabel.h b/ext/fox16_c/include/FXRbLabel.h
similarity index 100%
rename from ext/fox16/include/FXRbLabel.h
rename to ext/fox16_c/include/FXRbLabel.h
diff --git a/ext/fox16/include/FXRbList.h b/ext/fox16_c/include/FXRbList.h
similarity index 100%
rename from ext/fox16/include/FXRbList.h
rename to ext/fox16_c/include/FXRbList.h
diff --git a/ext/fox16/include/FXRbListBox.h b/ext/fox16_c/include/FXRbListBox.h
similarity index 100%
rename from ext/fox16/include/FXRbListBox.h
rename to ext/fox16_c/include/FXRbListBox.h
diff --git a/ext/fox16/include/FXRbListBoxVirtuals.h b/ext/fox16_c/include/FXRbListBoxVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbListBoxVirtuals.h
rename to ext/fox16_c/include/FXRbListBoxVirtuals.h
diff --git a/ext/fox16/include/FXRbListItemVirtuals.h b/ext/fox16_c/include/FXRbListItemVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbListItemVirtuals.h
rename to ext/fox16_c/include/FXRbListItemVirtuals.h
diff --git a/ext/fox16/include/FXRbListVirtuals.h b/ext/fox16_c/include/FXRbListVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbListVirtuals.h
rename to ext/fox16_c/include/FXRbListVirtuals.h
diff --git a/ext/fox16/include/FXRbMDIButton.h b/ext/fox16_c/include/FXRbMDIButton.h
similarity index 100%
rename from ext/fox16/include/FXRbMDIButton.h
rename to ext/fox16_c/include/FXRbMDIButton.h
diff --git a/ext/fox16/include/FXRbMDIChild.h b/ext/fox16_c/include/FXRbMDIChild.h
similarity index 100%
rename from ext/fox16/include/FXRbMDIChild.h
rename to ext/fox16_c/include/FXRbMDIChild.h
diff --git a/ext/fox16/include/FXRbMDIChildVirtuals.h b/ext/fox16_c/include/FXRbMDIChildVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbMDIChildVirtuals.h
rename to ext/fox16_c/include/FXRbMDIChildVirtuals.h
diff --git a/ext/fox16/include/FXRbMDIClient.h b/ext/fox16_c/include/FXRbMDIClient.h
similarity index 100%
rename from ext/fox16/include/FXRbMDIClient.h
rename to ext/fox16_c/include/FXRbMDIClient.h
diff --git a/ext/fox16/include/FXRbMDIClientVirtuals.h b/ext/fox16_c/include/FXRbMDIClientVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbMDIClientVirtuals.h
rename to ext/fox16_c/include/FXRbMDIClientVirtuals.h
diff --git a/ext/fox16/include/FXRbMainWindow.h b/ext/fox16_c/include/FXRbMainWindow.h
similarity index 100%
rename from ext/fox16/include/FXRbMainWindow.h
rename to ext/fox16_c/include/FXRbMainWindow.h
diff --git a/ext/fox16/include/FXRbMatrix.h b/ext/fox16_c/include/FXRbMatrix.h
similarity index 100%
rename from ext/fox16/include/FXRbMatrix.h
rename to ext/fox16_c/include/FXRbMatrix.h
diff --git a/ext/fox16/include/FXRbMenuBar.h b/ext/fox16_c/include/FXRbMenuBar.h
similarity index 100%
rename from ext/fox16/include/FXRbMenuBar.h
rename to ext/fox16_c/include/FXRbMenuBar.h
diff --git a/ext/fox16/include/FXRbMenuButton.h b/ext/fox16_c/include/FXRbMenuButton.h
similarity index 100%
rename from ext/fox16/include/FXRbMenuButton.h
rename to ext/fox16_c/include/FXRbMenuButton.h
diff --git a/ext/fox16/include/FXRbMenuCaption.h b/ext/fox16_c/include/FXRbMenuCaption.h
similarity index 100%
rename from ext/fox16/include/FXRbMenuCaption.h
rename to ext/fox16_c/include/FXRbMenuCaption.h
diff --git a/ext/fox16/include/FXRbMenuCascade.h b/ext/fox16_c/include/FXRbMenuCascade.h
similarity index 100%
rename from ext/fox16/include/FXRbMenuCascade.h
rename to ext/fox16_c/include/FXRbMenuCascade.h
diff --git a/ext/fox16/include/FXRbMenuCheck.h b/ext/fox16_c/include/FXRbMenuCheck.h
similarity index 100%
rename from ext/fox16/include/FXRbMenuCheck.h
rename to ext/fox16_c/include/FXRbMenuCheck.h
diff --git a/ext/fox16/include/FXRbMenuCommand.h b/ext/fox16_c/include/FXRbMenuCommand.h
similarity index 100%
rename from ext/fox16/include/FXRbMenuCommand.h
rename to ext/fox16_c/include/FXRbMenuCommand.h
diff --git a/ext/fox16/include/FXRbMenuPane.h b/ext/fox16_c/include/FXRbMenuPane.h
similarity index 100%
rename from ext/fox16/include/FXRbMenuPane.h
rename to ext/fox16_c/include/FXRbMenuPane.h
diff --git a/ext/fox16/include/FXRbMenuRadio.h b/ext/fox16_c/include/FXRbMenuRadio.h
similarity index 100%
rename from ext/fox16/include/FXRbMenuRadio.h
rename to ext/fox16_c/include/FXRbMenuRadio.h
diff --git a/ext/fox16/include/FXRbMenuSeparator.h b/ext/fox16_c/include/FXRbMenuSeparator.h
similarity index 100%
rename from ext/fox16/include/FXRbMenuSeparator.h
rename to ext/fox16_c/include/FXRbMenuSeparator.h
diff --git a/ext/fox16/include/FXRbMenuTitle.h b/ext/fox16_c/include/FXRbMenuTitle.h
similarity index 100%
rename from ext/fox16/include/FXRbMenuTitle.h
rename to ext/fox16_c/include/FXRbMenuTitle.h
diff --git a/ext/fox16/include/FXRbMessageBox.h b/ext/fox16_c/include/FXRbMessageBox.h
similarity index 100%
rename from ext/fox16/include/FXRbMessageBox.h
rename to ext/fox16_c/include/FXRbMessageBox.h
diff --git a/ext/fox16/include/FXRbObject.h b/ext/fox16_c/include/FXRbObject.h
similarity index 100%
rename from ext/fox16/include/FXRbObject.h
rename to ext/fox16_c/include/FXRbObject.h
diff --git a/ext/fox16/include/FXRbObjectVirtuals.h b/ext/fox16_c/include/FXRbObjectVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbObjectVirtuals.h
rename to ext/fox16_c/include/FXRbObjectVirtuals.h
diff --git a/ext/fox16/include/FXRbOptionMenu.h b/ext/fox16_c/include/FXRbOptionMenu.h
similarity index 100%
rename from ext/fox16/include/FXRbOptionMenu.h
rename to ext/fox16_c/include/FXRbOptionMenu.h
diff --git a/ext/fox16/include/FXRbPCXIcon.h b/ext/fox16_c/include/FXRbPCXIcon.h
similarity index 100%
rename from ext/fox16/include/FXRbPCXIcon.h
rename to ext/fox16_c/include/FXRbPCXIcon.h
diff --git a/ext/fox16/include/FXRbPCXImage.h b/ext/fox16_c/include/FXRbPCXImage.h
similarity index 100%
rename from ext/fox16/include/FXRbPCXImage.h
rename to ext/fox16_c/include/FXRbPCXImage.h
diff --git a/ext/fox16/include/FXRbPNGIcon.h b/ext/fox16_c/include/FXRbPNGIcon.h
similarity index 100%
rename from ext/fox16/include/FXRbPNGIcon.h
rename to ext/fox16_c/include/FXRbPNGIcon.h
diff --git a/ext/fox16/include/FXRbPNGImage.h b/ext/fox16_c/include/FXRbPNGImage.h
similarity index 100%
rename from ext/fox16/include/FXRbPNGImage.h
rename to ext/fox16_c/include/FXRbPNGImage.h
diff --git a/ext/fox16/include/FXRbPPMIcon.h b/ext/fox16_c/include/FXRbPPMIcon.h
similarity index 100%
rename from ext/fox16/include/FXRbPPMIcon.h
rename to ext/fox16_c/include/FXRbPPMIcon.h
diff --git a/ext/fox16/include/FXRbPPMImage.h b/ext/fox16_c/include/FXRbPPMImage.h
similarity index 100%
rename from ext/fox16/include/FXRbPPMImage.h
rename to ext/fox16_c/include/FXRbPPMImage.h
diff --git a/ext/fox16/include/FXRbPacker.h b/ext/fox16_c/include/FXRbPacker.h
similarity index 100%
rename from ext/fox16/include/FXRbPacker.h
rename to ext/fox16_c/include/FXRbPacker.h
diff --git a/ext/fox16/include/FXRbPicker.h b/ext/fox16_c/include/FXRbPicker.h
similarity index 100%
rename from ext/fox16/include/FXRbPicker.h
rename to ext/fox16_c/include/FXRbPicker.h
diff --git a/ext/fox16/include/FXRbPopup.h b/ext/fox16_c/include/FXRbPopup.h
similarity index 100%
rename from ext/fox16/include/FXRbPopup.h
rename to ext/fox16_c/include/FXRbPopup.h
diff --git a/ext/fox16/include/FXRbPopupVirtuals.h b/ext/fox16_c/include/FXRbPopupVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbPopupVirtuals.h
rename to ext/fox16_c/include/FXRbPopupVirtuals.h
diff --git a/ext/fox16/include/FXRbPrintDialog.h b/ext/fox16_c/include/FXRbPrintDialog.h
similarity index 100%
rename from ext/fox16/include/FXRbPrintDialog.h
rename to ext/fox16_c/include/FXRbPrintDialog.h
diff --git a/ext/fox16/include/FXRbProgressBar.h b/ext/fox16_c/include/FXRbProgressBar.h
similarity index 100%
rename from ext/fox16/include/FXRbProgressBar.h
rename to ext/fox16_c/include/FXRbProgressBar.h
diff --git a/ext/fox16/include/FXRbProgressDialog.h b/ext/fox16_c/include/FXRbProgressDialog.h
similarity index 100%
rename from ext/fox16/include/FXRbProgressDialog.h
rename to ext/fox16_c/include/FXRbProgressDialog.h
diff --git a/ext/fox16/include/FXRbRGBIcon.h b/ext/fox16_c/include/FXRbRGBIcon.h
similarity index 100%
rename from ext/fox16/include/FXRbRGBIcon.h
rename to ext/fox16_c/include/FXRbRGBIcon.h
diff --git a/ext/fox16/include/FXRbRGBImage.h b/ext/fox16_c/include/FXRbRGBImage.h
similarity index 100%
rename from ext/fox16/include/FXRbRGBImage.h
rename to ext/fox16_c/include/FXRbRGBImage.h
diff --git a/ext/fox16/include/FXRbRadioButton.h b/ext/fox16_c/include/FXRbRadioButton.h
similarity index 100%
rename from ext/fox16/include/FXRbRadioButton.h
rename to ext/fox16_c/include/FXRbRadioButton.h
diff --git a/ext/fox16/include/FXRbRealSlider.h b/ext/fox16_c/include/FXRbRealSlider.h
similarity index 100%
rename from ext/fox16/include/FXRbRealSlider.h
rename to ext/fox16_c/include/FXRbRealSlider.h
diff --git a/ext/fox16/include/FXRbRealSpinner.h b/ext/fox16_c/include/FXRbRealSpinner.h
similarity index 100%
rename from ext/fox16/include/FXRbRealSpinner.h
rename to ext/fox16_c/include/FXRbRealSpinner.h
diff --git a/ext/fox16/include/FXRbRealSpinnerVirtuals.h b/ext/fox16_c/include/FXRbRealSpinnerVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbRealSpinnerVirtuals.h
rename to ext/fox16_c/include/FXRbRealSpinnerVirtuals.h
diff --git a/ext/fox16/include/FXRbRecentFiles.h b/ext/fox16_c/include/FXRbRecentFiles.h
similarity index 100%
rename from ext/fox16/include/FXRbRecentFiles.h
rename to ext/fox16_c/include/FXRbRecentFiles.h
diff --git a/ext/fox16/include/FXRbRegistry.h b/ext/fox16_c/include/FXRbRegistry.h
similarity index 100%
rename from ext/fox16/include/FXRbRegistry.h
rename to ext/fox16_c/include/FXRbRegistry.h
diff --git a/ext/fox16/include/FXRbReplaceDialog.h b/ext/fox16_c/include/FXRbReplaceDialog.h
similarity index 100%
rename from ext/fox16/include/FXRbReplaceDialog.h
rename to ext/fox16_c/include/FXRbReplaceDialog.h
diff --git a/ext/fox16/include/FXRbRootWindow.h b/ext/fox16_c/include/FXRbRootWindow.h
similarity index 100%
rename from ext/fox16/include/FXRbRootWindow.h
rename to ext/fox16_c/include/FXRbRootWindow.h
diff --git a/ext/fox16/include/FXRbRuler.h b/ext/fox16_c/include/FXRbRuler.h
similarity index 100%
rename from ext/fox16/include/FXRbRuler.h
rename to ext/fox16_c/include/FXRbRuler.h
diff --git a/ext/fox16/include/FXRbRulerView.h b/ext/fox16_c/include/FXRbRulerView.h
similarity index 100%
rename from ext/fox16/include/FXRbRulerView.h
rename to ext/fox16_c/include/FXRbRulerView.h
diff --git a/ext/fox16/include/FXRbScintilla.h b/ext/fox16_c/include/FXRbScintilla.h
similarity index 100%
rename from ext/fox16/include/FXRbScintilla.h
rename to ext/fox16_c/include/FXRbScintilla.h
diff --git a/ext/fox16/include/FXRbScrollArea.h b/ext/fox16_c/include/FXRbScrollArea.h
similarity index 100%
rename from ext/fox16/include/FXRbScrollArea.h
rename to ext/fox16_c/include/FXRbScrollArea.h
diff --git a/ext/fox16/include/FXRbScrollAreaVirtuals.h b/ext/fox16_c/include/FXRbScrollAreaVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbScrollAreaVirtuals.h
rename to ext/fox16_c/include/FXRbScrollAreaVirtuals.h
diff --git a/ext/fox16/include/FXRbScrollBar.h b/ext/fox16_c/include/FXRbScrollBar.h
similarity index 100%
rename from ext/fox16/include/FXRbScrollBar.h
rename to ext/fox16_c/include/FXRbScrollBar.h
diff --git a/ext/fox16/include/FXRbScrollPane.h b/ext/fox16_c/include/FXRbScrollPane.h
similarity index 100%
rename from ext/fox16/include/FXRbScrollPane.h
rename to ext/fox16_c/include/FXRbScrollPane.h
diff --git a/ext/fox16/include/FXRbScrollWindow.h b/ext/fox16_c/include/FXRbScrollWindow.h
similarity index 100%
rename from ext/fox16/include/FXRbScrollWindow.h
rename to ext/fox16_c/include/FXRbScrollWindow.h
diff --git a/ext/fox16/include/FXRbSearchDialog.h b/ext/fox16_c/include/FXRbSearchDialog.h
similarity index 100%
rename from ext/fox16/include/FXRbSearchDialog.h
rename to ext/fox16_c/include/FXRbSearchDialog.h
diff --git a/ext/fox16/include/FXRbSeparator.h b/ext/fox16_c/include/FXRbSeparator.h
similarity index 100%
rename from ext/fox16/include/FXRbSeparator.h
rename to ext/fox16_c/include/FXRbSeparator.h
diff --git a/ext/fox16/include/FXRbSettings.h b/ext/fox16_c/include/FXRbSettings.h
similarity index 100%
rename from ext/fox16/include/FXRbSettings.h
rename to ext/fox16_c/include/FXRbSettings.h
diff --git a/ext/fox16/include/FXRbShell.h b/ext/fox16_c/include/FXRbShell.h
similarity index 100%
rename from ext/fox16/include/FXRbShell.h
rename to ext/fox16_c/include/FXRbShell.h
diff --git a/ext/fox16/include/FXRbShutter.h b/ext/fox16_c/include/FXRbShutter.h
similarity index 100%
rename from ext/fox16/include/FXRbShutter.h
rename to ext/fox16_c/include/FXRbShutter.h
diff --git a/ext/fox16/include/FXRbShutterVirtuals.h b/ext/fox16_c/include/FXRbShutterVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbShutterVirtuals.h
rename to ext/fox16_c/include/FXRbShutterVirtuals.h
diff --git a/ext/fox16/include/FXRbSlider.h b/ext/fox16_c/include/FXRbSlider.h
similarity index 100%
rename from ext/fox16/include/FXRbSlider.h
rename to ext/fox16_c/include/FXRbSlider.h
diff --git a/ext/fox16/include/FXRbSpinner.h b/ext/fox16_c/include/FXRbSpinner.h
similarity index 100%
rename from ext/fox16/include/FXRbSpinner.h
rename to ext/fox16_c/include/FXRbSpinner.h
diff --git a/ext/fox16/include/FXRbSpinnerVirtuals.h b/ext/fox16_c/include/FXRbSpinnerVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbSpinnerVirtuals.h
rename to ext/fox16_c/include/FXRbSpinnerVirtuals.h
diff --git a/ext/fox16/include/FXRbSplashWindow.h b/ext/fox16_c/include/FXRbSplashWindow.h
similarity index 100%
rename from ext/fox16/include/FXRbSplashWindow.h
rename to ext/fox16_c/include/FXRbSplashWindow.h
diff --git a/ext/fox16/include/FXRbSplitter.h b/ext/fox16_c/include/FXRbSplitter.h
similarity index 100%
rename from ext/fox16/include/FXRbSplitter.h
rename to ext/fox16_c/include/FXRbSplitter.h
diff --git a/ext/fox16/include/FXRbSpring.h b/ext/fox16_c/include/FXRbSpring.h
similarity index 100%
rename from ext/fox16/include/FXRbSpring.h
rename to ext/fox16_c/include/FXRbSpring.h
diff --git a/ext/fox16/include/FXRbStatusBar.h b/ext/fox16_c/include/FXRbStatusBar.h
similarity index 100%
rename from ext/fox16/include/FXRbStatusBar.h
rename to ext/fox16_c/include/FXRbStatusBar.h
diff --git a/ext/fox16/include/FXRbStatusLine.h b/ext/fox16_c/include/FXRbStatusLine.h
similarity index 100%
rename from ext/fox16/include/FXRbStatusLine.h
rename to ext/fox16_c/include/FXRbStatusLine.h
diff --git a/ext/fox16/include/FXRbStream.h b/ext/fox16_c/include/FXRbStream.h
similarity index 100%
rename from ext/fox16/include/FXRbStream.h
rename to ext/fox16_c/include/FXRbStream.h
diff --git a/ext/fox16/include/FXRbStreamVirtuals.h b/ext/fox16_c/include/FXRbStreamVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbStreamVirtuals.h
rename to ext/fox16_c/include/FXRbStreamVirtuals.h
diff --git a/ext/fox16/include/FXRbStringDict.h b/ext/fox16_c/include/FXRbStringDict.h
similarity index 100%
rename from ext/fox16/include/FXRbStringDict.h
rename to ext/fox16_c/include/FXRbStringDict.h
diff --git a/ext/fox16/include/FXRbSwitcher.h b/ext/fox16_c/include/FXRbSwitcher.h
similarity index 100%
rename from ext/fox16/include/FXRbSwitcher.h
rename to ext/fox16_c/include/FXRbSwitcher.h
diff --git a/ext/fox16/include/FXRbTGAIcon.h b/ext/fox16_c/include/FXRbTGAIcon.h
similarity index 100%
rename from ext/fox16/include/FXRbTGAIcon.h
rename to ext/fox16_c/include/FXRbTGAIcon.h
diff --git a/ext/fox16/include/FXRbTGAImage.h b/ext/fox16_c/include/FXRbTGAImage.h
similarity index 100%
rename from ext/fox16/include/FXRbTGAImage.h
rename to ext/fox16_c/include/FXRbTGAImage.h
diff --git a/ext/fox16/include/FXRbTIFIcon.h b/ext/fox16_c/include/FXRbTIFIcon.h
similarity index 100%
rename from ext/fox16/include/FXRbTIFIcon.h
rename to ext/fox16_c/include/FXRbTIFIcon.h
diff --git a/ext/fox16/include/FXRbTIFImage.h b/ext/fox16_c/include/FXRbTIFImage.h
similarity index 100%
rename from ext/fox16/include/FXRbTIFImage.h
rename to ext/fox16_c/include/FXRbTIFImage.h
diff --git a/ext/fox16/include/FXRbTabBar.h b/ext/fox16_c/include/FXRbTabBar.h
similarity index 100%
rename from ext/fox16/include/FXRbTabBar.h
rename to ext/fox16_c/include/FXRbTabBar.h
diff --git a/ext/fox16/include/FXRbTabBarVirtuals.h b/ext/fox16_c/include/FXRbTabBarVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbTabBarVirtuals.h
rename to ext/fox16_c/include/FXRbTabBarVirtuals.h
diff --git a/ext/fox16/include/FXRbTabBook.h b/ext/fox16_c/include/FXRbTabBook.h
similarity index 100%
rename from ext/fox16/include/FXRbTabBook.h
rename to ext/fox16_c/include/FXRbTabBook.h
diff --git a/ext/fox16/include/FXRbTabItem.h b/ext/fox16_c/include/FXRbTabItem.h
similarity index 100%
rename from ext/fox16/include/FXRbTabItem.h
rename to ext/fox16_c/include/FXRbTabItem.h
diff --git a/ext/fox16/include/FXRbTable.h b/ext/fox16_c/include/FXRbTable.h
similarity index 100%
rename from ext/fox16/include/FXRbTable.h
rename to ext/fox16_c/include/FXRbTable.h
diff --git a/ext/fox16/include/FXRbTableItemVirtuals.h b/ext/fox16_c/include/FXRbTableItemVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbTableItemVirtuals.h
rename to ext/fox16_c/include/FXRbTableItemVirtuals.h
diff --git a/ext/fox16/include/FXRbTableVirtuals.h b/ext/fox16_c/include/FXRbTableVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbTableVirtuals.h
rename to ext/fox16_c/include/FXRbTableVirtuals.h
diff --git a/ext/fox16/include/FXRbText.h b/ext/fox16_c/include/FXRbText.h
similarity index 100%
rename from ext/fox16/include/FXRbText.h
rename to ext/fox16_c/include/FXRbText.h
diff --git a/ext/fox16/include/FXRbTextField.h b/ext/fox16_c/include/FXRbTextField.h
similarity index 100%
rename from ext/fox16/include/FXRbTextField.h
rename to ext/fox16_c/include/FXRbTextField.h
diff --git a/ext/fox16/include/FXRbTextVirtuals.h b/ext/fox16_c/include/FXRbTextVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbTextVirtuals.h
rename to ext/fox16_c/include/FXRbTextVirtuals.h
diff --git a/ext/fox16/include/FXRbToggleButton.h b/ext/fox16_c/include/FXRbToggleButton.h
similarity index 100%
rename from ext/fox16/include/FXRbToggleButton.h
rename to ext/fox16_c/include/FXRbToggleButton.h
diff --git a/ext/fox16/include/FXRbToolBar.h b/ext/fox16_c/include/FXRbToolBar.h
similarity index 100%
rename from ext/fox16/include/FXRbToolBar.h
rename to ext/fox16_c/include/FXRbToolBar.h
diff --git a/ext/fox16/include/FXRbToolBarGrip.h b/ext/fox16_c/include/FXRbToolBarGrip.h
similarity index 100%
rename from ext/fox16/include/FXRbToolBarGrip.h
rename to ext/fox16_c/include/FXRbToolBarGrip.h
diff --git a/ext/fox16/include/FXRbToolBarShell.h b/ext/fox16_c/include/FXRbToolBarShell.h
similarity index 100%
rename from ext/fox16/include/FXRbToolBarShell.h
rename to ext/fox16_c/include/FXRbToolBarShell.h
diff --git a/ext/fox16/include/FXRbToolBarTab.h b/ext/fox16_c/include/FXRbToolBarTab.h
similarity index 100%
rename from ext/fox16/include/FXRbToolBarTab.h
rename to ext/fox16_c/include/FXRbToolBarTab.h
diff --git a/ext/fox16/include/FXRbToolTip.h b/ext/fox16_c/include/FXRbToolTip.h
similarity index 100%
rename from ext/fox16/include/FXRbToolTip.h
rename to ext/fox16_c/include/FXRbToolTip.h
diff --git a/ext/fox16/include/FXRbTopWindow.h b/ext/fox16_c/include/FXRbTopWindow.h
similarity index 100%
rename from ext/fox16/include/FXRbTopWindow.h
rename to ext/fox16_c/include/FXRbTopWindow.h
diff --git a/ext/fox16/include/FXRbTopWindowVirtuals.h b/ext/fox16_c/include/FXRbTopWindowVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbTopWindowVirtuals.h
rename to ext/fox16_c/include/FXRbTopWindowVirtuals.h
diff --git a/ext/fox16/include/FXRbTranslator.h b/ext/fox16_c/include/FXRbTranslator.h
similarity index 100%
rename from ext/fox16/include/FXRbTranslator.h
rename to ext/fox16_c/include/FXRbTranslator.h
diff --git a/ext/fox16/include/FXRbTranslatorVirtuals.h b/ext/fox16_c/include/FXRbTranslatorVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbTranslatorVirtuals.h
rename to ext/fox16_c/include/FXRbTranslatorVirtuals.h
diff --git a/ext/fox16/include/FXRbTreeItemVirtuals.h b/ext/fox16_c/include/FXRbTreeItemVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbTreeItemVirtuals.h
rename to ext/fox16_c/include/FXRbTreeItemVirtuals.h
diff --git a/ext/fox16/include/FXRbTreeList.h b/ext/fox16_c/include/FXRbTreeList.h
similarity index 100%
rename from ext/fox16/include/FXRbTreeList.h
rename to ext/fox16_c/include/FXRbTreeList.h
diff --git a/ext/fox16/include/FXRbTreeListBox.h b/ext/fox16_c/include/FXRbTreeListBox.h
similarity index 100%
rename from ext/fox16/include/FXRbTreeListBox.h
rename to ext/fox16_c/include/FXRbTreeListBox.h
diff --git a/ext/fox16/include/FXRbTreeListBoxVirtuals.h b/ext/fox16_c/include/FXRbTreeListBoxVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbTreeListBoxVirtuals.h
rename to ext/fox16_c/include/FXRbTreeListBoxVirtuals.h
diff --git a/ext/fox16/include/FXRbTreeListVirtuals.h b/ext/fox16_c/include/FXRbTreeListVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbTreeListVirtuals.h
rename to ext/fox16_c/include/FXRbTreeListVirtuals.h
diff --git a/ext/fox16/include/FXRbTriStateButton.h b/ext/fox16_c/include/FXRbTriStateButton.h
similarity index 100%
rename from ext/fox16/include/FXRbTriStateButton.h
rename to ext/fox16_c/include/FXRbTriStateButton.h
diff --git a/ext/fox16/include/FXRbVerticalFrame.h b/ext/fox16_c/include/FXRbVerticalFrame.h
similarity index 100%
rename from ext/fox16/include/FXRbVerticalFrame.h
rename to ext/fox16_c/include/FXRbVerticalFrame.h
diff --git a/ext/fox16/include/FXRbVisual.h b/ext/fox16_c/include/FXRbVisual.h
similarity index 100%
rename from ext/fox16/include/FXRbVisual.h
rename to ext/fox16_c/include/FXRbVisual.h
diff --git a/ext/fox16/include/FXRbWindow.h b/ext/fox16_c/include/FXRbWindow.h
similarity index 100%
rename from ext/fox16/include/FXRbWindow.h
rename to ext/fox16_c/include/FXRbWindow.h
diff --git a/ext/fox16/include/FXRbWindowVirtuals.h b/ext/fox16_c/include/FXRbWindowVirtuals.h
similarity index 100%
rename from ext/fox16/include/FXRbWindowVirtuals.h
rename to ext/fox16_c/include/FXRbWindowVirtuals.h
diff --git a/ext/fox16/include/FXRbWizard.h b/ext/fox16_c/include/FXRbWizard.h
similarity index 100%
rename from ext/fox16/include/FXRbWizard.h
rename to ext/fox16_c/include/FXRbWizard.h
diff --git a/ext/fox16/include/FXRbXBMIcon.h b/ext/fox16_c/include/FXRbXBMIcon.h
similarity index 100%
rename from ext/fox16/include/FXRbXBMIcon.h
rename to ext/fox16_c/include/FXRbXBMIcon.h
diff --git a/ext/fox16/include/FXRbXBMImage.h b/ext/fox16_c/include/FXRbXBMImage.h
similarity index 100%
rename from ext/fox16/include/FXRbXBMImage.h
rename to ext/fox16_c/include/FXRbXBMImage.h
diff --git a/ext/fox16/include/FXRbXPMIcon.h b/ext/fox16_c/include/FXRbXPMIcon.h
similarity index 100%
rename from ext/fox16/include/FXRbXPMIcon.h
rename to ext/fox16_c/include/FXRbXPMIcon.h
diff --git a/ext/fox16/include/FXRbXPMImage.h b/ext/fox16_c/include/FXRbXPMImage.h
similarity index 100%
rename from ext/fox16/include/FXRbXPMImage.h
rename to ext/fox16_c/include/FXRbXPMImage.h
diff --git a/ext/fox16/include/FXRuby.h b/ext/fox16_c/include/FXRuby.h
similarity index 100%
rename from ext/fox16/include/FXRuby.h
rename to ext/fox16_c/include/FXRuby.h
diff --git a/ext/fox16/include/impl.h b/ext/fox16_c/include/impl.h
similarity index 100%
rename from ext/fox16/include/impl.h
rename to ext/fox16_c/include/impl.h
diff --git a/ext/fox16/make_impl.rb b/ext/fox16_c/make_impl.rb
similarity index 100%
rename from ext/fox16/make_impl.rb
rename to ext/fox16_c/make_impl.rb
diff --git a/ext/fox16/markfuncs.cpp b/ext/fox16_c/markfuncs.cpp
similarity index 100%
rename from ext/fox16/markfuncs.cpp
rename to ext/fox16_c/markfuncs.cpp
diff --git a/ext/fox16/unregisterOwnedObjects.cpp b/ext/fox16_c/unregisterOwnedObjects.cpp
similarity index 100%
rename from ext/fox16/unregisterOwnedObjects.cpp
rename to ext/fox16_c/unregisterOwnedObjects.cpp
diff --git a/lib/fox16.rb b/lib/fox16.rb
index 7c6808877a6cf963e9c1c0d5c04229582764a3b0..c27088176c5dbed27f0928ef6b3c0f551d0d3171 100644
--- a/lib/fox16.rb
+++ b/lib/fox16.rb
@@ -1,9 +1,9 @@
 if RUBY_PLATFORM =~ /(mswin|mingw)/i
-  require "#{RUBY_VERSION.sub(/\.\d+$/, '')}/fox16.so"
+  require "#{RUBY_VERSION.sub(/\.\d+$/, '')}/fox16_c.so"
 elsif RUBY_PLATFORM =~ /darwin/
-  require "fox16.bundle"
+  require "fox16_c.bundle"
 else
-  require "fox16.so"
+  require "fox16_c.so"
 end
 
 require "fox16/core"