diff --git a/panda/src/tiff/tif_aux.cxx b/panda/src/tiff/tif_aux.cxx
index 9a934f08b9..75ee72c332 100644
--- a/panda/src/tiff/tif_aux.cxx
+++ b/panda/src/tiff/tif_aux.cxx
@@ -29,8 +29,8 @@
  *
  * Auxiliary Support Routines.
  */
-#include "tiffiop.h"
 #include "cmath.h"
+#include "tiffiop.h"
 
 #ifdef COLORIMETRY_SUPPORT
 #include <math.h>
diff --git a/panda/src/tiff/tiffcomp.h b/panda/src/tiff/tiffcomp.h
index 1babb23d10..7ea865d316 100644
--- a/panda/src/tiff/tiffcomp.h
+++ b/panda/src/tiff/tiffcomp.h
@@ -149,7 +149,9 @@ typedef double dblparam_t;
 #define INLINE  inline
 #endif
 #else /* !__GNUC__ */
-#define INLINE
+#ifndef INLINE
+#define INLINE 
+#endif
 #endif
 
 /*