diff --git a/common/windows/delphi/ext/Makefile b/common/windows/delphi/ext/Makefile
index 58bffd95f0..722efc97a1 100644
--- a/common/windows/delphi/ext/Makefile
+++ b/common/windows/delphi/ext/Makefile
@@ -7,7 +7,7 @@ NOTARGET_SIGNCODE=yes
 !ifdef NODELPHI
 TARGETS=.virtual
 !else
-TARGETS=dcpcrypt #jedi scfontcombobox cef4delphi
+TARGETS=dcpcrypt #jedi cef4delphi
 !endif
 
 # jedi has no packages
@@ -30,10 +30,6 @@ jedi: .virtual
     cd $(COMMON_ROOT)\ext\jedi
     $(MAKE) $(TARGET)
 
-scfontcombobox: .virtual
-    cd $(COMMON_ROOT)\ext\scfontcombobox
-    $(MAKE) $(TARGET)
-
 #
 #
 #
diff --git a/developer/src/ext/Makefile b/developer/src/ext/Makefile
index c89c79c04f..c3b9206ce0 100644
--- a/developer/src/ext/Makefile
+++ b/developer/src/ext/Makefile
@@ -7,7 +7,7 @@ NOTARGET_SIGNCODE=yes
 !ifdef NODELPHI
 TARGETS=.virtual
 !else
-TARGETS=browse4folder mbcolor common
+TARGETS=browse4folder mbcolor scfontcombobox common
 !endif
 
 CLEANS=
@@ -24,6 +24,10 @@ mbcolor: .virtual
     cd $(DEVELOPER_ROOT)\src\ext\mbcolor
     $(MAKE) $(TARGET)
 
+scfontcombobox: .virtual
+    cd $(DEVELOPER_ROOT)\src\ext\scfontcombobox
+    $(MAKE) $(TARGET)
+
 # ----------------------------------------------------------------------
 
 common: .virtual
diff --git a/windows/src/ext/scfontcombobox/Makefile b/developer/src/ext/scfontcombobox/Makefile
similarity index 80%
rename from windows/src/ext/scfontcombobox/Makefile
rename to developer/src/ext/scfontcombobox/Makefile
index 84363bf38b..002a14408d 100644
--- a/windows/src/ext/scfontcombobox/Makefile
+++ b/developer/src/ext/scfontcombobox/Makefile
@@ -11,7 +11,7 @@ build: dirs
 
 install:
     $(DEVTOOLS) -ip $(OUTLIB)\scFontCombo.bpl
-    $(DEVTOOLS) -ai $(EXT)\scfontcombobox
+    $(DEVTOOLS) -ai $(DEVELOPER_ROOT)\src\ext\scfontcombobox
 
 clean: def-clean
 
diff --git a/windows/src/ext/scfontcombobox/TscFontcombobox_Readme.htm b/developer/src/ext/scfontcombobox/TscFontcombobox_Readme.htm
similarity index 100%
rename from windows/src/ext/scfontcombobox/TscFontcombobox_Readme.htm
rename to developer/src/ext/scfontcombobox/TscFontcombobox_Readme.htm
diff --git a/windows/src/ext/scfontcombobox/scFontCombo.dpk b/developer/src/ext/scfontcombobox/scFontCombo.dpk
similarity index 100%
rename from windows/src/ext/scfontcombobox/scFontCombo.dpk
rename to developer/src/ext/scfontcombobox/scFontCombo.dpk
diff --git a/windows/src/ext/scfontcombobox/scFontCombo.dproj b/developer/src/ext/scfontcombobox/scFontCombo.dproj
similarity index 100%
rename from windows/src/ext/scfontcombobox/scFontCombo.dproj
rename to developer/src/ext/scfontcombobox/scFontCombo.dproj
diff --git a/windows/src/ext/scfontcombobox/scFontCombo.res b/developer/src/ext/scfontcombobox/scFontCombo.res
similarity index 100%
rename from windows/src/ext/scfontcombobox/scFontCombo.res
rename to developer/src/ext/scfontcombobox/scFontCombo.res
diff --git a/windows/src/ext/scfontcombobox/scFontComboBox.dcr b/developer/src/ext/scfontcombobox/scFontComboBox.dcr
similarity index 100%
rename from windows/src/ext/scfontcombobox/scFontComboBox.dcr
rename to developer/src/ext/scfontcombobox/scFontComboBox.dcr
diff --git a/windows/src/ext/scfontcombobox/scFontComboBox.res b/developer/src/ext/scfontcombobox/scFontComboBox.res
similarity index 100%
rename from windows/src/ext/scfontcombobox/scFontComboBox.res
rename to developer/src/ext/scfontcombobox/scFontComboBox.res
diff --git a/windows/src/ext/scfontcombobox/scFontCombobox.dfm b/developer/src/ext/scfontcombobox/scFontCombobox.dfm
similarity index 100%
rename from windows/src/ext/scfontcombobox/scFontCombobox.dfm
rename to developer/src/ext/scfontcombobox/scFontCombobox.dfm
diff --git a/windows/src/ext/scfontcombobox/scFontCombobox.pas b/developer/src/ext/scfontcombobox/scFontCombobox.pas
similarity index 100%
rename from windows/src/ext/scfontcombobox/scFontCombobox.pas
rename to developer/src/ext/scfontcombobox/scFontCombobox.pas
diff --git a/windows/src/ext/Makefile b/windows/src/ext/Makefile
index 14cb92d5e6..b011ba798e 100644
--- a/windows/src/ext/Makefile
+++ b/windows/src/ext/Makefile
@@ -7,7 +7,7 @@ NOTARGET_SIGNCODE=yes
 !ifdef NODELPHI
 TARGETS=.virtual
 !else
-TARGETS=common jedi scfontcombobox cef4delphi
+TARGETS=common jedi cef4delphi
 !endif
 
 # jedi has no packages
@@ -36,10 +36,6 @@ vclzip: .virtual
     cd $(ROOT)\src\ext\vclzip
     $(MAKE) $(TARGET)
 
-scfontcombobox: .virtual
-    cd $(ROOT)\src\ext\scfontcombobox
-    $(MAKE) $(TARGET)
-
 #
 #
 #