diff --git a/include/petscdraw.h b/include/petscdraw.h
index 3fac022..18e5d67 100644
--- a/include/petscdraw.h
+++ b/include/petscdraw.h
@@ -312,15 +312,6 @@ PETSC_EXTERN PetscErrorCode PetscDrawBarSetFromOptions(PetscDrawBar);
 PETSC_EXTERN PetscErrorCode PetscDrawBarGetAxis(PetscDrawBar,PetscDrawAxis*);
 PETSC_EXTERN PetscErrorCode PetscDrawBarGetDraw(PetscDrawBar,PetscDraw*);
 
-/*
-    PetscViewer routines that allow you to access underlying PetscDraw objects
-*/
-PETSC_EXTERN PetscErrorCode PetscViewerDrawGetDraw(PetscViewer,PetscInt,PetscDraw*);
-PETSC_EXTERN PetscErrorCode PetscViewerDrawBaseAdd(PetscViewer,PetscInt);
-PETSC_EXTERN PetscErrorCode PetscViewerDrawBaseSet(PetscViewer,PetscInt);
-PETSC_EXTERN PetscErrorCode PetscViewerDrawGetDrawLG(PetscViewer,PetscInt,PetscDrawLG*);
-PETSC_EXTERN PetscErrorCode PetscViewerDrawGetDrawAxis(PetscViewer,PetscInt,PetscDrawAxis*);
-
 PETSC_EXTERN PetscErrorCode PetscDrawUtilitySetCmap(const char[],int,unsigned char[],unsigned char[],unsigned char[]);
 PETSC_EXTERN PetscErrorCode PetscDrawUtilitySetGamma(PetscReal);
 
diff --git a/include/petscviewer.h b/include/petscviewer.h
index 28cec89..3425e2b 100644
--- a/include/petscviewer.h
+++ b/include/petscviewer.h
@@ -7,6 +7,7 @@
 
 #include <petscsys.h>
 #include <petscviewertypes.h>
+#include <petscdrawtypes.h>
 
 PETSC_EXTERN PetscClassId PETSC_VIEWER_CLASSID;
 
@@ -56,8 +57,13 @@ PETSC_EXTERN PetscErrorCode PetscViewerBinaryAddMPIIOOffset(PetscViewer,MPI_Offs
 PETSC_EXTERN PetscErrorCode PetscViewerSocketOpen(MPI_Comm,const char[],int,PetscViewer*);
 PETSC_EXTERN PetscErrorCode PetscViewerStringOpen(MPI_Comm,char[],size_t,PetscViewer*);
 PETSC_EXTERN PetscErrorCode PetscViewerDrawOpen(MPI_Comm,const char[],const char[],int,int,int,int,PetscViewer*);
-#include <petscdrawtypes.h>
 PETSC_EXTERN PetscErrorCode PetscViewerDrawSetDrawType(PetscViewer,PetscDrawType);
+PETSC_EXTERN PetscErrorCode PetscViewerDrawGetDraw(PetscViewer,PetscInt,PetscDraw*);
+PETSC_EXTERN PetscErrorCode PetscViewerDrawBaseAdd(PetscViewer,PetscInt);
+PETSC_EXTERN PetscErrorCode PetscViewerDrawBaseSet(PetscViewer,PetscInt);
+PETSC_EXTERN PetscErrorCode PetscViewerDrawGetDrawLG(PetscViewer,PetscInt,PetscDrawLG*);
+PETSC_EXTERN PetscErrorCode PetscViewerDrawGetDrawAxis(PetscViewer,PetscInt,PetscDrawAxis*);
+
 PETSC_EXTERN PetscErrorCode PetscViewerMathematicaOpen(MPI_Comm, int, const char[], const char[], PetscViewer *);
 PETSC_EXTERN PetscErrorCode PetscViewerSiloOpen(MPI_Comm, const char[], PetscViewer *);
 PETSC_EXTERN PetscErrorCode PetscViewerMatlabOpen(MPI_Comm,const char[],PetscFileMode,PetscViewer*);
diff --git a/src/dm/impls/swarm/data_bucket.c b/src/dm/impls/swarm/data_bucket.c
index 8030d02..f168a0f 100644
--- a/src/dm/impls/swarm/data_bucket.c
+++ b/src/dm/impls/swarm/data_bucket.c
@@ -1,4 +1,3 @@
-
 #include "data_bucket.h"
 
 /* string helpers */
diff --git a/src/dm/impls/swarm/data_bucket.h b/src/dm/impls/swarm/data_bucket.h
index 5c9ff1c..011c434 100644
--- a/src/dm/impls/swarm/data_bucket.h
+++ b/src/dm/impls/swarm/data_bucket.h
@@ -1,9 +1,6 @@
-
 #ifndef __DATA_BUCKET_H__
 #define __DATA_BUCKET_H__
 
-
-#include <petsc.h>
 #include <petsc/private/dmswarmimpl.h>    /*I   "petscdmswarm.h"   I*/
 
 #define DATA_BUCKET_BUFFER_DEFAULT -1
diff --git a/src/dm/impls/swarm/data_ex.c b/src/dm/impls/swarm/data_ex.c
index 26b0abf..f4b8a56 100644
--- a/src/dm/impls/swarm/data_ex.c
+++ b/src/dm/impls/swarm/data_ex.c
@@ -73,8 +73,6 @@ DataExEnd()
 
 
 */
-
-#include <petsc.h>
 #include <petscvec.h>
 #include <petscmat.h>
 
diff --git a/src/dm/impls/swarm/data_ex.h b/src/dm/impls/swarm/data_ex.h
index 0d62895..272abdd 100644
--- a/src/dm/impls/swarm/data_ex.h
+++ b/src/dm/impls/swarm/data_ex.h
@@ -1,9 +1,6 @@
-
 #ifndef __DATA_EXCHANGER_H__
 #define __DATA_EXCHANGER_H__
 
-
-#include <petsc.h>
 #include <petscvec.h>
 #include <petscmat.h>
 
diff --git a/src/dm/impls/swarm/swarm.c b/src/dm/impls/swarm/swarm.c
index ac504e5..ef7f882 100644
--- a/src/dm/impls/swarm/swarm.c
+++ b/src/dm/impls/swarm/swarm.c
@@ -1,6 +1,7 @@
-
 #define PETSCDM_DLL
 #include <petsc/private/dmswarmimpl.h>    /*I   "petscdmswarm.h"   I*/
+#include <petscviewer.h>
+#include <petscdraw.h>
 #include "data_bucket.h"
 
 PetscLogEvent DMSWARM_Migrate, DMSWARM_SetSizes, DMSWARM_AddPoints, DMSWARM_RemovePoints, DMSWARM_Sort;
diff --git a/src/dm/impls/swarm/swarm_migrate.c b/src/dm/impls/swarm/swarm_migrate.c
index 41ea200..ba4ac70 100644
--- a/src/dm/impls/swarm/swarm_migrate.c
+++ b/src/dm/impls/swarm/swarm_migrate.c
@@ -1,11 +1,10 @@
-
 #include <petscsf.h>
 #include <petscdmswarm.h>
+#include <petscdmda.h>
 #include <petsc/private/dmswarmimpl.h>    /*I   "petscdmswarm.h"   I*/
 #include "data_bucket.h"
 #include "data_ex.h"
 
-
 /*
  User loads desired location (MPI rank) into field DMSwarm_rank
 */
diff --git a/src/dm/impls/swarm/swarmpic.c b/src/dm/impls/swarm/swarmpic.c
index c8aa7dd..c5122b8 100644
--- a/src/dm/impls/swarm/swarmpic.c
+++ b/src/dm/impls/swarm/swarmpic.c
@@ -1,4 +1,3 @@
-
 #define PETSCDM_DLL
 #include <petsc/private/dmswarmimpl.h>    /*I   "petscdmswarm.h"   I*/
 #include <petscsf.h>
diff --git a/src/dm/impls/swarm/swarmpic_da.c b/src/dm/impls/swarm/swarmpic_da.c
index c307c46..5c0e0ae 100644
--- a/src/dm/impls/swarm/swarmpic_da.c
+++ b/src/dm/impls/swarm/swarmpic_da.c
@@ -1,5 +1,3 @@
-
-#include <petsc.h>
 #include <petscdm.h>
 #include <petscdmda.h>
 #include <petscdmswarm.h>
diff --git a/src/dm/impls/swarm/swarmpic_plex.c b/src/dm/impls/swarm/swarmpic_plex.c
index de4a0bc..0507992 100644
--- a/src/dm/impls/swarm/swarmpic_plex.c
+++ b/src/dm/impls/swarm/swarmpic_plex.c
@@ -1,5 +1,3 @@
-
-#include <petsc.h>
 #include <petscdm.h>
 #include <petscdmplex.h>
 #include <petscdmswarm.h>
diff --git a/src/dm/impls/swarm/swarmpic_sort.c b/src/dm/impls/swarm/swarmpic_sort.c
index 0662351..d41cd05 100644
--- a/src/dm/impls/swarm/swarmpic_sort.c
+++ b/src/dm/impls/swarm/swarmpic_sort.c
@@ -1,5 +1,3 @@
-
-#include <petsc.h>
 #include <petscdm.h>
 #include <petscdmda.h>
 #include <petscdmplex.h>
diff --git a/src/dm/impls/swarm/swarmpic_view.c b/src/dm/impls/swarm/swarmpic_view.c
index 71c7812..ec1cefc 100644
--- a/src/dm/impls/swarm/swarmpic_view.c
+++ b/src/dm/impls/swarm/swarmpic_view.c
@@ -1,5 +1,3 @@
-
-#include <petsc.h>
 #include <petscdm.h>
 #include <petscdmda.h>
 #include <petscdmswarm.h>