diff --git a/includes/ClamAVDaemonScanner.php b/includes/ClamAVDaemonScanner.php
index 616fb4c..2ba4c87 100644
--- a/includes/ClamAVDaemonScanner.php
+++ b/includes/ClamAVDaemonScanner.php
@@ -6,26 +6,6 @@
  */
 
 /**
- * Denotes that no virus has been found in a file.
- */
-define('ANTIVIRUS_CLAMAVDAEMON_SCAN_OK', 0x0);
-
-/**
- * Denotes that a virus has been found in a file.
- */
-define('ANTIVIRUS_CLAMAVDAEMON_SCAN_FOUND', 0x1);
-
-/**
- * Denotes that an error was found while scanning a file.
- */
-define('ANTIVIRUS_CLAMAVDAEMON_SCAN_ERROR', 0x2);
-
-/**
- * Denotes that the scan could not be completed.
- */
-define('ANTIVIRUS_CLAMAVDAEMON_SCAN_UNCHECKED', 0x3);
-
-/**
  * Defines the default host for clamd.
  */
 define('ANTIVIRUS_CLAMAVDAEMON_DEFAULT_HOST', 'localhost');
@@ -101,7 +81,7 @@ class ClamAVDaemonScanner extends AntivirusDaemonScanner {
     if (!$handler) {
       watchdog('antivirus', 'The clamav module can not connect to the ClamAV Daemon. The uploaded file %file could not be scanned. The daemon reported the error code: %code with the message %message', array('%file' => $file, '%code' => $errno, '%message' => $errstr), WATCHDOG_WARNING);
 
-      return ANTIVIRUS_CLAMAVDAEMON_SCAN_UNCHECKED;
+      return ANTIVIRUS_SCAN_ERROR;
     }
 
     // Request a scan from the daemon.
@@ -130,7 +110,7 @@ class ClamAVDaemonScanner extends AntivirusDaemonScanner {
     else {
       watchdog('antivirus', 'Uploaded file %file could not be scanned: failed to open file handle.', array('%file' => $file), WATCHDOG_WARNING);
 
-      return ANTIVIRUS_CLAMAVDAEMON_SCAN_UNCHECKED;
+      return ANTIVIRUS_SCAN_ERROR;
     }
 
     // The clamd daemon returns a string response in the format:
@@ -143,13 +123,13 @@ class ClamAVDaemonScanner extends AntivirusDaemonScanner {
         watchdog('antivirus', 'File %file scanned by ClamAV Daemon and found clean.', array('%file' => $file), WATCHDOG_INFO);
       }
 
-      return ANTIVIRUS_CLAMAVDAEMON_SCAN_OK;
+      return ANTIVIRUS_SCAN_OK;
     }
     elseif (preg_match('/^stream: (.*) FOUND$/', $response, $matches)) {
       $virus_name = $matches[1];
       watchdog('antivirus', 'Virus detected in uploaded file %file. ClamAV Daemon reported the virus:<br/>@virus_name', array('%file' => $file, '@virus_name' => $virus_name), WATCHDOG_CRITICAL);
 
-      return ANTIVIRUS_CLAMAVDAEMON_SCAN_FOUND;
+      return ANTIVIRUS_SCAN_FOUND;
     }
     else {
       // Try to extract the error message from the response.
@@ -157,7 +137,7 @@ class ClamAVDaemonScanner extends AntivirusDaemonScanner {
       $error_string = $matches[1]; // the error message given by the daemon
       watchdog('antivirus', 'Uploaded file %file could not be scanned. ClamAV Daemon reported:<br/>@error_string', array('%file' => $file, '@error_string' => $error_string), WATCHDOG_WARNING);
 
-      return ANTIVIRUS_CLAMAVDAEMON_SCAN_UNCHECKED;
+      return ANTIVIRUS_SCAN_ERROR;
     }
   }
 
diff --git a/includes/ClamAVScanner.php b/includes/ClamAVScanner.php
index fc267f9..d50323b 100644
--- a/includes/ClamAVScanner.php
+++ b/includes/ClamAVScanner.php
@@ -6,21 +6,6 @@
  */
 
 /**
- * Denotes that no virus has been found in a file.
- */
-define('ANTIVIRUS_CLAMAV_SCAN_OK', 0x0);
-
-/**
- * Denotes that a virus has been found in a file.
- */
-define('ANTIVIRUS_CLAMAV_SCAN_FOUND', 0x1);
-
-/**
- * Denotes that an error was found while scanning a file.
- */
-define('ANTIVIRUS_CLAMAV_SCAN_ERROR', 0x2);
-
-/**
  * Implements the Clam AntiVirus scanner.
  *
  * @ingroup antivirus_scanners
@@ -92,15 +77,15 @@ class ClamAVScanner extends AntivirusExecutableScanner {
     }
 
     switch ($ret) {
-      case ANTIVIRUS_CLAMAV_SCAN_OK:
+      case ANTIVIRUS_SCAN_OK:
         drupal_set_message(t('No viruses found in %file.', array('%file' => $file)));
         return ANTIVIRUS_SCAN_OK;
 
-      case ANTIVIRUS_CLAMAV_SCAN_FOUND:
+      case ANTIVIRUS_SCAN_FOUND:
         drupal_set_message(t('Virus found in %file.', array('%file' => $file), 'warning'));
         return ANTIVIRUS_SCAN_FOUND;
 
-      case ANTIVIRUS_CLAMAV_SCAN_ERROR:
+      case ANTIVIRUS_SCAN_ERROR:
         drupal_set_message(t('An error occurred while scanning %file.', array('%file' => $file)), 'error');
         return ANTIVIRUS_SCAN_ERROR;
     }