diff -r 3172d5cc4c4f geoip/geoip.module
--- a/geoip/geoip.module	Mon Nov 14 10:22:14 2011 +0100
+++ b/geoip/geoip.module	Mon Nov 14 10:26:44 2011 +0100
@@ -110,7 +110,7 @@
 }
 
 /**
- * Singleton wrapper around geoip_open().
+ * Singleton wrapper around _geoip_open().
  */
 function geoip_instance() {
   $data_file = geoip_data_file();
@@ -120,7 +120,7 @@
 
   // geoip.inc is common to both database types
   _geoip_load_lib();
-  $instance = geoip_open($data_file, GEOIP_STANDARD);
+  $instance = _geoip_open($data_file, GEOIP_STANDARD);
 
   // conditionally load the geoipcity include file
   if ($instance->databaseType == GEOIP_CITY_EDITION_REV1) {
@@ -191,9 +191,9 @@
     return FALSE;
   }
 
-  $cc = geoip_country_code_by_addr($gi, $ip);
+  $cc = _geoip_country_code_by_addr($gi, $ip);
 
-  geoip_close($gi);
+  _geoip_close($gi);
 
   if (variable_get('geoip_debug', FALSE) && !empty($_GET['geoip_debug'])) {
     drupal_set_message(t('GeoIP reports country: %cc', array('%cc' => $cc)));
@@ -216,14 +216,14 @@
   }
   elseif ($gi->databaseType != GEOIP_CITY_EDITION_REV1) {
     // If not using a city database, there is nothing to do.
-    geoip_close($gi);
+    _geoip_close($gi);
     return FALSE;
   }
 
 
   $record = geoip_record_by_addr($gi, $ip);
 
-  geoip_close($gi);
+  _geoip_close($gi);
 
   if (variable_get('geoip_debug', FALSE) && !empty($_GET['geoip_debug'])) {
     drupal_set_message(t('GeoIP reports city: %city', array('%city' => $record->city)));
diff -r 3172d5cc4c4f geoip/lib/geoip.inc
--- a/geoip/lib/geoip.inc	Mon Nov 14 10:22:14 2011 +0100
+++ b/geoip/lib/geoip.inc	Mon Nov 14 10:26:44 2011 +0100
@@ -233,7 +233,7 @@
 "EU", "SA", "SA" );
     
 }
-function geoip_load_shared_mem ($file) {
+function _geoip_load_shared_mem ($file) {
 
   $fp = fopen($file, "rb");
   if (!$fp) {
@@ -334,7 +334,7 @@
   return $gi;
 }
 
-function geoip_open($filename, $flags) {
+function _geoip_open($filename, $flags) {
   $gi = new GeoIP;
   $gi->flags = $flags;
   if ($gi->flags & GEOIP_SHARED_MEMORY) {
@@ -351,7 +351,7 @@
   return $gi;
 }
 
-function geoip_close($gi) {
+function _geoip_close($gi) {
   if ($gi->flags & GEOIP_SHARED_MEMORY) {
     return true;
   }
@@ -359,43 +359,43 @@
   return fclose($gi->filehandle);
 }
 
-function geoip_country_id_by_name($gi, $name) {
+function _geoip_country_id_by_name($gi, $name) {
   $addr = gethostbyname($name);
   if (!$addr || $addr == $name) {
     return false;
   }
-  return geoip_country_id_by_addr($gi, $addr);
+  return _geoip_country_id_by_addr($gi, $addr);
 }
 
-function geoip_country_code_by_name($gi, $name) {
-  $country_id = geoip_country_id_by_name($gi,$name);
+function _geoip_country_code_by_name($gi, $name) {
+  $country_id = _geoip_country_id_by_name($gi,$name);
   if ($country_id !== false) {
         return $gi->GEOIP_COUNTRY_CODES[$country_id];
   }
   return false;
 }
 
-function geoip_country_name_by_name($gi, $name) {
-  $country_id = geoip_country_id_by_name($gi,$name);
+function _geoip_country_name_by_name($gi, $name) {
+  $country_id = _geoip_country_id_by_name($gi,$name);
   if ($country_id !== false) {
         return $gi->GEOIP_COUNTRY_NAMES[$country_id];
   }
   return false;
 }
 
-function geoip_country_id_by_addr($gi, $addr) {
+function _geoip_country_id_by_addr($gi, $addr) {
   $ipnum = ip2long($addr);
   return _geoip_seek_country($gi, $ipnum) - GEOIP_COUNTRY_BEGIN;
 }
 
-function geoip_country_code_by_addr($gi, $addr) {
+function _geoip_country_code_by_addr($gi, $addr) {
   if ($gi->databaseType == GEOIP_CITY_EDITION_REV1) {
     $record = geoip_record_by_addr($gi,$addr);
     if ( $record !== false ) {
       return $record->country_code;
     }
   } else {
-    $country_id = geoip_country_id_by_addr($gi,$addr);
+    $country_id = _geoip_country_id_by_addr($gi,$addr);
     if ($country_id !== false) {
       return $gi->GEOIP_COUNTRY_CODES[$country_id];
     }
@@ -403,12 +403,12 @@
   return false;
 }
 
-function geoip_country_name_by_addr($gi, $addr) {
+function _geoip_country_name_by_addr($gi, $addr) {
   if ($gi->databaseType == GEOIP_CITY_EDITION_REV1) {
     $record = geoip_record_by_addr($gi,$addr);
     return $record->country_name;
   } else {
-    $country_id = geoip_country_id_by_addr($gi,$addr);
+    $country_id = _geoip_country_id_by_addr($gi,$addr);
     if ($country_id !== false) {
       return $gi->GEOIP_COUNTRY_NAMES[$country_id];
     }
@@ -482,7 +482,7 @@
   return $org_buf;
 }
 
-function geoip_org_by_addr ($gi,$addr) {
+function _geoip_org_by_addr ($gi,$addr) {
   if ($addr == NULL) {
     return 0;
   }
@@ -521,7 +521,7 @@
   }
 }
 
-function geoip_region_by_addr ($gi,$addr) {
+function _geoip_region_by_addr ($gi,$addr) {
   if ($addr == NULL) {
     return 0;
   }