diff -ruN rasmol-2.7.5-23Jul09-orig/src/Imakefile rasmol-2.7.5-23Jul09/src/Imakefile
--- rasmol-2.7.5-23Jul09-orig/src/Imakefile	2009-07-20 10:08:43.000000000 -0400
+++ rasmol-2.7.5-23Jul09/src/Imakefile	2010-04-16 16:12:52.000000000 -0400
@@ -101,6 +101,7 @@
 # USER DEFINITIONS
 #
 #  At this point, you may define the cpp macro PIXELDEPTH as 8, 16 or 32
+#define PIXELDEPTH 32
 
 #ifdef PIXELDEPTH
 #if PIXELDEPTH==8
@@ -276,7 +277,7 @@
 
 # RasMol's on-line help direcory
 #   e.g. /usr/local/lib/rasmol/rasmol.hlp
-RASMOLDIR = $(USRLIBDIR)/rasmol/
+RASMOLDIR = @PREFIX@/lib/rasmol/
 
 
 #ifndef USE_XFORMSLIB
@@ -375,7 +376,6 @@
 #ifndef NO_XFORMSLIB_BUILD
 $(XFORMSLIB_DIR):
 		(cd $(XFORMSLIB_TARBALLDIR);\
-		  wget $(XFORMSLIB_TARBALL_URL);\
 		  touch $(XFORMSLIB_TARBALL);\
 		  gunzip < $(XFORMSLIB_TARBALL) | tar xvf -)
 
@@ -385,44 +385,20 @@
 #endif
 
 #ifndef NO_CBFLIB_BUILD
-$(CBFLIB_DIR):
-		(cd $(CBFLIB_TARBALLDIR);\
-		  wget $(CBFLIB_TARBALL_URL);\
-		  touch $(CBFLIB_TARBALL);\
-		  gunzip < $(CBFLIB_TARBALL) | tar xvf -)
-		  
-$(CBFLIB_DIR)/lib/libcbf.a: $(CBFLIB_DIR)
+$(CBFLIB_DIR)/lib/libcbf.a:
 		(cd $(CBFLIB_DIR); make lib/libcbf.a)
 #endif
 
 #ifndef NO_CQRLIB_BUILD
-$(CQRLIB_DIR):
-		(cd $(CQRLIB_TARBALLDIR);\
-		  wget $(CQRLIB_TARBALL_URL);\
-		  touch $(CQRLIB_TARBALL);\
-		  gunzip < $(CQRLIB_TARBALL) | tar xvf -)
-		  
-$(CQRLIB_DIR)/cqrlib.c: $(CQRLIB_DIR)
+$(CQRLIB_DIR)/cqrlib.c:
 #endif
 
 #ifndef NO_CVECTOR_BUILD
-$(CVECTOR_DIR):
-		(cd $(CVECTOR_TARBALLDIR);\
-		  wget $(CVECTOR_TARBALL_URL);\
-		  touch $(CVECTOR_TARBALL);\
-		  gunzip < $(CVECTOR_TARBALL) | tar xvf -)
-		  
-$(CVECTOR_DIR)/CVector.c: $(CVECTOR_DIR)
+$(CVECTOR_DIR)/CVector.c:
 #endif
 
 #ifndef NO_NEARTREE_BUILD
-$(NEARTREE_DIR):
-		(cd $(NEARTREE_TARBALLDIR);\
-		  wget $(NEARTREE_TARBALL_URL);\
-	          touch $(NEARTREE_TARBALL);\
-		  gunzip < $(NEARTREE_TARBALL) | tar xvf -)
-		  
-$(NEARTREE_DIR)/CNearTree.c: $(NEARTREE_DIR)
+$(NEARTREE_DIR)/CNearTree.c:
 #endif		  
 
 $(OBJS):  $(EXTPKGDIR) $(CBFLIB_OBJDEP) \
diff -ruN rasmol-2.7.5-23Jul09-orig/src/rasmol.h rasmol-2.7.5-23Jul09/src/rasmol.h
--- rasmol-2.7.5-23Jul09-orig/src/rasmol.h	2009-07-20 10:08:43.000000000 -0400
+++ rasmol-2.7.5-23Jul09/src/rasmol.h	2010-04-16 16:12:52.000000000 -0400
@@ -78,6 +78,7 @@
 /* rasmol.h
  */
 
+#include <stdint.h>
 
 /*===========================*/
 /*  User Definable Options!  */
@@ -202,7 +203,7 @@
 
 typedef double Real;
 #ifndef APPLEMAC
-typedef unsigned char Byte;
+typedef uint8_t Byte;
 #endif
 
 #ifdef __STDC__
@@ -211,21 +212,18 @@
 typedef char Char;
 #endif
 
-#ifdef _LONGLONG
-typedef unsigned int Card;
-typedef int Long;
-#else
-typedef unsigned long Card;
+typedef uint32_t Card;
+/* Long has to be defined as long, instead of int32_t because of
+   multiple printf and scanf calls using %ld in the format. */
 typedef long Long;
-#endif
 
 #ifdef EIGHTBIT
-typedef unsigned char Pixel;
+typedef uint8_t Pixel;
 #else
 #ifdef THIRTYTWOBIT
-typedef Long Pixel;
+typedef int32_t Pixel;
 #else
-typedef short Pixel;
+typedef int16_t Pixel;
 #endif
 #endif
 
@@ -249,7 +247,6 @@
 #define ToUpper(x)   (islower((x))?toupper((x)):(x))
 #endif
 
-
 #if !defined(IBMPC) || defined(_WIN32)
 #ifdef APPLEMAC
 #define _fmalloc   NewPtrSys