diff --git a/src/MS/Makefile b/src/MS/Makefile
index 1fafa54..cd2fe2a 100644
--- a/src/MS/Makefile
+++ b/src/MS/Makefile
@@ -1,8 +1,10 @@
 OUTPUT=
 CXX=g++
-CXXFLAGS=-O3 -Wall -g #-pg #-fnostack-protector
-CASA_LIBDIR=-L/cm/shared/package/casacore/v2.1.0-gcc-4.9.3/lib -L/cm/shared/package/cfitsio/3380-gcc-4.9.3/lib -L/cm/shared/package/lapack/3.6.0-gcc-4.9.3/lib64
-CASA_INCDIR=-I/cm/shared/package/casacore/v2.1.0-g++-4.9.3/include -I/cm/shared/package/casacore/v2.1.0-g++-4.9.3/include/casacore
+# CXXFLAGS=-O3 -Wall -g -pg -std=c++11 #-pg #-fnostack-protector
+# Extra arguments for making callgraphs.
+CXXFLAGS=-O3 -Wall -g -pg -std=c++11 -ansi -fPIC -fpermissive -fno-omit-frame-pointer -DNDEBUG -fno-inline-functions -fno-inline-functions-called-once -fno-optimize-sibling-calls
+CASA_LIBDIR=-L/cm/shared/package/casacore/v2.3.0-gcc-4.9.3/lib -L/cm/shared/package/cfitsio/3380-gcc-4.9.3/lib -L/cm/shared/package/lapack/3.6.0-gcc-4.9.3/lib64
+CASA_INCDIR=-I/cm/shared/package/casacore/v2.3.0-gcc-4.9.3/include -I/cm/shared/package/casacore/v2.3.0-gcc-4.9.3/include/casacore
 CASA_LIBS=-lcasa_casa -lcasa_tables -lcasa_measures -lcasa_ms -lcfitsio
 #LAPACK=-llapack -lblas
 LAPACK=-lopenblas -lgfortran -lpthread
diff --git a/src/MS/main.cpp b/src/MS/main.cpp
index 05bb0a0..680a50d 100644
--- a/src/MS/main.cpp
+++ b/src/MS/main.cpp
@@ -23,6 +23,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <pthread.h>
+#include <casacore/casa/Quanta/Quantum.h>
 
 #include "cuda_profiler_api.h"
 
diff --git a/src/lib/Dirac/Makefile b/src/lib/Dirac/Makefile
index e88b1eb..350dfe9 100644
--- a/src/lib/Dirac/Makefile
+++ b/src/lib/Dirac/Makefile
@@ -1,7 +1,9 @@
 CC=gcc
 CXX=g++
-#CFLAGS= -Wall -O3 -g #-pg
-CFLAGS= -Wall -O3 -fopt-info-optimized
+CFLAGS= -Wall -g -pg
+# Extra args for making callgraphs.
+# CFLAGS= -Wall -pg -O2 -ansi -fPIC -fpermissive -fno-omit-frame-pointer -DNDEBUG -fno-inline-functions -fno-inline-functions-called-once -fno-optimize-sibling-calls
+# CFLAGS= -Wall -O3 -fopt-info-optimized
 CLIBS= -lm -lpthread
 #LAPACK=-L/usr/lib/atlas/sse -llapack -lblas
 #LAPACK=-L/usr/local/GotoBLAS2/lib -lgoto2 -lpthread -lgfortran
diff --git a/src/lib/Radio/Makefile b/src/lib/Radio/Makefile
index 3bbe6fe..06f3214 100644
--- a/src/lib/Radio/Makefile
+++ b/src/lib/Radio/Makefile
@@ -1,7 +1,9 @@
 CC=gcc
 CXX=g++
-#CFLAGS= -Wall -O3 -g #-pg
-CFLAGS= -Wall -O3 -fopt-info-optimized
+CFLAGS= -Wall -g -pg
+# Extra args for making callgraphs.
+# CFLAGS= -Wall -pg -O2 -ansi -fPIC -fpermissive -fno-omit-frame-pointer -DNDEBUG -fno-inline-functions -fno-inline-functions-called-once -fno-optimize-sibling-calls
+# CFLAGS= -Wall -O3 -fopt-info-optimized
 CLIBS= -lm -lpthread
 #LAPACK=-L/usr/lib/atlas/sse -llapack -lblas
 #LAPACK=-L/usr/local/GotoBLAS2/lib -lgoto2 -lpthread -lgfortran