5 files changed, 30 insertions, 29 deletions
diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom
index 75edf488b..721ae8495 100644
--- a/src/Makefile.Watcom
+++ b/src/Makefile.Watcom
@@ -114,7 +114,7 @@ LINK_ARG = $(OBJ_DIR)$(DS)wlink.arg
 !endif
 # For now we still define the CURLX_ONES sources here unless we know how
 # to split off the prefixed path.
-CURLX_SOURCES = rawstr.c nonblock.c
+CURLX_SOURCES = curl_rawstr.c curl_nonblock.c
 
 OBJS = $(CURL_CFILES:.c=.obj)
 !ifdef %curl_static
diff --git a/src/Makefile.inc b/src/Makefile.inc
index 7ce30f0b6..4e1d4271f 100644
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -9,10 +9,11 @@
 
 # libcurl has sources that provide functions named curlx_* that aren't part of
 # the official API, but we re-use the code here to avoid duplication.
-CURLX_ONES = $(top_srcdir)/lib/strtoofft.c \
-	$(top_srcdir)/lib/strdup.c \
-	$(top_srcdir)/lib/rawstr.c \
-	$(top_srcdir)/lib/nonblock.c
+CURLX_ONES = \
+	$(top_srcdir)/lib/curl_nonblock.c \
+	$(top_srcdir)/lib/curl_rawstr.c \
+	$(top_srcdir)/lib/curl_strdup.c \
+	$(top_srcdir)/lib/curl_strtoofft.c
 
 CURL_CFILES = \
 	tool_binmode.c \
diff --git a/src/Makefile.vc6 b/src/Makefile.vc6
index 073b20d6a..415eec3c1 100644
--- a/src/Makefile.vc6
+++ b/src/Makefile.vc6
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1999 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1999 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -134,9 +134,9 @@ CFLAGS = $(CFLAGS) /DUSE_WINDOWS_SSPI /I$(WINDOWS_SDK_PATH)\include
 !ENDIF
 
 RELEASE_OBJS= \
-	nonblockr.obj \
-	rawstrr.obj \
-	strtoofftr.obj \
+	curl_nonblockr.obj \
+	curl_rawstrr.obj \
+	curl_strtoofftr.obj \
 	tool_binmoder.obj \
 	tool_bnamer.obj \
 	tool_cb_dbgr.obj \
@@ -178,9 +178,9 @@ RELEASE_OBJS= \
 	curlr.res
 
 DEBUG_OBJS= \
-	nonblockd.obj \
-	rawstrd.obj \
-	strtoofftd.obj \
+	curl_nonblockd.obj \
+	curl_rawstrd.obj \
+	curl_strtoofftd.obj \
 	tool_binmoded.obj \
 	tool_bnamed.obj \
 	tool_cb_dbgd.obj \
@@ -341,12 +341,12 @@ debug: $(DEBUG_OBJS)
         $(MANIFESTTOOL)
 
 ## Release
-nonblockr.obj: ../lib/nonblock.c
-	$(CCR) $(CFLAGS) /Fo"$@" ../lib/nonblock.c
-rawstrr.obj: ../lib/rawstr.c
-	$(CCR) $(CFLAGS) /Fo"$@" ../lib/rawstr.c
-strtoofftr.obj: ../lib/strtoofft.c
-	$(CCR) $(CFLAGS) /Fo"$@" ../lib/strtoofft.c
+curl_nonblockr.obj: ../lib/curl_nonblock.c
+	$(CCR) $(CFLAGS) /Fo"$@" ../lib/curl_nonblock.c
+curl_rawstrr.obj: ../lib/curl_rawstr.c
+	$(CCR) $(CFLAGS) /Fo"$@" ../lib/curl_rawstr.c
+curl_strtoofftr.obj: ../lib/curl_strtoofft.c
+	$(CCR) $(CFLAGS) /Fo"$@" ../lib/curl_strtoofft.c
 tool_binmoder.obj: tool_binmode.c
 	$(CCR) $(CFLAGS) /Fo"$@" tool_binmode.c
 tool_bnamer.obj: tool_bname.c
@@ -427,12 +427,12 @@ curlr.res : curl.rc
 	$(RCR) $(RESFLAGS) /Fo"$@" curl.rc
 
 ## Debug
-nonblockd.obj: ../lib/nonblock.c
-	$(CCD) $(CFLAGS) /Fo"$@" ../lib/nonblock.c
-rawstrd.obj: ../lib/rawstr.c
-	$(CCD) $(CFLAGS) /Fo"$@" ../lib/rawstr.c
-strtoofftd.obj: ../lib/strtoofft.c
-	$(CCD) $(CFLAGS) /Fo"$@" ../lib/strtoofft.c
+curl_nonblockd.obj: ../lib/curl_nonblock.c
+	$(CCD) $(CFLAGS) /Fo"$@" ../lib/curl_nonblock.c
+curl_rawstrd.obj: ../lib/curl_rawstr.c
+	$(CCD) $(CFLAGS) /Fo"$@" ../lib/curl_rawstr.c
+curl_strtoofftd.obj: ../lib/curl_strtoofft.c
+	$(CCD) $(CFLAGS) /Fo"$@" ../lib/curl_strtoofft.c
 tool_binmoded.obj: tool_binmode.c
 	$(CCD) $(CFLAGS) /Fo"$@" tool_binmode.c
 tool_bnamed.obj: tool_bname.c
diff --git a/src/tool_operate.c b/src/tool_operate.c
index aa488899e..1f03f0726 100644
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -849,7 +849,7 @@ int operate(struct Configurable *config, int argc, argv_item_t argv[])
         input.fd = infd;
         input.config = config;
         /* Note that if CURLOPT_READFUNCTION is fread (the default), then
-         * lib/telnet.c will Curl_poll() on the input file descriptor
+         * lib/curl_telnet.c will Curl_poll() on the input file descriptor
          * rather then calling the READFUNCTION at regular intervals.
          * The circumstances in which it is preferable to enable this
          * behaviour, by omitting to set the READFUNCTION & READDATA options,
diff --git a/src/vc6curlsrc.dsp b/src/vc6curlsrc.dsp
index cc0e8c3b6..7bd3ff011 100644
--- a/src/vc6curlsrc.dsp
+++ b/src/vc6curlsrc.dsp
@@ -139,15 +139,15 @@ LINK32=link.exe
 # PROP Default_Filter ""
 # Begin Source File
 
-SOURCE=..\lib\nonblock.c
+SOURCE=..\lib\curl_nonblock.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\lib\rawstr.c
+SOURCE=..\lib\curl_rawstr.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\lib\strtoofft.c
+SOURCE=..\lib\curl_strtoofft.c
 # End Source File
 # Begin Source File