diff --git a/pokerth_lib.pro b/pokerth_lib.pro
index 164f6da8..0df05b54 100644
--- a/pokerth_lib.pro
+++ b/pokerth_lib.pro
@@ -179,7 +179,7 @@ SOURCES += \
 		src/net/common/sessiondata.cpp \
 		src/net/common/sessiondatacallback.cpp \
 		src/net/common/sessionmanager.cpp \
-		src/net/common/socket_startup_cmn.cpp \
+		src/net/common/socket_startup.cpp \
 		src/net/common/clientexception.cpp \
 		src/net/common/netcontext.cpp \
 		src/net/common/netexception.cpp \
diff --git a/src/net/common/socket_helper_cmn.cpp b/src/net/common/socket_helper_cmn.cpp
deleted file mode 100644
index e3035447..00000000
--- a/src/net/common/socket_helper_cmn.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2007 by Lothar May                                      *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-
-#include <net/socket_helper.h>
-#include <cstring>
-
-using namespace std;
-
-bool
-socket_set_port(unsigned port, int addrFamily, struct sockaddr *addr, int addrLen)
-{
-	bool retVal = false;
-
-	if (addr)
-	{
-		if (addrFamily == AF_INET && addrLen >= (int)sizeof(sockaddr_in))
-		{
-			((sockaddr_in *)addr)->sin_port = htons(port);
-			retVal = true;
-		}
-		else if (addrFamily == AF_INET6 && addrLen >= (int)sizeof(sockaddr_in6))
-		{
-			((sockaddr_in6 *)addr)->sin6_port = htons(port);
-			retVal = true;
-		}
-	}
-
-	return retVal;
-}
-
diff --git a/src/net/common/socket_startup_cmn.cpp b/src/net/common/socket_startup.cpp
similarity index 100%
rename from src/net/common/socket_startup_cmn.cpp
rename to src/net/common/socket_startup.cpp