diff --git a/src/common/makefile.mak b/src/common/makefile.mak
index edd2b905..e6935a8b 100644
--- a/src/common/makefile.mak
+++ b/src/common/makefile.mak
@@ -1,5 +1,32 @@
 include "..\makeinc.mak"
 
+COMMON_OBJECTS = \
+cfgfiles.obj \
+chanopt.obj \
+ctcp.obj \
+dcc.obj \
+history.obj \
+ignore.obj \
+inbound.obj \
+modes.obj \
+network.obj \
+notify.obj \
+outbound.obj \
+plugin.obj \
+plugin-timer.obj \
+portable.obj \
+proto-irc.obj \
+server.obj \
+servlist.obj \
+ssl.obj \
+text.obj \
+thread.obj \
+tree.obj \
+url.obj \
+userlist.obj \
+util.obj \
+xchat.obj
+
 all: $(COMMON_OBJECTS) xchatcommon.lib
 
 xchatcommon.lib: $(COMMON_OBJECTS)
diff --git a/src/fe-gtk/makefile.mak b/src/fe-gtk/makefile.mak
index 883fb5ef..39a8eabd 100644
--- a/src/fe-gtk/makefile.mak
+++ b/src/fe-gtk/makefile.mak
@@ -1,5 +1,36 @@
 include "..\makeinc.mak"
 
+FEGTK_OBJECTS = \
+about.obj \
+ascii.obj \
+banlist.obj \
+chanlist.obj \
+chanview.obj \
+custom-list.obj \
+dccgui.obj \
+editlist.obj \
+fe-gtk.obj \
+fkeys.obj \
+gtkutil.obj \
+ignoregui.obj \
+joind.obj \
+maingui.obj \
+menu.obj \
+notifygui.obj \
+palette.obj \
+pixmaps.obj \
+plugingui.obj \
+plugin-tray.obj \
+rawlog.obj \
+search.obj \
+servlistgui.obj \
+setup.obj \
+sexy-spell-entry.obj \
+textgui.obj \
+urlgrab.obj \
+userlistgui.obj \
+xtext.obj
+
 !ifdef X64
 MACHINE_FLAG = /MACHINE:X64
 !else
diff --git a/src/makeinc.skel b/src/makeinc.skel
index 8c1e67c4..3ad4998a 100644
--- a/src/makeinc.skel
+++ b/src/makeinc.skel
@@ -45,61 +45,3 @@ PYTHONOUTPUT = xcpython.dll
 
 TCLLIB = tcl85
 TCLOUTPUT = xctcl.dll
-
-COMMON_OBJECTS = \
-cfgfiles.obj \
-chanopt.obj \
-ctcp.obj \
-dcc.obj \
-history.obj \
-ignore.obj \
-inbound.obj \
-modes.obj \
-network.obj \
-notify.obj \
-outbound.obj \
-plugin.obj \
-plugin-timer.obj \
-portable.obj \
-proto-irc.obj \
-server.obj \
-servlist.obj \
-ssl.obj \
-text.obj \
-thread.obj \
-tree.obj \
-url.obj \
-userlist.obj \
-util.obj \
-xchat.obj
-
-FEGTK_OBJECTS = \
-about.obj \
-ascii.obj \
-banlist.obj \
-chanlist.obj \
-chanview.obj \
-custom-list.obj \
-dccgui.obj \
-editlist.obj \
-fe-gtk.obj \
-fkeys.obj \
-gtkutil.obj \
-ignoregui.obj \
-joind.obj \
-maingui.obj \
-menu.obj \
-notifygui.obj \
-palette.obj \
-pixmaps.obj \
-plugingui.obj \
-plugin-tray.obj \
-rawlog.obj \
-search.obj \
-servlistgui.obj \
-setup.obj \
-sexy-spell-entry.obj \
-textgui.obj \
-urlgrab.obj \
-userlistgui.obj \
-xtext.obj