diff --git a/headers/private/system/system_info.h b/headers/private/system/system_info.h
index fc8439287f..888c4423c8 100644
--- a/headers/private/system/system_info.h
+++ b/headers/private/system/system_info.h
@@ -63,11 +63,11 @@ extern "C" {
 #endif
 
 
-status_t get_system_info_etc(int32 id, void* buffer, size_t bufferSize);
+status_t __get_system_info_etc(int32 id, void* buffer, size_t bufferSize);
 
-status_t start_watching_system(int32 object, uint32 flags, port_id port,
+status_t __start_watching_system(int32 object, uint32 flags, port_id port,
 			int32 token);
-status_t stop_watching_system(int32 object, uint32 flags, port_id port,
+status_t __stop_watching_system(int32 object, uint32 flags, port_id port,
 			int32 token);
 
 
diff --git a/src/apps/activitymonitor/DataSource.cpp b/src/apps/activitymonitor/DataSource.cpp
index 3a6c6dd791..9fc9a5e2a6 100644
--- a/src/apps/activitymonitor/DataSource.cpp
+++ b/src/apps/activitymonitor/DataSource.cpp
@@ -498,7 +498,7 @@ int64
 BlockCacheDataSource::NextValue(SystemInfo& info)
 {
 	system_memory_info memoryInfo;
-	status_t status = get_system_info_etc(B_MEMORY_INFO, &memoryInfo,
+	status_t status = __get_system_info_etc(B_MEMORY_INFO, &memoryInfo,
 		sizeof(system_memory_info));
 	if (status != B_OK)
 		return 0;
@@ -946,7 +946,7 @@ CPUUsageDataSource::_SetCPU(int32 cpu)
 	if (SystemInfo().CPUCount() > 1)
 		fLabel << " " << cpu + 1;
 	fShortLabel = fLabel;
-	
+
 	fLabel << " " << B_TRANSLATE("usage");
 
 	const rgb_color kColors[B_MAX_CPU_COUNT] = {
@@ -1262,7 +1262,7 @@ NetworkUsageDataSource::Label() const
 const char*
 NetworkUsageDataSource::ShortLabel() const
 {
-	return fIn ? B_TRANSLATE_COMMENT("RX", "Shorter version for Receiving.") : 
+	return fIn ? B_TRANSLATE_COMMENT("RX", "Shorter version for Receiving.") :
 		B_TRANSLATE_COMMENT("TX", "Shorter version for Sending");
 }
 
diff --git a/src/apps/activitymonitor/SystemInfo.cpp b/src/apps/activitymonitor/SystemInfo.cpp
index 66c679b5d5..423c2bd72d 100644
--- a/src/apps/activitymonitor/SystemInfo.cpp
+++ b/src/apps/activitymonitor/SystemInfo.cpp
@@ -24,7 +24,7 @@ SystemInfo::SystemInfo(SystemInfoHandler* handler)
 	fMediaBuffers(0)
 {
 	get_system_info(&fSystemInfo);
-	get_system_info_etc(B_MEMORY_INFO, &fMemoryInfo,
+	__get_system_info_etc(B_MEMORY_INFO, &fMemoryInfo,
 		sizeof(system_memory_info));
 
 	if (handler != NULL) {
diff --git a/src/apps/debugger/debugger_interface/DebuggerInterface.cpp b/src/apps/debugger/debugger_interface/DebuggerInterface.cpp
index 444909a050..c98ca870d0 100644
--- a/src/apps/debugger/debugger_interface/DebuggerInterface.cpp
+++ b/src/apps/debugger/debugger_interface/DebuggerInterface.cpp
@@ -276,7 +276,7 @@ DebuggerInterface::Init()
 	if (fNubPort < 0)
 		return fNubPort;
 
-	error = start_watching_system(fTeamID, B_WATCH_SYSTEM_THREAD_PROPERTIES,
+	error = __start_watching_system(fTeamID, B_WATCH_SYSTEM_THREAD_PROPERTIES,
 		fDebuggerPort, 0);
 	if (error != B_OK)
 		return error;
diff --git a/src/bin/vmstat.cpp b/src/bin/vmstat.cpp
index 8575cf8c97..ed2dee580f 100644
--- a/src/bin/vmstat.cpp
+++ b/src/bin/vmstat.cpp
@@ -67,7 +67,7 @@ main(int argc, char** argv)
 		}
 	}
 	system_memory_info info;
-	status_t status = get_system_info_etc(B_MEMORY_INFO, &info,
+	status_t status = __get_system_info_etc(B_MEMORY_INFO, &info,
 		sizeof(system_memory_info));
 	if (status != B_OK) {
 		fprintf(stderr, "%s: cannot get system info: %s\n", kProgramName,
@@ -90,7 +90,7 @@ main(int argc, char** argv)
 		while (true) {
 			snooze(rate);
 
-			get_system_info_etc(B_MEMORY_INFO, &info,
+			__get_system_info_etc(B_MEMORY_INFO, &info,
 				sizeof(system_memory_info));
 
 			printf("%11ld  %11Ld  %11Ld  %11Ld\n",
diff --git a/src/system/libroot/os/system_info.c b/src/system/libroot/os/system_info.c
index 4c74efd2fe..0392337fda 100644
--- a/src/system/libroot/os/system_info.c
+++ b/src/system/libroot/os/system_info.c
@@ -21,7 +21,7 @@ _get_system_info(system_info *info, size_t size)
 
 
 status_t
-get_system_info_etc(int32 id, void *info, size_t size)
+__get_system_info_etc(int32 id, void *info, size_t size)
 {
 	if (info == NULL || size == 0 || id < 0)
 		return B_BAD_VALUE;
@@ -31,14 +31,14 @@ get_system_info_etc(int32 id, void *info, size_t size)
 
 
 status_t
-start_watching_system(int32 object, uint32 flags, port_id port, int32 token)
+__start_watching_system(int32 object, uint32 flags, port_id port, int32 token)
 {
 	return _kern_start_watching_system(object, flags, port, token);
 }
 
 
 status_t
-stop_watching_system(int32 object, uint32 flags, port_id port, int32 token)
+__stop_watching_system(int32 object, uint32 flags, port_id port, int32 token)
 {
 	return _kern_stop_watching_system(object, flags, port, token);
 }
diff --git a/src/tests/system/libroot/os/system_watching_test.cpp b/src/tests/system/libroot/os/system_watching_test.cpp
index c1dbb90588..59f0f3fe41 100644
--- a/src/tests/system/libroot/os/system_watching_test.cpp
+++ b/src/tests/system/libroot/os/system_watching_test.cpp
@@ -97,7 +97,7 @@ main(int argc, const char* const* argv)
 	}
 
 	// start watching
-	status_t error = start_watching_system(watchTeam, watchEvents, port, 0);
+	status_t error = __start_watching_system(watchTeam, watchEvents, port, 0);
 	if (error != B_OK) {
 		fprintf(stderr, "Failed to start watching: %s\n", strerror(error));
 		exit(1);