-#define LC_SI 0.543105e-9 /* m */
-#define M_SI (28.085*AMU) /* kg */
-#define LJ_SIGMA_SI ((0.25*sqrt(3.0)*LC_SI)/1.122462) /* m */
-#define LJ_EPSILON_SI (2.1678*1.60e-19) /* Nm */
-
-#define TM_R_SI 2.7e-10 /* m */
-#define TM_S_SI 3.0e-10 /* m */
-#define TM_A_SI (1830.8*EV) /* Nm */
-#define TM_B_SI (471.18*EV) /* Nm */
-#define TM_LAMBDA_SI 2.4799e10 /* 1/m */
-#define TM_MU_SI 1.7322e10 /* 1/m */
+#define LC_SI (0.543105e-9*METER) /* A */
+#define M_SI 28.08553 /* amu */
+#define LJ_SIGMA_SI ((0.25*sqrt(3.0)*LC_SI)/1.122462) /* A */
+#define LJ_EPSILON_SI (2.1678*EV) /* NA */
+
+#define TM_R_SI (2.7e-10*METER) /* A */
+#define TM_S_SI (3.0e-10*METER) /* A */
+#define TM_A_SI (1830.8*EV) /* NA */
+#define TM_B_SI (471.18*EV) /* NA */
+#define TM_LAMBDA_SI (2.4799e10/METER) /* 1/A */
+#define TM_MU_SI (1.7322e10/METER) /* 1/A */