diff --git a/include/ncdap.h b/include/ncdap.h
index 735d818101..27dd3450de 100644
--- a/include/ncdap.h
+++ b/include/ncdap.h
@@ -17,9 +17,9 @@ affect the operation of the system.
 */
 
 typedef unsigned int NCFLAGS;
-#  define SETFLAG(controls,flag) (((controls).flags) |= (flag))
-#  define CLRFLAG(controls,flag) (((controls).flags) &= ~(flag))
-#  define FLAGSET(controls,flag) (((controls.flags) & (flag)) != 0)
+#define SETFLAG(controls,flag) (((controls).flags) |= (NCFLAGS)(flag))
+#define CLRFLAG(controls,flag) (((controls).flags) &= ~(NCFLAGS)(flag))
+#define FLAGSET(controls,flag) ((((controls).flags) & (NCFLAGS)(flag)) != 0)
 
 /* Defined flags */
 #define NCF_NC3             (0x0001) /* DAP->netcdf-3 */
diff --git a/libdap4/ncd4types.h b/libdap4/ncd4types.h
index 1a7686ee65..995ed56f61 100644
--- a/libdap4/ncd4types.h
+++ b/libdap4/ncd4types.h
@@ -13,6 +13,7 @@ are defined here.
 
 #undef COMPILEBYDEFAULT
 
+#include "ncdap.h"
 #include "ncrc.h"
 #include "ncauth.h"