diff --git a/panda/src/pnmimage/ppmcmap.cxx b/panda/src/pnmimage/ppmcmap.cxx
index 071a40585c..c061bfbde5 100644
--- a/panda/src/pnmimage/ppmcmap.cxx
+++ b/panda/src/pnmimage/ppmcmap.cxx
@@ -83,7 +83,7 @@ ppm_computecolorhash(pixel** pixels,
                      int* colorsP)
     {
     colorhash_table cht;
-    register pixel* pP;
+    pixel* pP;
     colorhist_list chl;
     int col, row, hash;
 
@@ -141,8 +141,8 @@ ppm_addtocolorhash(colorhash_table cht,
                    pixel* colorP,
                    int value)
     {
-    register int hash;
-    register colorhist_list chl;
+    int hash;
+    colorhist_list chl;
 
     chl = (colorhist_list) malloc( sizeof(struct colorhist_list_item) );
     if ( chl == 0 )
diff --git a/pandatool/src/dxf/dxfFile.cxx b/pandatool/src/dxf/dxfFile.cxx
index 93a49dd8ef..aadf9d2879 100644
--- a/pandatool/src/dxf/dxfFile.cxx
+++ b/pandatool/src/dxf/dxfFile.cxx
@@ -585,20 +585,20 @@ get_group() {
       change_state(ST_error);
       return false;
     }
-    
+
     // Now skip past exactly one newline character and any number of
     // other whitespace characters.
-    while (in!=0 && in.peek() != '\n') {
+    while (in && in.peek() != '\n') {
       in.get();
     }
     in.get();
-    while (in!=0 && isspace(in.peek()) && in.peek() != '\n') {
+    while (in && isspace(in.peek()) && in.peek() != '\n') {
       in.get();
     }
 
     getline(in, _string);
     _string = trim_right(_string);
-    
+
     if (!in) {
       change_state(ST_error);
       return false;